ar71xx: add an id argument to ar71xx_add_device_mdio

[oweals/openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-wzr-hp-ag300h.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c
index 84d88ccdad5dd410d34927b45ede083b6570d2a3..c85657d7df577388aacb075ed855c8f33bf5977a 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c
@@ -15,6 +15,7 @@
 
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
+#include <asm/mach-ar71xx/gpio.h>
 
 #include "machtype.h"
 #include "devices.h"
@@ -28,8 +29,6 @@
 #define WZRHPAG300H_KEYS_POLL_INTERVAL     20      /* msecs */
 #define WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL (3 * WZRHPAG300H_KEYS_POLL_INTERVAL)
 
-#ifdef CONFIG_MTD_CONCAT
-
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wzrhpag300h_flash_partitions[] = {
        {
@@ -122,11 +121,9 @@ static void add_mtd_concat_notifier(void)
        register_mtd_user(&not);
 }
 
-#endif
-
 static struct gpio_led wzrhpag300h_leds_gpio[] __initdata = {
        {
-               .name           = "wzr-hp-ag300h:red:diag",
+               .name           = "buffalo:red:diag",
                .gpio           = 1,
                .active_low     = 1,
        },
@@ -189,13 +186,15 @@ static struct spi_board_info ar71xx_spi_info[] = {
 
 static void __init wzrhpag300h_setup(void)
 {
-       u8 *eeprom = (u8 *) KSEG1ADDR(0x1f051000);
-       u8 *mac = eeprom + WZRHPAG300H_MAC_OFFSET;
+       u8 *eeprom1 = (u8 *) KSEG1ADDR(0x1f051000);
+       u8 *eeprom2 = (u8 *) KSEG1ADDR(0x1f055000);
+       u8 *mac1 = eeprom1 + WZRHPAG300H_MAC_OFFSET;
+       u8 *mac2 = eeprom2 + WZRHPAG300H_MAC_OFFSET;
 
-       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
-       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 1);
 
-       ar71xx_add_device_mdio(~(BIT(0) | BIT(4)));
+       ar71xx_add_device_mdio(0, ~(BIT(0) | BIT(4)));
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth0_data.speed = SPEED_1000;
@@ -209,6 +208,8 @@ static void __init wzrhpag300h_setup(void)
        ar71xx_add_device_eth(1);
 
        ar71xx_add_device_usb();
+       gpio_request(2, "usb");
+       gpio_direction_output(2, 1);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wzrhpag300h_leds_gpio),
                                        wzrhpag300h_leds_gpio);
@@ -220,11 +221,9 @@ static void __init wzrhpag300h_setup(void)
        ar71xx_add_device_spi(NULL, ar71xx_spi_info,
                              ARRAY_SIZE(ar71xx_spi_info));
 
-#ifdef CONFIG_MTD_CONCAT
        add_mtd_concat_notifier();
-#endif
 
-       ap94_pci_init(eeprom, mac, NULL, NULL);
+       ap94_pci_init(eeprom1, mac1, eeprom2, mac2);
 }
 
 MIPS_MACHINE(AR71XX_MACH_WZR_HP_AG300H, "WZR-HP-AG300H",