ar71xx: build ALFA AP96 images with default profile as well

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb750.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb750.c
index 3972f57..9b63dc3 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb750.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb750.c
@@ -13,7 +13,7 @@
 #include <asm/mach-ar71xx/mach-rb750.h>
 
 #include "machtype.h"
-#include "dev-ap91-eth.h"
+#include "devices.h"
 
 static struct rb750_led_data rb750_leds[] = {
        {
@@ -55,13 +55,6 @@ static struct platform_device rb750_leds_device = {
        }
 };
 
-static const char *rb750_port_names[AP91_ETH_NUM_PORT_NAMES] __initdata = {
-       "port5",
-       "port4",
-       "port3",
-       "port2",
-};
-
 static struct platform_device rb750_nand_device = {
        .name   = "rb750-nand",
        .id     = -1,
@@ -88,29 +81,29 @@ int rb750_latch_change(u32 mask_clr, u32 mask_set)
        latch_clr = (latch_clr | mask_clr) & ~mask_set;
 
        if (latch_oe == 0)
-               latch_oe = __raw_readl(ar71xx_gpio_base + GPIO_REG_OE);
+               latch_oe = __raw_readl(ar71xx_gpio_base + AR71XX_GPIO_REG_OE);
 
        if (likely(latch_set & RB750_LVC573_LE)) {
                void __iomem *base = ar71xx_gpio_base;
 
-               t = __raw_readl(base + GPIO_REG_OE);
+               t = __raw_readl(base + AR71XX_GPIO_REG_OE);
                t |= mask_clr | latch_oe | mask_set;
 
-               __raw_writel(t, base + GPIO_REG_OE);
-               __raw_writel(latch_clr, base + GPIO_REG_CLEAR);
-               __raw_writel(latch_set, base + GPIO_REG_SET);
+               __raw_writel(t, base + AR71XX_GPIO_REG_OE);
+               __raw_writel(latch_clr, base + AR71XX_GPIO_REG_CLEAR);
+               __raw_writel(latch_set, base + AR71XX_GPIO_REG_SET);
        } else if (mask_clr & RB750_LVC573_LE) {
                void __iomem *base = ar71xx_gpio_base;
 
-               latch_oe = __raw_readl(base + GPIO_REG_OE);
-               __raw_writel(RB750_LVC573_LE, base + GPIO_REG_CLEAR);
+               latch_oe = __raw_readl(base + AR71XX_GPIO_REG_OE);
+               __raw_writel(RB750_LVC573_LE, base + AR71XX_GPIO_REG_CLEAR);
                /* flush write */
-               __raw_readl(base + GPIO_REG_CLEAR);
+               __raw_readl(base + AR71XX_GPIO_REG_CLEAR);
        }
 
        ret = 1;
 
- unlock:
+unlock:
        spin_unlock_irqrestore(&lock, flags);
        return ret;
 }
@@ -124,7 +117,17 @@ static void __init rb750_setup(void)
                                     AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
                                     AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
 
-       ap91_eth_init(NULL, rb750_port_names);
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, 1);
+
+       ar71xx_add_device_mdio(0, 0x0);
+
+       /* LAN ports */
+       ar71xx_add_device_eth(1);
+
+       /* WAN port */
+       ar71xx_add_device_eth(0);
+
        platform_device_register(&rb750_leds_device);
        platform_device_register(&rb750_nand_device);
 }