From 339fe73f340161a624cc08e738d2244814852c3e Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 17 Mar 2013 00:55:04 +0100 Subject: [PATCH] rt2x00: load eeprom on SoC from a mtd device defines inside OF Signed-off-by: John Crispin --- drivers/net/wireless/rt2x00/Kconfig | 1 + drivers/net/wireless/rt2x00/rt2800pci.c | 44 ++++++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 6 deletions(-) --- a/drivers/net/wireless/rt2x00/Kconfig +++ b/drivers/net/wireless/rt2x00/Kconfig @@ -219,6 +219,7 @@ config RT2800SOC select RT2X00_LIB_EEPROM select RT2800_LIB select RT2800_LIB_MMIO + select MTD if SOC_RT288X || SOC_RT305X ---help--- This adds support for Ralink WiSoC devices. Supported chips: RT2880, RT3050, RT3052, RT3350, RT3352. --- a/drivers/net/wireless/rt2x00/rt2x00eeprom.c +++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c @@ -26,11 +26,66 @@ #include #include +#include +#include #include #include "rt2x00.h" #include "rt2x00lib.h" +static int rt2800lib_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev) +{ + int ret = -EINVAL; +#ifdef CONFIG_OF + static struct firmware mtd_fw; + struct device_node *np = rt2x00dev->dev->of_node, *mtd_np = NULL; + size_t retlen, len = rt2x00dev->ops->eeprom_size; + int size, offset = 0; + struct mtd_info *mtd; + const char *part; + const __be32 *list; + phandle phandle; + + list = of_get_property(np, "ralink,mtd-eeprom", &size); + if (!list) { + dev_err(rt2x00dev->dev, "failed to load eeprom property\n"); + return -ENOENT; + } + + phandle = be32_to_cpup(list++); + if (phandle) + mtd_np = of_find_node_by_phandle(phandle); + if (!mtd_np) { + dev_err(rt2x00dev->dev, "failed to load mtd phandle\n"); + return -EINVAL; + } + + part = of_get_property(mtd_np, "label", NULL); + if (!part) + part = mtd_np->name; + + mtd = get_mtd_device_nm(part); + if (IS_ERR(mtd)) { + dev_err(rt2x00dev->dev, "failed to get mtd device \"%s\"\n", part); + return PTR_ERR(mtd); + } + + if (size > sizeof(*list)) + offset = be32_to_cpup(list); + + ret = mtd_read(mtd, offset, len, &retlen, (u_char *) rt2x00dev->eeprom); + put_mtd_device(mtd); + + if (!ret) { + rt2x00dev->eeprom_file = &mtd_fw; + mtd_fw.size = len; + mtd_fw.data = rt2x00dev->eeprom; + } +#endif + + return ret; +} + static const char * rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev) { @@ -58,6 +113,9 @@ static int rt2x00lib_request_eeprom_file const char *ee_name; int retval; + if (!rt2800lib_read_eeprom_mtd(rt2x00dev)) + return 0; + ee_name = rt2x00lib_get_eeprom_file_name(rt2x00dev); if (!ee_name) { rt2x00_err(rt2x00dev,