ar71xx: fix USB LED on the DB120 board

[openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-db120.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-db120.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-db120.c
index bc01f0d..b997f3c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-db120.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-db120.c
@@ -19,7 +19,7 @@
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 #include "dev-usb.h"
-#include "dev-ar934x-wmac.h"
+#include "dev-ar9xxx-wmac.h"
 #include "dev-db120-pci.h"
 
 #define DB120_GPIO_LED_USB     11
@@ -28,12 +28,15 @@
 #define DB120_GPIO_LED_STATUS  14
 #define DB120_GPIO_LED_WPS     15
 
-#define DB120_GPIO_BTN_SW1     16
+#define DB120_GPIO_BTN_WPS     16
 
-#define DB120_CALDATA_OFFSET   0x1000
-#define DB120_WMAC_MAC_OFFSET  0x1002
+#define DB120_MAC0_OFFSET      0
+#define DB120_MAC1_OFFSET      6
+#define DB120_WMAC_CALDATA_OFFSET 0x1000
+#define DB120_PCIE_CALDATA_OFFSET 0x5000
 
-#define DB120_BUTTONS_POLL_INTERVAL    20
+#define DB120_KEYS_POLL_INTERVAL       20      /* msecs */
+#define DB120_KEYS_DEBOUNCE_INTERVAL   (3 * DB120_KEYS_POLL_INTERVAL)
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition db120_partitions[] = {
@@ -98,13 +101,13 @@ static struct gpio_led db120_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button db120_gpio_buttons[] __initdata = {
+static struct gpio_keys_button db120_gpio_keys[] __initdata = {
        {
-               .desc           = "sw1",
+               .desc           = "WPS button",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 3,
-               .gpio           = DB120_GPIO_BTN_SW1,
+               .code           = KEY_WPS_BUTTON,
+               .debounce_interval = DB120_KEYS_DEBOUNCE_INTERVAL,
+               .gpio           = DB120_GPIO_BTN_WPS,
                .active_low     = 1,
        }
 };
@@ -113,6 +116,8 @@ static void __init db120_setup(void)
 {
        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
 
+       ar71xx_gpio_output_select(DB120_GPIO_LED_USB, AR934X_GPIO_OUT_GPIO);
+
        ar71xx_add_device_usb();
 
        ar71xx_add_device_m25p80(&db120_flash_data);
@@ -120,14 +125,32 @@ static void __init db120_setup(void)
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(db120_leds_gpio),
                                        db120_leds_gpio);
 
-       ar71xx_add_device_gpio_buttons(-1, DB120_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(db120_gpio_buttons),
-                                       db120_gpio_buttons);
+       ar71xx_register_gpio_keys_polled(-1, DB120_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(db120_gpio_keys),
+                                        db120_gpio_keys);
+
+       ar71xx_add_device_mdio(0, 0x0);
+       ar71xx_add_device_mdio(1, 0x0);
+
+       /* GMAC0 is connected to an AR8327 switch */
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, art + DB120_MAC0_OFFSET, 0);
+       ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
+       ar71xx_eth0_data.speed = SPEED_1000;
+       ar71xx_eth0_data.duplex = DUPLEX_FULL;
+
+       ar71xx_add_device_eth(0);
+
+       /* GMAC1 is connected to the internal switch */
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, art + DB120_MAC1_OFFSET, 0);
+       ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+       ar71xx_eth1_data.speed = SPEED_100;
+       ar71xx_eth1_data.duplex = DUPLEX_FULL;
+
+       ar71xx_add_device_eth(1);
 
-       ar934x_add_device_wmac(art + DB120_CALDATA_OFFSET,
-                               art + DB120_WMAC_MAC_OFFSET);
+       ar9xxx_add_device_wmac(art + DB120_WMAC_CALDATA_OFFSET, NULL);
 
-       db120_pci_init();
+       db120_pci_init(art + DB120_PCIE_CALDATA_OFFSET, NULL);
 }
 
 MIPS_MACHINE(AR71XX_MACH_DB120, "DB120", "Atheros DB120", db120_setup);