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
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user