kernel: update kernel 3.18 to rc4

[openwrt/staging/chunkeey.git] / target / linux / bcm53xx / patches-3.18 / 404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch

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 9a9d903f825ac41349e3c13dccf889a67d473e43..80e1d324d7392ea856f6e93f7fc3b30e4fdcc487 100644 (file)
--- 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;
 +