1 From 339fe73f340161a624cc08e738d2244814852c3e Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Sun, 17 Mar 2013 00:55:04 +0100
4 Subject: [PATCH] rt2x00: load eeprom on SoC from a mtd device defines inside
7 Signed-off-by: John Crispin <blogic@openwrt.org>
9 drivers/net/wireless/rt2x00/Kconfig | 1 +
10 drivers/net/wireless/rt2x00/rt2800pci.c | 44 ++++++++++++++++++++++++++-----
11 2 files changed, 39 insertions(+), 6 deletions(-)
13 --- a/drivers/net/wireless/rt2x00/Kconfig
14 +++ b/drivers/net/wireless/rt2x00/Kconfig
15 @@ -71,6 +71,7 @@ config RT2800PCI
16 select RT2X00_LIB_FIRMWARE
17 select RT2X00_LIB_EEPROM
18 select RT2X00_LIB_CRYPTO
19 + select MTD if SOC_RT288X || SOC_RT305X
21 depends on EEPROM_93CX6
23 --- a/drivers/net/wireless/rt2x00/rt2x00eeprom.c
24 +++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c
27 #include "rt2x00lib.h"
30 +#include <linux/of.h>
31 +#include <linux/mtd/mtd.h>
32 +#include <linux/mtd/partitions.h>
34 +static struct firmware mtd_fw;
36 +static int rt2800pci_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
38 + struct device_node *np = rt2x00dev->dev->of_node, *mtd_np = NULL;
39 + size_t retlen, len = rt2x00dev->ops->eeprom_size;
40 + int ret, size, offset = 0;
41 + struct mtd_info *mtd;
46 + list = of_get_property(np, "ralink,mtd-eeprom", &size);
48 + dev_err(rt2x00dev->dev, "failed to load eeprom property\n");
52 + phandle = be32_to_cpup(list++);
54 + mtd_np = of_find_node_by_phandle(phandle);
56 + dev_err(rt2x00dev->dev, "failed to load mtd phandle\n");
60 + part = of_get_property(mtd_np, "label", NULL);
62 + part = mtd_np->name;
64 + mtd = get_mtd_device_nm(part);
66 + dev_err(rt2x00dev->dev, "failed to get mtd device \"%s\"\n", part);
67 + return PTR_ERR(mtd);
70 + if (size > sizeof(*list))
71 + offset = be32_to_cpup(list);
73 + ret = mtd_read(mtd, offset, len, &retlen, (u_char *) rt2x00dev->eeprom);
74 + put_mtd_device(mtd);
77 + rt2x00dev->eeprom_file = &mtd_fw;
79 + mtd_fw.data = rt2x00dev->eeprom;
85 +static inline int rt2800pci_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
91 static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev)
93 const struct firmware *ee;
97 + if (!rt2800pci_read_eeprom_mtd(rt2x00dev))
100 ee_name = rt2x00dev->ops->lib->get_eeprom_file_name(rt2x00dev);
102 rt2x00_err(rt2x00dev,