ar71xx: fix whitespaces nits

[openwrt/staging/stintel.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-tew-632brp.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
index c92cb00ebf79a6419b4591e204cb7a692ec0fd0a..7bbec12668f6bfdf123a057ddb364de516ee8d7a 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
@@ -40,24 +40,24 @@ static struct mtd_partition tew_632brp_partitions[] = {
                .offset         = 0,
                .size           = 0x020000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "config",
                .offset         = 0x020000,
                .size           = 0x010000,
-       } , {
+       }, {
                .name           = "kernel",
                .offset         = 0x030000,
                .size           = 0x0d0000,
-       } , {
+       }, {
                .name           = "rootfs",
                .offset         = 0x100000,
                .size           = 0x2f0000,
-       } , {
+       }, {
                .name           = "art",
                .offset         = 0x3f0000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "firmware",
                .offset         = 0x030000,
                .size           = 0x3c0000,
@@ -67,8 +67,8 @@ static struct mtd_partition tew_632brp_partitions[] = {
 
 static struct flash_platform_data tew_632brp_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = tew_632brp_partitions,
-        .nr_parts       = ARRAY_SIZE(tew_632brp_partitions),
+       .parts          = tew_632brp_partitions,
+       .nr_parts       = ARRAY_SIZE(tew_632brp_partitions),
 #endif
 };
 
@@ -92,18 +92,23 @@ static struct gpio_button tew_632brp_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 5,
+               .code           = KEY_RESTART,
+               .threshold      = 3,
                .gpio           = TEW_632BRP_GPIO_BTN_RESET,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
-               .code           = BTN_1,
-               .threshold      = 5,
+               .code           = KEY_WPS_BUTTON,
+               .threshold      = 3,
                .gpio           = TEW_632BRP_GPIO_BTN_WPS,
        }
 };
 
+#define TEW_632BRP_LAN_PHYMASK BIT(0)
+#define TEW_632BRP_WAN_PHYMASK BIT(4)
+#define TEW_632BRP_MDIO_MASK   (~(TEW_632BRP_LAN_PHYMASK | \
+                                  TEW_632BRP_WAN_PHYMASK))
+
 static void __init tew_632brp_setup(void)
 {
        const char *config = (char *) KSEG1ADDR(TEW_632BRP_CONFIG_ADDR);
@@ -112,20 +117,19 @@ static void __init tew_632brp_setup(void)
        u8 *wlan_mac = NULL;
 
        if (nvram_parse_mac_addr(config, TEW_632BRP_CONFIG_SIZE,
-                                "lan_mac=", mac) == 0) {
-               ar71xx_set_mac_base(mac);
+                               "lan_mac=", mac) == 0) {
+               ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
+               ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
                wlan_mac = mac;
        }
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(TEW_632BRP_MDIO_MASK);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth0_data.phy_mask = 0xf;
-       ar71xx_eth0_data.speed = SPEED_100;
-       ar71xx_eth0_data.duplex = DUPLEX_FULL;
+       ar71xx_eth0_data.phy_mask = TEW_632BRP_LAN_PHYMASK;
 
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth1_data.phy_mask = 0x10;
+       ar71xx_eth1_data.phy_mask = TEW_632BRP_WAN_PHYMASK;
 
        ar71xx_add_device_eth(0);
        ar71xx_add_device_eth(1);