diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2014-10-22 14:16:18 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2014-10-22 14:16:18 +0000 |
commit | 2466b04a5aba116df977697841d9e6fff27ccd68 (patch) | |
tree | 6755ed7f6d1a2f9fe734935d0ba13293b89443f3 /target/linux/bcm53xx/patches-3.14/400-mtd-move-support-for-struct-flash_platform_data-into.patch | |
parent | 18ae41edf01c56e633703132575b082e8e167eb6 (diff) | |
download | upstream-2466b04a5aba116df977697841d9e6fff27ccd68.tar.gz upstream-2466b04a5aba116df977697841d9e6fff27ccd68.tar.bz2 upstream-2466b04a5aba116df977697841d9e6fff27ccd68.zip |
bcm53xx: backport spi-nor patches from 3.18-rc1
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 43030
Diffstat (limited to 'target/linux/bcm53xx/patches-3.14/400-mtd-move-support-for-struct-flash_platform_data-into.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.14/400-mtd-move-support-for-struct-flash_platform_data-into.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/400-mtd-move-support-for-struct-flash_platform_data-into.patch b/target/linux/bcm53xx/patches-3.14/400-mtd-move-support-for-struct-flash_platform_data-into.patch deleted file mode 100644 index 8076f550ba..0000000000 --- a/target/linux/bcm53xx/patches-3.14/400-mtd-move-support-for-struct-flash_platform_data-into.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -915,7 +915,6 @@ int spi_nor_scan(struct spi_nor *nor, co - enum read_mode mode) - { - struct flash_info *info; -- struct flash_platform_data *data; - struct device *dev = nor->dev; - struct mtd_info *mtd = nor->mtd; - struct device_node *np = dev->of_node; -@@ -926,28 +925,6 @@ int spi_nor_scan(struct spi_nor *nor, co - if (ret) - return ret; - -- /* Platform data helps sort out which chip type we have, as -- * well as how this board partitions it. If we don't have -- * a chip ID, try the JEDEC id commands; they'll work for most -- * newer chips, even if we don't recognize the particular chip. -- */ -- data = dev_get_platdata(dev); -- if (data && data->type) { -- const struct spi_device_id *plat_id; -- -- for (i = 0; i < ARRAY_SIZE(spi_nor_ids) - 1; i++) { -- plat_id = &spi_nor_ids[i]; -- if (strcmp(data->type, plat_id->name)) -- continue; -- break; -- } -- -- if (i < ARRAY_SIZE(spi_nor_ids) - 1) -- id = plat_id; -- else -- dev_warn(dev, "unrecognized id %s\n", data->type); -- } -- - info = (void *)id->driver_data; - - if (info->jedec_id) { -@@ -985,11 +962,8 @@ int spi_nor_scan(struct spi_nor *nor, co - write_sr(nor, 0); - } - -- if (data && data->name) -- mtd->name = data->name; -- else -+ if (!mtd->name) - mtd->name = dev_name(dev); -- - mtd->type = MTD_NORFLASH; - mtd->writesize = 1; - mtd->flags = MTD_CAP_NORFLASH; |