diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-11-10 22:51:30 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-11-10 22:51:30 +0000 |
| commit | c0fd27ae720f08b264115b8cfbce414662a96c89 (patch) | |
| tree | 1d88b4adbd31efda3ca82dd3a8ed689bc08661f8 /target/linux/bcm53xx/patches-3.18/404-mtd-bcm53xxspiflash-new-driver-for-SPI-flahes-on-Bro.patch | |
| parent | b59385e75e3136af064941364b341b8658397960 (diff) | |
| download | upstream-c0fd27ae720f08b264115b8cfbce414662a96c89.tar.gz upstream-c0fd27ae720f08b264115b8cfbce414662a96c89.tar.bz2 upstream-c0fd27ae720f08b264115b8cfbce414662a96c89.zip | |
kernel: update kernel 3.18 to rc4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43229 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 12 |
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; + |