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 Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/Kconfig
14 ===================================================================
15 --- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/Kconfig 2013-04-04 14:20:02.621776831 +0200
16 +++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/Kconfig 2013-04-04 14:20:02.977776837 +0200
18 select RT2X00_LIB_CRYPTO
21 + select MTD if SOC_RT288X || SOC_RT305X
23 This adds support for rt27xx/rt28xx/rt30xx wireless chipset family.
24 Supported chips: RT2760, RT2790, RT2860, RT2880, RT2890, RT3052,
25 Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2x00eeprom.c
26 ===================================================================
27 --- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2x00eeprom.c 2013-04-04 14:20:02.621776831 +0200
28 +++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2x00eeprom.c 2013-04-04 15:23:19.601807539 +0200
31 #include "rt2x00lib.h"
34 +#include <linux/of.h>
35 +#include <linux/mtd/mtd.h>
36 +#include <linux/mtd/partitions.h>
38 +static struct firmware mtd_fw;
40 +static int rt2800pci_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
42 + struct device_node *np = rt2x00dev->dev->of_node, *mtd_np = NULL;
43 + size_t retlen, len = rt2x00dev->ops->eeprom_size;
44 + int ret, size, offset = 0;
45 + struct mtd_info *mtd;
50 + list = of_get_property(np, "ralink,mtd-eeprom", &size);
52 + dev_err(rt2x00dev->dev, "failed to load eeprom property\n");
56 + phandle = be32_to_cpup(list++);
58 + mtd_np = of_find_node_by_phandle(phandle);
60 + dev_err(rt2x00dev->dev, "failed to load mtd phandle\n");
64 + part = of_get_property(mtd_np, "label", NULL);
66 + part = mtd_np->name;
68 + mtd = get_mtd_device_nm(part);
70 + dev_err(rt2x00dev->dev, "failed to get mtd device \"%s\"\n", part);
71 + return PTR_ERR(mtd);
74 + if (size > sizeof(*list))
75 + offset = be32_to_cpup(list);
77 + ret = mtd_read(mtd, offset, len, &retlen, (u_char *) rt2x00dev->eeprom);
78 + put_mtd_device(mtd);
81 + rt2x00dev->eeprom_file = &mtd_fw;
83 + mtd_fw.data = rt2x00dev->eeprom;
89 +static inline int rt2800pci_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
95 static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev)
97 const struct firmware *ee;
101 + if (!rt2800pci_read_eeprom_mtd(rt2x00dev))
104 ee_name = rt2x00dev->ops->lib->get_eeprom_file_name(rt2x00dev);