aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-04-13 22:23:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-04-13 22:23:37 +0000
commit923bef167811193709477894074b00fba7fb21f0 (patch)
tree3bf3dd299977f1ac0896eed25f603ca5948a1541 /target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
parentbdb6c313de367280ed17ad234136f133ceb37551 (diff)
downloadupstream-923bef167811193709477894074b00fba7fb21f0.tar.gz
upstream-923bef167811193709477894074b00fba7fb21f0.tar.bz2
upstream-923bef167811193709477894074b00fba7fb21f0.zip
bcm53xx: refresh kernel patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 45426
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch')
-rw-r--r--target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch b/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
index 925e88351b..22fb687a82 100644
--- a/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
+++ b/target/linux/bcm53xx/patches-3.18/004-mtd-spi-nor-from-3.20.patch
@@ -8,7 +8,7 @@
/* Intel/Numonyx -- xxxs33b */
{ "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) },
-@@ -560,14 +561,14 @@ static const struct spi_device_id spi_no
+@@ -564,14 +565,14 @@ static const struct spi_device_id spi_no
{ "mx66l1g55g", INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) },
/* Micron */
@@ -31,7 +31,7 @@
/* PMC */
{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
-@@ -891,6 +892,45 @@ static int spansion_quad_enable(struct s
+@@ -895,6 +896,45 @@ static int spansion_quad_enable(struct s
return 0;
}
@@ -77,7 +77,7 @@
static int set_quad_mode(struct spi_nor *nor, struct flash_info *info)
{
int status;
-@@ -903,6 +943,13 @@ static int set_quad_mode(struct spi_nor
+@@ -907,6 +947,13 @@ static int set_quad_mode(struct spi_nor
return -EINVAL;
}
return status;