brcm63xx: setup internal switch leds for bcm6368
[openwrt/openwrt.git] / target / linux / brcm63xx / patches-4.4 / 414-MTD-m25p80-allow-passing-pp_data.patch
index bbb565e9db8628f3d64122a9060934174818ac7c..a0b4b4ff366915765fd79256e602229794193beb 100644 (file)
@@ -4,22 +4,22 @@ Date: Tue, 1 May 2012 17:33:03 +0200
 Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data
 
 ---
- drivers/mtd/devices/m25p80.c |    3 +++
+ drivers/mtd/devices/m25p80.c |    5 +++--
  include/linux/spi/flash.h    |    2 ++
  2 files changed, 5 insertions(+)
 
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -272,6 +272,9 @@ static int m25p_probe(struct spi_device
-       if (data)
-               flash->max_transfer_len = data->max_transfer_len;
-+      if (data && data->pp_data)
-+              memcpy(&ppdata, data->pp_data, sizeof(ppdata));
-+
-       ret = spi_nor_scan(nor, flash_name, mode);
-       if (ret)
+@@ -276,7 +276,8 @@ static int m25p_probe(struct spi_device
                return ret;
+       return mtd_device_parse_register(&nor->mtd,
+-                      data ? data->part_probe_types : NULL, NULL,
++                      data ? data->part_probe_types : NULL,
++                      data ? data->pp_data : NULL,
+                       data ? data->parts : NULL,
+                       data ? data->nr_parts : 0);
+ }
 --- a/include/linux/spi/flash.h
 +++ b/include/linux/spi/flash.h
 @@ -12,6 +12,7 @@ struct mtd_part_parser_data;