bcm63xx: add 3.9 support
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.9 / 414-MTD-m25p80-allow-passing-pp_data.patch
1 From 7f17dfe9009beb07a3de0e380932a725293829df Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jonas.gorski@gmail.com>
3 Date: Tue, 1 May 2012 17:33:03 +0200
4 Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data
5
6 ---
7 drivers/mtd/devices/m25p80.c | 3 +++
8 include/linux/spi/flash.h | 2 ++
9 2 files changed, 5 insertions(+)
10
11 --- a/drivers/mtd/devices/m25p80.c
12 +++ b/drivers/mtd/devices/m25p80.c
13 @@ -972,6 +972,9 @@ static int m25p_probe(struct spi_device
14 dev_warn(&spi->dev, "unrecognized id %s\n", data->type);
15 }
16
17 + if (data && data->pp_data)
18 + memcpy(&ppdata, data->pp_data, sizeof(ppdata));
19 +
20 info = (void *)id->driver_data;
21
22 if (info->jedec_id) {
23 --- a/include/linux/spi/flash.h
24 +++ b/include/linux/spi/flash.h
25 @@ -12,6 +12,7 @@ struct mtd_part_parser_data;
26 * with chips that can't be queried for JEDEC or other IDs
27 * @part_probe_types: optional list of MTD parser names to use for
28 * partitioning
29 + * @pp_data: optional partition parser data.
30 *
31 * @max_transfer_len: option maximum read/write length limitation for
32 * SPI controllers not able to transfer any length commands.
33 @@ -30,6 +31,7 @@ struct flash_platform_data {
34 char *type;
35
36 const char **part_probe_types;
37 + struct mtd_part_parser_data *pp_data;
38
39 unsigned int max_transfer_len;
40 /* we'll likely add more ... use JEDEC IDs, etc */