ar71xx: fix wlan LED on the TL-WR741 board

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-wzr-hp-g300nh.c

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 c6fb241c51ab5f4ef4db14031c59846157cabe66..ac871003afb2936467e8cf20bfdbc1ad7ac3d22e 100644 (file)
--- 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
@@ -93,8 +93,8 @@ static struct mtd_partition wzrhpg300nh_flash_partitions[] = {
 static struct ar91xx_flash_platform_data wzrhpg300nh_flash_data = {
        .width          = 2,
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = wzrhpg300nh_flash_partitions,
-        .nr_parts       = ARRAY_SIZE(wzrhpg300nh_flash_partitions),
+       .parts          = wzrhpg300nh_flash_partitions,
+       .nr_parts       = ARRAY_SIZE(wzrhpg300nh_flash_partitions),
 #endif
 };
 
@@ -147,14 +147,14 @@ static struct gpio_button wzrhpg300nh_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
+               .code           = KEY_RESTART,
                .threshold      = 3,
                .gpio           = WZRHPG300NH_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "aoss",
                .type           = EV_KEY,
-               .code           = BTN_1,
+               .code           = KEY_WPS_BUTTON,
                .threshold      = 3,
                .gpio           = WZRHPG300NH_GPIO_BTN_AOSS,
                .active_low     = 1,
@@ -213,8 +213,8 @@ static struct platform_device wzrhpg300nh_74hc153_device = {
 };
 
 static struct rtl8366s_platform_data wzrhpg300nh_rtl8366s_data = {
-       .gpio_sda        = WZRHPG300NH_GPIO_RTL8366_SDA,
-       .gpio_sck        = WZRHPG300NH_GPIO_RTL8366_SCK,
+       .gpio_sda       = WZRHPG300NH_GPIO_RTL8366_SDA,
+       .gpio_sck       = WZRHPG300NH_GPIO_RTL8366_SCK,
 };
 
 static struct platform_device wzrhpg300nh_rtl8366s_device = {
@@ -228,16 +228,16 @@ static struct platform_device wzrhpg300nh_rtl8366s_device = {
 static void __init wzrhpg300nh_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+       u8 *mac = eeprom + WZRHPG300NH_MAC_OFFSET;
 
-       ar71xx_set_mac_base(eeprom + WZRHPG300NH_MAC_OFFSET);
-
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
        ar71xx_eth0_pll_data.pll_1000 = 0x1e000100;
        ar71xx_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366s_device.dev;
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
-       ar71xx_eth0_data.phy_mask = 0xf;
        ar71xx_eth0_data.speed = SPEED_1000;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
 
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
        ar71xx_eth1_pll_data.pll_1000 = 0x1e000100;
        ar71xx_eth1_data.mii_bus_dev = &wzrhpg300nh_rtl8366s_device.dev;
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
@@ -254,11 +254,11 @@ static void __init wzrhpg300nh_setup(void)
        platform_device_register(&wzrhpg300nh_rtl8366s_device);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wzrhpg300nh_leds_gpio),
-                                   wzrhpg300nh_leds_gpio);
+                                       wzrhpg300nh_leds_gpio);
 
        ar71xx_add_device_gpio_buttons(-1, WZRHPG300NH_BUTTONS_POLL_INTERVAL,
-                                      ARRAY_SIZE(wzrhpg300nh_gpio_buttons),
-                                      wzrhpg300nh_gpio_buttons);
+                                       ARRAY_SIZE(wzrhpg300nh_gpio_buttons),
+                                       wzrhpg300nh_gpio_buttons);
 
 }