aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-11-10 22:51:30 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-11-10 22:51:30 +0000
commita69ebe234d46ca95cbcbcba7f4ef9bae598eb95b (patch)
treef5a849fbbd0c2bb9bc9ba75b80f9ff679a707b09 /target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch
parentc5b5e68879238d195e7a797ca82c8e0043e797ee (diff)
downloadupstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.tar.gz
upstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.tar.bz2
upstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.zip
kernel: update kernel 3.18 to rc4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 43229
Diffstat (limited to 'target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch')
-rw-r--r--target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch b/target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch
index 9a9d903f82..80e1d324d7 100644
--- a/target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch
+++ b/target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch
@@ -198,11 +198,11 @@
+ return ERR_PTR(-ENODEV);
+
+found_name:
-+ id = spi_nor_match_id(name);
-+ if (!id) {
-+ dev_err(dev, "No matching entry for %s flash\n", name);
-+ return ERR_PTR(-ENOENT);
-+ }
++// id = spi_nor_match_id(name);
++// if (!id) {
++// dev_err(dev, "No matching entry for %s flash\n", name);
++// return ERR_PTR(-ENOENT);
++// }
+
+ return id;
+}
@@ -235,7 +235,7 @@
+ b53sf->nor.read_id = bcm53xxspiflash_read_id;
+ b53sf->nor.priv = b53sf;
+
-+ err = spi_nor_scan(&b53sf->nor, NULL, SPI_NOR_NORMAL);
++ err = spi_nor_scan(&b53sf->nor, "w25q128", SPI_NOR_NORMAL);
+ if (err)
+ return err;
+