2013-04-07 22:05:36 +00:00
|
|
|
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
|
|
|
|
|
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
|
2013-06-15 20:14:06 +00:00
|
|
|
@@ -39,6 +39,7 @@
|
|
|
|
|
#include <linux/pci.h>
|
|
|
|
|
#include <linux/platform_device.h>
|
|
|
|
|
#include <linux/eeprom_93cx6.h>
|
|
|
|
|
+#include <linux/of.h>
|
|
|
|
|
|
|
|
|
|
#include "rt2x00.h"
|
|
|
|
|
#include "rt2x00mmio.h"
|
|
|
|
|
@@ -323,11 +324,17 @@ static int rt2800pci_write_firmware(stru
|
2013-04-03 10:00:29 +00:00
|
|
|
static char *rt2800pci_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
|
|
|
|
|
{
|
|
|
|
|
struct rt2x00_platform_data *pdata;
|
|
|
|
|
+ struct device_node *np;
|
|
|
|
|
+ char *eep;
|
|
|
|
|
|
|
|
|
|
pdata = rt2x00dev->dev->platform_data;
|
|
|
|
|
if (pdata)
|
|
|
|
|
return pdata->eeprom_file_name;
|
|
|
|
|
|
|
|
|
|
+ np = rt2x00dev->dev->of_node;
|
|
|
|
|
+ if (np && !of_property_read_string(np, "ralink,eeprom", &eep))
|
|
|
|
|
+ return eep;
|
|
|
|
|
+
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
