diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-28 11:57:51 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-07-28 11:57:51 +0000 |
| commit | e5839cb1022761ce449329e64e66fe70067f6962 (patch) | |
| tree | 70b669be9e632590ab374a1a224e5461ec94e69b /target/linux/ar71xx/files | |
| parent | ea7f49d5131d1f89161706bbdaf643d439fa6e0a (diff) | |
ar71xx: merge WZR-HP-G301NH support into WZR-HP-G300NH
Now that we can use a generic name for the switch there is no need for a
separate image for the WZR-HP-G301NH.
Update the default network config and remove the extra image.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27814 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/files')
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c | 15 | ||||
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h | 1 |
2 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c index 308f93141a..9a1fbea391 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c @@ -226,7 +226,7 @@ static struct platform_device wzrhpg300nh_rtl8366s_device = { } }; -static struct platform_device wzrhpg301nh_rtl8366rb_device = { +static struct platform_device wzrhpg300nh_rtl8366rb_device = { .name = RTL8366RB_DRIVER_NAME, .id = -1, .dev = { @@ -234,7 +234,7 @@ static struct platform_device wzrhpg301nh_rtl8366rb_device = { } }; -static void __init wzrhpg30xnh_setup(void) +static void __init wzrhpg300nh_setup(void) { u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000); u8 *mac = eeprom + WZRHPG300NH_MAC_OFFSET; @@ -248,9 +248,9 @@ static void __init wzrhpg30xnh_setup(void) if (hasrtl8366rb) { ar71xx_eth0_pll_data.pll_1000 = 0x1f000000; - ar71xx_eth0_data.mii_bus_dev = &wzrhpg301nh_rtl8366rb_device.dev; + ar71xx_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366rb_device.dev; ar71xx_eth1_pll_data.pll_1000 = 0x100; - ar71xx_eth1_data.mii_bus_dev = &wzrhpg301nh_rtl8366rb_device.dev; + ar71xx_eth1_data.mii_bus_dev = &wzrhpg300nh_rtl8366rb_device.dev; } else { ar71xx_eth0_pll_data.pll_1000 = 0x1e000100; ar71xx_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366s_device.dev; @@ -275,7 +275,7 @@ static void __init wzrhpg30xnh_setup(void) platform_device_register(&wzrhpg300nh_flash_device); if (hasrtl8366rb) - platform_device_register(&wzrhpg301nh_rtl8366rb_device); + platform_device_register(&wzrhpg300nh_rtl8366rb_device); else platform_device_register(&wzrhpg300nh_rtl8366s_device); @@ -289,7 +289,4 @@ static void __init wzrhpg30xnh_setup(void) } MIPS_MACHINE(AR71XX_MACH_WZR_HP_G300NH, "WZR-HP-G300NH", - "Buffalo WZR-HP-G300NH", wzrhpg30xnh_setup); - -MIPS_MACHINE(AR71XX_MACH_WZR_HP_G301NH, "WZR-HP-G301NH", - "Buffalo WZR-HP-G301NH", wzrhpg30xnh_setup); + "Buffalo WZR-HP-G300NH", wzrhpg300nh_setup); diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h b/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h index 3071792f28..823f3ffb95 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h @@ -64,7 +64,6 @@ enum ar71xx_mach_type { AR71XX_MACH_WRT400N, /* Linksys WRT400N */ AR71XX_MACH_WZR_HP_AG300H, /* Buffalo WZR-HP-AG300H */ AR71XX_MACH_WZR_HP_G300NH, /* Buffalo WZR-HP-G300NH */ - AR71XX_MACH_WZR_HP_G301NH, /* Buffalo WZR-HP-G301NH */ AR71XX_MACH_EAP7660D, /* Senao EAP7660D */ AR71XX_MACH_ZCN_1523H_2, /* Zcomax ZCN-1523H-2-xx */ AR71XX_MACH_ZCN_1523H_5, /* Zcomax ZCN-1523H-5-xx */ |