summaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-22 16:09:03 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-22 16:09:03 +0000
commit9798fec0b32330703361d944e234492b071cbe0a (patch)
tree8671e8ddf80585664134680beaab966d157f00ad /target/linux/ramips
parent4d004cb55262ec42f1a1a192957ee0111849d1ee (diff)
ramips: unify eeprom file name for the built-in wireless MAC
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34860 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom4
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c2
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c3
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c2
4 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index 21c9f5f88..ace4c1acd 100644
--- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -28,9 +28,7 @@ rt2x00_eeprom_extract() {
board=$(ramips_board_name)
case "$FIRMWARE" in
-"RT288X.eeprom" | \
-"RT305X.eeprom" | \
-"RT3883.eeprom")
+"soc_wmac.eeprom")
case $board in
dir-300-b1 | \
dir-600-b1 | \
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
index 7f4d45019..196810a30 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c
@@ -134,7 +134,7 @@ static struct platform_device rt288x_wifi_device = {
void __init rt288x_register_wifi(void)
{
- rt288x_wifi_data.eeprom_file_name = "RT288X.eeprom";
+ rt288x_wifi_data.eeprom_file_name = "soc_wmac.eeprom";
platform_device_register(&rt288x_wifi_device);
}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
index a8e0604e3..557eb10c1 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
@@ -216,7 +216,8 @@ static struct platform_device rt305x_wifi_device = {
void __init rt305x_register_wifi(void)
{
u32 t;
- rt305x_wifi_data.eeprom_file_name = "RT305X.eeprom";
+
+ rt305x_wifi_data.eeprom_file_name = "soc_wmac.eeprom";
if (soc_is_rt3352() || soc_is_rt5350()) {
t = rt305x_sysc_rr(SYSC_REG_SYSTEM_CONFIG);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c
index fef4cc554..3a1bf2633 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c
@@ -319,7 +319,7 @@ static struct platform_device rt3883_wlan_device = {
void __init rt3883_register_wlan(void)
{
- rt3883_wlan_data.eeprom_file_name = "RT3883.eeprom",
+ rt3883_wlan_data.eeprom_file_name = "soc_wmac.eeprom",
platform_device_register(&rt3883_wlan_device);
}