From 03a777c29388b974fde3be10f7b82a9610699428 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 22 Apr 2014 08:08:19 +0000 Subject: Refresh patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refresh uboot-lantiq patches. Signed-off-by: Álvaro Fernández Rojas SVN-Revision: 40546 --- ...sf-move-malloc-of-spi_flash-to-spi_flash_probe.patch | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'package/boot/uboot-lantiq/patches/0003-sf-move-malloc-of-spi_flash-to-spi_flash_probe.patch') diff --git a/package/boot/uboot-lantiq/patches/0003-sf-move-malloc-of-spi_flash-to-spi_flash_probe.patch b/package/boot/uboot-lantiq/patches/0003-sf-move-malloc-of-spi_flash-to-spi_flash_probe.patch index 819eef811d..d47d3df181 100644 --- a/package/boot/uboot-lantiq/patches/0003-sf-move-malloc-of-spi_flash-to-spi_flash_probe.patch +++ b/package/boot/uboot-lantiq/patches/0003-sf-move-malloc-of-spi_flash-to-spi_flash_probe.patch @@ -5,11 +5,9 @@ Subject: sf: move malloc of spi_flash to spi_flash_probe() Signed-off-by: Daniel Schwierzeck -diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c -index 04356f1..2bba10c 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c -@@ -153,11 +153,10 @@ static const struct spi_flash_params spi_flash_params_table[] = { +@@ -153,11 +153,10 @@ static const struct spi_flash_params spi */ }; @@ -22,7 +20,7 @@ index 04356f1..2bba10c 100644 int i; u16 jedec = idcode[1] << 8 | idcode[2]; u16 ext_jedec = idcode[3] << 8 | idcode[4]; -@@ -179,20 +178,12 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, +@@ -179,20 +178,12 @@ static struct spi_flash *spi_flash_valid debug("SF: Unsupported flash IDs: "); debug("manuf %02x, jedec %04x, ext_jedec %04x\n", idcode[0], jedec, ext_jedec); @@ -45,7 +43,7 @@ index 04356f1..2bba10c 100644 /* Assign spi_flash ops */ flash->write = spi_flash_cmd_write_ops; -@@ -239,7 +230,7 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, +@@ -239,7 +230,7 @@ static struct spi_flash *spi_flash_valid if (spi_flash_read_common(flash, &flash->bank_read_cmd, 1, &curr_bank, 1)) { debug("SF: fail to read bank addr register\n"); @@ -54,7 +52,7 @@ index 04356f1..2bba10c 100644 } flash->bank_curr = curr_bank; } else { -@@ -254,7 +245,7 @@ static struct spi_flash *spi_flash_validate_params(struct spi_slave *spi, +@@ -254,7 +245,7 @@ static struct spi_flash *spi_flash_valid spi_flash_cmd_write_status(flash, 0); #endif @@ -63,7 +61,7 @@ index 04356f1..2bba10c 100644 } #ifdef CONFIG_OF_CONTROL -@@ -289,15 +280,22 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, +@@ -289,15 +280,22 @@ struct spi_flash *spi_flash_probe(unsign unsigned int max_hz, unsigned int spi_mode) { struct spi_slave *spi; @@ -88,7 +86,7 @@ index 04356f1..2bba10c 100644 } /* Claim spi bus */ -@@ -320,8 +318,9 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, +@@ -320,8 +318,9 @@ struct spi_flash *spi_flash_probe(unsign #endif /* Validate params from spi_flash_params table */ @@ -110,6 +108,3 @@ index 04356f1..2bba10c 100644 return NULL; } --- -1.8.3.2 - -- cgit v1.2.3