ar71xx: use KEY_RESTART and KEY_WPS_BUTTON code for the appropriate buttons

[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 5ffb816bfbd485d2b4cd3ef53aa7835c7f6b1122..c12b0a041521a9b56c21f56440a7e78ab2f2919e 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
@@ -12,7 +12,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/nxp_74hc153.h>
-#include <linux/rtl8366_smi.h>
+#include <linux/rtl8366s.h>
 
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
@@ -50,6 +50,8 @@
 
 #define WZRHPG300NH_BUTTONS_POLL_INTERVAL      20
 
+#define WZRHPG300NH_MAC_OFFSET         0x20c
+
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wzrhpg300nh_flash_partitions[] = {
        {
@@ -145,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,
@@ -210,16 +212,16 @@ static struct platform_device wzrhpg300nh_74hc153_device = {
        }
 };
 
-static struct rtl8366_smi_platform_data wzrhpg300nh_rtl8366_smi_data = {
+static struct rtl8366s_platform_data wzrhpg300nh_rtl8366s_data = {
        .gpio_sda        = WZRHPG300NH_GPIO_RTL8366_SDA,
        .gpio_sck        = WZRHPG300NH_GPIO_RTL8366_SCK,
 };
 
-static struct platform_device wzrhpg300nh_rtl8366_smi_device = {
-       .name           = "rtl8366-smi",
+static struct platform_device wzrhpg300nh_rtl8366s_device = {
+       .name           = RTL8366S_DRIVER_NAME,
        .id             = -1,
        .dev = {
-               .platform_data  = &wzrhpg300nh_rtl8366_smi_data,
+               .platform_data  = &wzrhpg300nh_rtl8366s_data,
        }
 };
 
@@ -227,17 +229,16 @@ static void __init wzrhpg300nh_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_set_mac_base(eeprom);
+       ar71xx_set_mac_base(eeprom + WZRHPG300NH_MAC_OFFSET);
 
        ar71xx_eth0_pll_data.pll_1000 = 0x1e000100;
-       ar71xx_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366_smi_device.dev;
+       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_eth1_pll_data.pll_1000 = 0x1e000100;
-       ar71xx_eth1_data.mii_bus_dev = &wzrhpg300nh_rtl8366_smi_device.dev;
+       ar71xx_eth1_data.mii_bus_dev = &wzrhpg300nh_rtl8366s_device.dev;
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth1_data.phy_mask = 0x10;
 
@@ -249,7 +250,7 @@ static void __init wzrhpg300nh_setup(void)
 
        platform_device_register(&wzrhpg300nh_74hc153_device);
        platform_device_register(&wzrhpg300nh_flash_device);
-       platform_device_register(&wzrhpg300nh_rtl8366_smi_device);
+       platform_device_register(&wzrhpg300nh_rtl8366s_device);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wzrhpg300nh_leds_gpio),
                                    wzrhpg300nh_leds_gpio);