diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-11-24 18:59:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-11-24 18:59:28 +0000 |
| commit | bb1c915f1e2006ea62f7c9136b18e2491c4303e2 (patch) | |
| tree | 59846f1613df179154ecb266961e3811b373ccba /target/linux/brcm63xx | |
| parent | 18691109df5a590e9914ae73740f145beec847ce (diff) | |
| download | master-31e0f0ae-bb1c915f1e2006ea62f7c9136b18e2491c4303e2.tar.gz master-31e0f0ae-bb1c915f1e2006ea62f7c9136b18e2491c4303e2.tar.bz2 master-31e0f0ae-bb1c915f1e2006ea62f7c9136b18e2491c4303e2.zip | |
kernel: update m25p80 in 4.1 to the latest version from 4.4-rc1
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 47624
Diffstat (limited to 'target/linux/brcm63xx')
3 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch b/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch index e58cd5967b..be62e6789c 100644 --- a/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch +++ b/target/linux/brcm63xx/patches-4.1/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch @@ -11,12 +11,12 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -234,7 +234,8 @@ static int m25p_probe(struct spi_device +@@ -229,7 +229,8 @@ static int m25p_probe(struct spi_device ppdata.of_node = spi->dev.of_node; -- return mtd_device_parse_register(&flash->mtd, NULL, &ppdata, -+ return mtd_device_parse_register(&flash->mtd, +- return mtd_device_parse_register(&nor->mtd, NULL, &ppdata, ++ return mtd_device_parse_register(&nor->mtd, + data ? data->part_probe_types : NULL, &ppdata, data ? data->parts : NULL, data ? data->nr_parts : 0); diff --git a/target/linux/brcm63xx/patches-4.1/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch b/target/linux/brcm63xx/patches-4.1/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch index fb064b890e..3877442d21 100644 --- a/target/linux/brcm63xx/patches-4.1/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch +++ b/target/linux/brcm63xx/patches-4.1/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch @@ -11,15 +11,15 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -32,6 +32,7 @@ struct m25p { +@@ -31,6 +31,7 @@ + struct m25p { struct spi_device *spi; struct spi_nor spi_nor; - struct mtd_info mtd; + int max_transfer_len; u8 command[MAX_CMD_SIZE]; }; -@@ -121,7 +122,7 @@ static inline unsigned int m25p80_rx_nbi +@@ -119,7 +120,7 @@ static inline unsigned int m25p80_rx_nbi * Read an address range from the nor chip. The address range * may be any size provided it is within the physical boundaries. */ @@ -28,7 +28,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> size_t *retlen, u_char *buf) { struct m25p *flash = nor->priv; -@@ -154,6 +155,29 @@ static int m25p80_read(struct spi_nor *n +@@ -152,6 +153,29 @@ static int m25p80_read(struct spi_nor *n return 0; } @@ -58,7 +58,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> static int m25p80_erase(struct spi_nor *nor, loff_t offset) { struct m25p *flash = nor->priv; -@@ -228,6 +252,9 @@ static int m25p_probe(struct spi_device +@@ -223,6 +247,9 @@ static int m25p_probe(struct spi_device else flash_name = spi->modalias; diff --git a/target/linux/brcm63xx/patches-4.1/414-MTD-m25p80-allow-passing-pp_data.patch b/target/linux/brcm63xx/patches-4.1/414-MTD-m25p80-allow-passing-pp_data.patch index 9a8cdf534c..e421e9adbe 100644 --- a/target/linux/brcm63xx/patches-4.1/414-MTD-m25p80-allow-passing-pp_data.patch +++ b/target/linux/brcm63xx/patches-4.1/414-MTD-m25p80-allow-passing-pp_data.patch @@ -10,7 +10,7 @@ Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -255,6 +255,9 @@ static int m25p_probe(struct spi_device +@@ -250,6 +250,9 @@ static int m25p_probe(struct spi_device if (data) flash->max_transfer_len = data->max_transfer_len; |