ar71xx: rename set_pll callback to set_speed in ag71xx_platform_data
[openwrt/staging/wigyori.git] / target / linux / ar71xx / files / arch / mips / ar71xx / devices.c
index 6f1d2619efe3574a747aa18d0eebcc4f58c5fdc5..b131818454306e84ea5d591661aabace2dc62ea4 100644 (file)
@@ -1,10 +1,12 @@
 /*
  *  Atheros AR71xx SoC platform devices
  *
+ *  Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
  *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
- *  Parts of this file are based on Atheros' 2.6.15 BSP
+ *  Parts of this file are based on Atheros 2.6.15 BSP
+ *  Parts of this file are based on Atheros 2.6.31 BSP
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
 #include <linux/serial_8250.h>
 
 #include <asm/mach-ar71xx/ar71xx.h>
+#include <asm/mach-ar71xx/ar933x_uart_platform.h>
 
 #include "devices.h"
 
-static u8 ar71xx_mac_base[ETH_ALEN] __initdata;
+unsigned char ar71xx_mac_base[ETH_ALEN] __initdata;
 
 static struct resource ar71xx_uart_resources[] = {
        {
@@ -55,13 +58,68 @@ static struct platform_device ar71xx_uart_device = {
        },
 };
 
+static struct resource ar933x_uart_resources[] = {
+       {
+               .start  = AR933X_UART_BASE,
+               .end    = AR933X_UART_BASE + AR71XX_UART_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = AR71XX_MISC_IRQ_UART,
+               .end    = AR71XX_MISC_IRQ_UART,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct ar933x_uart_platform_data ar933x_uart_data;
+static struct platform_device ar933x_uart_device = {
+       .name           = "ar933x-uart",
+       .id             = -1,
+       .resource       = ar933x_uart_resources,
+       .num_resources  = ARRAY_SIZE(ar933x_uart_resources),
+       .dev = {
+               .platform_data  = &ar933x_uart_data,
+       },
+};
+
 void __init ar71xx_add_device_uart(void)
 {
-       ar71xx_uart_data[0].uartclk = ar71xx_ahb_freq;
-       platform_device_register(&ar71xx_uart_device);
+       struct platform_device *pdev;
+
+       switch (ar71xx_soc) {
+       case AR71XX_SOC_AR7130:
+       case AR71XX_SOC_AR7141:
+       case AR71XX_SOC_AR7161:
+       case AR71XX_SOC_AR7240:
+       case AR71XX_SOC_AR7241:
+       case AR71XX_SOC_AR7242:
+       case AR71XX_SOC_AR9130:
+       case AR71XX_SOC_AR9132:
+               pdev = &ar71xx_uart_device;
+               ar71xx_uart_data[0].uartclk = ar71xx_ahb_freq;
+               break;
+
+       case AR71XX_SOC_AR9330:
+       case AR71XX_SOC_AR9331:
+               pdev = &ar933x_uart_device;
+               ar933x_uart_data.uartclk = ar71xx_ref_freq;
+               break;
+
+       case AR71XX_SOC_AR9341:
+       case AR71XX_SOC_AR9342:
+       case AR71XX_SOC_AR9344:
+               pdev = &ar71xx_uart_device;
+               ar71xx_uart_data[0].uartclk = ar71xx_ref_freq;
+               break;
+
+       default:
+               BUG();
+       }
+
+       platform_device_register(pdev);
 }
 
-static struct resource ar71xx_mdio_resources[] = {
+static struct resource ar71xx_mdio0_resources[] = {
        {
                .name   = "mdio_base",
                .flags  = IORESOURCE_MEM,
@@ -70,34 +128,38 @@ static struct resource ar71xx_mdio_resources[] = {
        }
 };
 
-static struct ag71xx_mdio_platform_data ar71xx_mdio_data;
+static struct ag71xx_mdio_platform_data ar71xx_mdio0_data;
 
-struct platform_device ar71xx_mdio_device = {
+struct platform_device ar71xx_mdio0_device = {
        .name           = "ag71xx-mdio",
-       .id             = -1,
-       .resource       = ar71xx_mdio_resources,
-       .num_resources  = ARRAY_SIZE(ar71xx_mdio_resources),
+       .id             = 0,
+       .resource       = ar71xx_mdio0_resources,
+       .num_resources  = ARRAY_SIZE(ar71xx_mdio0_resources),
        .dev = {
-               .platform_data = &ar71xx_mdio_data,
+               .platform_data = &ar71xx_mdio0_data,
        },
 };
 
-void __init ar71xx_add_device_mdio(u32 phy_mask)
-{
-       switch (ar71xx_soc) {
-       case AR71XX_SOC_AR7240:
-       case AR71XX_SOC_AR7241:
-       case AR71XX_SOC_AR7242:
-               ar71xx_mdio_data.is_ar7240 = 1;
-               break;
-       default:
-               break;
+static struct resource ar71xx_mdio1_resources[] = {
+       {
+               .name   = "mdio_base",
+               .flags  = IORESOURCE_MEM,
+               .start  = AR71XX_GE1_BASE,
+               .end    = AR71XX_GE1_BASE + 0x200 - 1,
        }
+};
 
-       ar71xx_mdio_data.phy_mask = phy_mask;
+static struct ag71xx_mdio_platform_data ar71xx_mdio1_data;
 
-       platform_device_register(&ar71xx_mdio_device);
-}
+struct platform_device ar71xx_mdio1_device = {
+       .name           = "ag71xx-mdio",
+       .id             = 1,
+       .resource       = ar71xx_mdio1_resources,
+       .num_resources  = ARRAY_SIZE(ar71xx_mdio1_resources),
+       .dev = {
+               .platform_data = &ar71xx_mdio1_data,
+       },
+};
 
 static void ar71xx_set_pll(u32 cfg_reg, u32 pll_reg, u32 pll_val, u32 shift)
 {
@@ -128,6 +190,95 @@ static void ar71xx_set_pll(u32 cfg_reg, u32 pll_reg, u32 pll_val, u32 shift)
        iounmap(base);
 }
 
+static void __init ar71xx_mii_ctrl_set_if(unsigned int reg,
+                                         unsigned int mii_if)
+{
+       void __iomem *base;
+       u32 t;
+
+       base = ioremap(AR71XX_MII_BASE, AR71XX_MII_SIZE);
+
+       t = __raw_readl(base + reg);
+       t &= ~(MII_CTRL_IF_MASK);
+       t |= (mii_if & MII_CTRL_IF_MASK);
+       __raw_writel(t, base + reg);
+
+       iounmap(base);
+}
+
+void __init ar71xx_add_device_mdio(unsigned int id, u32 phy_mask)
+{
+       struct platform_device *mdio_dev;
+       struct ag71xx_mdio_platform_data *mdio_data;
+       unsigned int max_id;
+
+       if (ar71xx_soc == AR71XX_SOC_AR9341 ||
+           ar71xx_soc == AR71XX_SOC_AR9342 ||
+           ar71xx_soc == AR71XX_SOC_AR9344)
+               max_id = 1;
+       else
+               max_id = 0;
+
+       if (id > max_id) {
+               printk(KERN_ERR "ar71xx: invalid MDIO id %u\n", id);
+               return;
+       }
+
+       switch (ar71xx_soc) {
+       case AR71XX_SOC_AR7241:
+       case AR71XX_SOC_AR9330:
+       case AR71XX_SOC_AR9331:
+               mdio_dev = &ar71xx_mdio1_device;
+               mdio_data = &ar71xx_mdio1_data;
+               break;
+
+       case AR71XX_SOC_AR9341:
+       case AR71XX_SOC_AR9342:
+       case AR71XX_SOC_AR9344:
+               if (id == 0) {
+                       mdio_dev = &ar71xx_mdio0_device;
+                       mdio_data = &ar71xx_mdio0_data;
+               } else {
+                       mdio_dev = &ar71xx_mdio1_device;
+                       mdio_data = &ar71xx_mdio1_data;
+               }
+               break;
+
+       case AR71XX_SOC_AR7242:
+               ar71xx_set_pll(AR71XX_PLL_REG_SEC_CONFIG,
+                              AR7242_PLL_REG_ETH0_INT_CLOCK, 0x62000000,
+                              AR71XX_ETH0_PLL_SHIFT);
+               /* fall through */
+       default:
+               mdio_dev = &ar71xx_mdio0_device;
+               mdio_data = &ar71xx_mdio0_data;
+               break;
+       }
+
+       mdio_data->phy_mask = phy_mask;
+
+       switch (ar71xx_soc) {
+       case AR71XX_SOC_AR7240:
+       case AR71XX_SOC_AR7241:
+       case AR71XX_SOC_AR9330:
+       case AR71XX_SOC_AR9331:
+               mdio_data->is_ar7240 = 1;
+               break;
+
+       case AR71XX_SOC_AR9341:
+       case AR71XX_SOC_AR9342:
+       case AR71XX_SOC_AR9344:
+               if (id == 1)
+                       mdio_data->is_ar7240 = 1;
+               break;
+
+       default:
+               break;
+       }
+
+       platform_device_register(mdio_dev);
+}
+
 struct ar71xx_eth_pll_data ar71xx_eth0_pll_data;
 struct ar71xx_eth_pll_data ar71xx_eth1_pll_data;
 
@@ -164,7 +315,7 @@ static u32 ar71xx_get_eth_pll(unsigned int mac, int speed)
        return pll_val;
 }
 
-static void ar71xx_set_pll_ge0(int speed)
+static void ar71xx_set_speed_ge0(int speed)
 {
        u32 val = ar71xx_get_eth_pll(0, speed);
 
@@ -172,7 +323,7 @@ static void ar71xx_set_pll_ge0(int speed)
                        val, AR71XX_ETH0_PLL_SHIFT);
 }
 
-static void ar71xx_set_pll_ge1(int speed)
+static void ar71xx_set_speed_ge1(int speed)
 {
        u32 val = ar71xx_get_eth_pll(1, speed);
 
@@ -180,17 +331,27 @@ static void ar71xx_set_pll_ge1(int speed)
                         val, AR71XX_ETH1_PLL_SHIFT);
 }
 
-static void ar724x_set_pll_ge0(int speed)
+static void ar724x_set_speed_ge0(int speed)
 {
        /* TODO */
 }
 
-static void ar724x_set_pll_ge1(int speed)
+static void ar724x_set_speed_ge1(int speed)
 {
        /* TODO */
 }
 
-static void ar91xx_set_pll_ge0(int speed)
+static void ar7242_set_speed_ge0(int speed)
+{
+       u32 val = ar71xx_get_eth_pll(0, speed);
+       void __iomem *base;
+
+       base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE);
+       __raw_writel(val, base + AR7242_PLL_REG_ETH0_INT_CLOCK);
+       iounmap(base);
+}
+
+static void ar91xx_set_speed_ge0(int speed)
 {
        u32 val = ar71xx_get_eth_pll(0, speed);
 
@@ -198,7 +359,7 @@ static void ar91xx_set_pll_ge0(int speed)
                         val, AR91XX_ETH0_PLL_SHIFT);
 }
 
-static void ar91xx_set_pll_ge1(int speed)
+static void ar91xx_set_speed_ge1(int speed)
 {
        u32 val = ar71xx_get_eth_pll(1, speed);
 
@@ -206,6 +367,26 @@ static void ar91xx_set_pll_ge1(int speed)
                         val, AR91XX_ETH1_PLL_SHIFT);
 }
 
+static void ar933x_set_speed_ge0(int speed)
+{
+       /* TODO */
+}
+
+static void ar933x_set_speed_ge1(int speed)
+{
+       /* TODO */
+}
+
+static void ar934x_set_speed_ge0(int speed)
+{
+       /* TODO */
+}
+
+static void ar934x_set_speed_ge1(int speed)
+{
+       /* TODO */
+}
+
 static void ar71xx_ddr_flush_ge0(void)
 {
        ar71xx_ddr_flush(AR71XX_DDR_REG_FLUSH_GE0);
@@ -236,6 +417,26 @@ static void ar91xx_ddr_flush_ge1(void)
        ar71xx_ddr_flush(AR91XX_DDR_REG_FLUSH_GE1);
 }
 
+static void ar933x_ddr_flush_ge0(void)
+{
+       ar71xx_ddr_flush(AR933X_DDR_REG_FLUSH_GE0);
+}
+
+static void ar933x_ddr_flush_ge1(void)
+{
+       ar71xx_ddr_flush(AR933X_DDR_REG_FLUSH_GE1);
+}
+
+static void ar934x_ddr_flush_ge0(void)
+{
+       ar71xx_ddr_flush(AR934X_DDR_REG_FLUSH_GE0);
+}
+
+static void ar934x_ddr_flush_ge1(void)
+{
+       ar71xx_ddr_flush(AR934X_DDR_REG_FLUSH_GE1);
+}
+
 static struct resource ar71xx_eth0_resources[] = {
        {
                .name   = "mac_base",
@@ -310,10 +511,22 @@ struct platform_device ar71xx_eth1_device = {
 #define AR724X_PLL_VAL_100     0x00001099
 #define AR724X_PLL_VAL_10      0x00991099
 
+#define AR7242_PLL_VAL_1000    0x16000000
+#define AR7242_PLL_VAL_100     0x00000101
+#define AR7242_PLL_VAL_10      0x00001616
+
 #define AR91XX_PLL_VAL_1000    0x1a000000
 #define AR91XX_PLL_VAL_100     0x13000a44
 #define AR91XX_PLL_VAL_10      0x00441099
 
+#define AR933X_PLL_VAL_1000    0x00110000
+#define AR933X_PLL_VAL_100     0x00001099
+#define AR933X_PLL_VAL_10      0x00991099
+
+#define AR934X_PLL_VAL_1000    0x00110000
+#define AR934X_PLL_VAL_100     0x00001099
+#define AR934X_PLL_VAL_10      0x00991099
+
 static void __init ar71xx_init_eth_pll_data(unsigned int id)
 {
        struct ar71xx_eth_pll_data *pll_data;
@@ -341,18 +554,39 @@ static void __init ar71xx_init_eth_pll_data(unsigned int id)
 
        case AR71XX_SOC_AR7240:
        case AR71XX_SOC_AR7241:
-       case AR71XX_SOC_AR7242:
                pll_10 = AR724X_PLL_VAL_10;
                pll_100 = AR724X_PLL_VAL_100;
                pll_1000 = AR724X_PLL_VAL_1000;
                break;
 
+       case AR71XX_SOC_AR7242:
+               pll_10 = AR7242_PLL_VAL_10;
+               pll_100 = AR7242_PLL_VAL_100;
+               pll_1000 = AR7242_PLL_VAL_1000;
+               break;
+
        case AR71XX_SOC_AR9130:
        case AR71XX_SOC_AR9132:
                pll_10 = AR91XX_PLL_VAL_10;
                pll_100 = AR91XX_PLL_VAL_100;
                pll_1000 = AR91XX_PLL_VAL_1000;
                break;
+
+       case AR71XX_SOC_AR9330:
+       case AR71XX_SOC_AR9331:
+               pll_10 = AR933X_PLL_VAL_10;
+               pll_100 = AR933X_PLL_VAL_100;
+               pll_1000 = AR933X_PLL_VAL_1000;
+               break;
+
+       case AR71XX_SOC_AR9341:
+       case AR71XX_SOC_AR9342:
+       case AR71XX_SOC_AR9344:
+               pll_10 = AR934X_PLL_VAL_10;
+               pll_100 = AR934X_PLL_VAL_100;
+               pll_1000 = AR934X_PLL_VAL_1000;
+               break;
+
        default:
                BUG();
        }
@@ -367,86 +601,196 @@ static void __init ar71xx_init_eth_pll_data(unsigned int id)
                pll_data->pll_1000 = pll_1000;
 }
 
-static int ar71xx_eth_instance __initdata;
-void __init ar71xx_add_device_eth(unsigned int id)
+static int __init ar71xx_setup_phy_if_mode(unsigned int id,
+                                          struct ag71xx_platform_data *pdata)
 {
-       struct platform_device *pdev;
-       struct ag71xx_platform_data *pdata;
-
-       ar71xx_init_eth_pll_data(id);
+       unsigned int mii_if;
 
        switch (id) {
        case 0:
-               switch (ar71xx_eth0_data.phy_if_mode) {
-               case PHY_INTERFACE_MODE_MII:
-                       ar71xx_eth0_data.mii_if = MII0_CTRL_IF_MII;
+               switch (ar71xx_soc) {
+               case AR71XX_SOC_AR7130:
+               case AR71XX_SOC_AR7141:
+               case AR71XX_SOC_AR7161:
+               case AR71XX_SOC_AR9130:
+               case AR71XX_SOC_AR9132:
+                       switch (pdata->phy_if_mode) {
+                       case PHY_INTERFACE_MODE_MII:
+                               mii_if = MII0_CTRL_IF_MII;
+                               break;
+                       case PHY_INTERFACE_MODE_GMII:
+                               mii_if = MII0_CTRL_IF_GMII;
+                               break;
+                       case PHY_INTERFACE_MODE_RGMII:
+                               mii_if = MII0_CTRL_IF_RGMII;
+                               break;
+                       case PHY_INTERFACE_MODE_RMII:
+                               mii_if = MII0_CTRL_IF_RMII;
+                               break;
+                       default:
+                               return -EINVAL;
+                       }
+                       ar71xx_mii_ctrl_set_if(MII_REG_MII0_CTRL, mii_if);
                        break;
-               case PHY_INTERFACE_MODE_GMII:
-                       ar71xx_eth0_data.mii_if = MII0_CTRL_IF_GMII;
-                       break;
-               case PHY_INTERFACE_MODE_RGMII:
-                       ar71xx_eth0_data.mii_if = MII0_CTRL_IF_RGMII;
+
+               case AR71XX_SOC_AR7240:
+               case AR71XX_SOC_AR7241:
+               case AR71XX_SOC_AR9330:
+               case AR71XX_SOC_AR9331:
+                       pdata->phy_if_mode = PHY_INTERFACE_MODE_MII;
                        break;
-               case PHY_INTERFACE_MODE_RMII:
-                       ar71xx_eth0_data.mii_if = MII0_CTRL_IF_RMII;
+
+               case AR71XX_SOC_AR7242:
+                       /* FIXME */
+
+               case AR71XX_SOC_AR9341:
+               case AR71XX_SOC_AR9342:
+               case AR71XX_SOC_AR9344:
+                       switch (pdata->phy_if_mode) {
+                       case PHY_INTERFACE_MODE_MII:
+                       case PHY_INTERFACE_MODE_GMII:
+                       case PHY_INTERFACE_MODE_RGMII:
+                       case PHY_INTERFACE_MODE_RMII:
+                               break;
+                       default:
+                               return -EINVAL;
+                       }
                        break;
+
                default:
-                       printk(KERN_ERR "ar71xx: invalid PHY interface mode "
-                                       "for eth0\n");
-                       return;
+                       BUG();
                }
-               pdev = &ar71xx_eth0_device;
                break;
        case 1:
-               switch (ar71xx_eth1_data.phy_if_mode) {
-               case PHY_INTERFACE_MODE_RMII:
-                       ar71xx_eth1_data.mii_if = MII1_CTRL_IF_RMII;
+               switch (ar71xx_soc) {
+               case AR71XX_SOC_AR7130:
+               case AR71XX_SOC_AR7141:
+               case AR71XX_SOC_AR7161:
+               case AR71XX_SOC_AR9130:
+               case AR71XX_SOC_AR9132:
+                       switch (pdata->phy_if_mode) {
+                       case PHY_INTERFACE_MODE_RMII:
+                               mii_if = MII1_CTRL_IF_RMII;
+                               break;
+                       case PHY_INTERFACE_MODE_RGMII:
+                               mii_if = MII1_CTRL_IF_RGMII;
+                               break;
+                       default:
+                               return -EINVAL;
+                       }
+                       ar71xx_mii_ctrl_set_if(MII_REG_MII1_CTRL, mii_if);
                        break;
-               case PHY_INTERFACE_MODE_RGMII:
-                       ar71xx_eth1_data.mii_if = MII1_CTRL_IF_RGMII;
+
+               case AR71XX_SOC_AR7240:
+               case AR71XX_SOC_AR7241:
+               case AR71XX_SOC_AR9330:
+               case AR71XX_SOC_AR9331:
+                       pdata->phy_if_mode = PHY_INTERFACE_MODE_GMII;
+                       break;
+
+               case AR71XX_SOC_AR7242:
+                       /* FIXME */
+
+               case AR71XX_SOC_AR9341:
+               case AR71XX_SOC_AR9342:
+               case AR71XX_SOC_AR9344:
+                       switch (pdata->phy_if_mode) {
+                       case PHY_INTERFACE_MODE_MII:
+                       case PHY_INTERFACE_MODE_GMII:
+                               break;
+                       default:
+                               return -EINVAL;
+                       }
                        break;
+
                default:
-                       printk(KERN_ERR "ar71xx: invalid PHY interface mode "
-                                       "for eth1\n");
-                       return;
+                       BUG();
                }
-               pdev = &ar71xx_eth1_device;
                break;
-       default:
+       }
+
+       return 0;
+}
+
+static int ar71xx_eth_instance __initdata;
+void __init ar71xx_add_device_eth(unsigned int id)
+{
+       struct platform_device *pdev;
+       struct ag71xx_platform_data *pdata;
+       int err;
+
+       if (id > 1) {
                printk(KERN_ERR "ar71xx: invalid ethernet id %d\n", id);
                return;
        }
 
+       ar71xx_init_eth_pll_data(id);
+
+       if (id == 0)
+               pdev = &ar71xx_eth0_device;
+       else
+               pdev = &ar71xx_eth1_device;
+
        pdata = pdev->dev.platform_data;
 
+       err = ar71xx_setup_phy_if_mode(id, pdata);
+       if (err) {
+               printk(KERN_ERR
+                      "ar71xx: invalid PHY interface mode for GE%u\n", id);
+               return;
+       }
+
        switch (ar71xx_soc) {
        case AR71XX_SOC_AR7130:
                pdata->ddr_flush = id ? ar71xx_ddr_flush_ge1
                                      : ar71xx_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar71xx_set_pll_ge1
-                                    : ar71xx_set_pll_ge0;
+               pdata->set_speed = id ? ar71xx_set_speed_ge1
+                                     : ar71xx_set_speed_ge0;
                break;
 
        case AR71XX_SOC_AR7141:
        case AR71XX_SOC_AR7161:
                pdata->ddr_flush = id ? ar71xx_ddr_flush_ge1
                                      : ar71xx_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar71xx_set_pll_ge1
-                                    : ar71xx_set_pll_ge0;
+               pdata->set_speed = id ? ar71xx_set_speed_ge1
+                                     : ar71xx_set_speed_ge0;
                pdata->has_gbit = 1;
                break;
 
-       case AR71XX_SOC_AR7241:
        case AR71XX_SOC_AR7242:
+               ar71xx_eth0_data.reset_bit |= AR724X_RESET_GE0_MDIO |
+                                             RESET_MODULE_GE0_PHY;
+               ar71xx_eth1_data.reset_bit |= AR724X_RESET_GE1_MDIO |
+                                             RESET_MODULE_GE1_PHY;
+               pdata->ddr_flush = id ? ar724x_ddr_flush_ge1
+                                     : ar724x_ddr_flush_ge0;
+               pdata->set_speed = id ? ar724x_set_speed_ge1
+                                     : ar7242_set_speed_ge0;
+               pdata->has_gbit = 1;
+               pdata->is_ar724x = 1;
+
+               if (!pdata->fifo_cfg1)
+                       pdata->fifo_cfg1 = 0x0010ffff;
+               if (!pdata->fifo_cfg2)
+                       pdata->fifo_cfg2 = 0x015500aa;
+               if (!pdata->fifo_cfg3)
+                       pdata->fifo_cfg3 = 0x01f00140;
+               break;
+
+       case AR71XX_SOC_AR7241:
                ar71xx_eth0_data.reset_bit |= AR724X_RESET_GE0_MDIO;
                ar71xx_eth1_data.reset_bit |= AR724X_RESET_GE1_MDIO;
                /* fall through */
        case AR71XX_SOC_AR7240:
+               ar71xx_eth0_data.reset_bit |= RESET_MODULE_GE0_PHY;
+               ar71xx_eth1_data.reset_bit |= RESET_MODULE_GE1_PHY;
                pdata->ddr_flush = id ? ar724x_ddr_flush_ge1
                                      : ar724x_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar724x_set_pll_ge1
-                                    : ar724x_set_pll_ge0;
+               pdata->set_speed = id ? ar724x_set_speed_ge1
+                                     : ar724x_set_speed_ge0;
                pdata->is_ar724x = 1;
+               if (ar71xx_soc == AR71XX_SOC_AR7240)
+                       pdata->is_ar7240 = 1;
 
                if (!pdata->fifo_cfg1)
                        pdata->fifo_cfg1 = 0x0010ffff;
@@ -459,20 +803,63 @@ void __init ar71xx_add_device_eth(unsigned int id)
        case AR71XX_SOC_AR9130:
                pdata->ddr_flush = id ? ar91xx_ddr_flush_ge1
                                      : ar91xx_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar91xx_set_pll_ge1
-                                    : ar91xx_set_pll_ge0;
+               pdata->set_speed = id ? ar91xx_set_speed_ge1
+                                     : ar91xx_set_speed_ge0;
                pdata->is_ar91xx = 1;
                break;
 
        case AR71XX_SOC_AR9132:
                pdata->ddr_flush = id ? ar91xx_ddr_flush_ge1
                                      : ar91xx_ddr_flush_ge0;
-               pdata->set_pll =  id ? ar91xx_set_pll_ge1
-                                     : ar91xx_set_pll_ge0;
+               pdata->set_speed = id ? ar91xx_set_speed_ge1
+                                     : ar91xx_set_speed_ge0;
                pdata->is_ar91xx = 1;
                pdata->has_gbit = 1;
                break;
 
+       case AR71XX_SOC_AR9330:
+       case AR71XX_SOC_AR9331:
+               ar71xx_eth0_data.reset_bit = AR933X_RESET_GE0_MAC |
+                                            AR933X_RESET_GE0_MDIO;
+               ar71xx_eth1_data.reset_bit = AR933X_RESET_GE1_MAC |
+                                            AR933X_RESET_GE1_MDIO;
+               pdata->ddr_flush = id ? ar933x_ddr_flush_ge1
+                                     : ar933x_ddr_flush_ge0;
+               pdata->set_speed = id ? ar933x_set_speed_ge1
+                                     : ar933x_set_speed_ge0;
+               pdata->has_gbit = 1;
+               pdata->is_ar724x = 1;
+
+               if (!pdata->fifo_cfg1)
+                       pdata->fifo_cfg1 = 0x0010ffff;
+               if (!pdata->fifo_cfg2)
+                       pdata->fifo_cfg2 = 0x015500aa;
+               if (!pdata->fifo_cfg3)
+                       pdata->fifo_cfg3 = 0x01f00140;
+               break;
+
+       case AR71XX_SOC_AR9341:
+       case AR71XX_SOC_AR9342:
+       case AR71XX_SOC_AR9344:
+               ar71xx_eth0_data.reset_bit = AR934X_RESET_GE0_MAC |
+                                            AR934X_RESET_GE0_MDIO;
+               ar71xx_eth1_data.reset_bit = AR934X_RESET_GE1_MAC |
+                                            AR934X_RESET_GE1_MDIO;
+               pdata->ddr_flush = id ? ar934x_ddr_flush_ge1
+                                     : ar934x_ddr_flush_ge0;
+               pdata->set_speed = id ? ar934x_set_speed_ge1
+                                     : ar934x_set_speed_ge0;
+               pdata->has_gbit = 1;
+               pdata->is_ar724x = 1;
+
+               if (!pdata->fifo_cfg1)
+                       pdata->fifo_cfg1 = 0x0010ffff;
+               if (!pdata->fifo_cfg2)
+                       pdata->fifo_cfg2 = 0x015500aa;
+               if (!pdata->fifo_cfg3)
+                       pdata->fifo_cfg3 = 0x01f00140;
+               break;
+
        default:
                BUG();
        }
@@ -490,18 +877,35 @@ void __init ar71xx_add_device_eth(unsigned int id)
                break;
        }
 
-       if (is_valid_ether_addr(ar71xx_mac_base)) {
-               memcpy(pdata->mac_addr, ar71xx_mac_base, ETH_ALEN);
-               pdata->mac_addr[5] += ar71xx_eth_instance;
-       } else {
+       if (!is_valid_ether_addr(pdata->mac_addr)) {
                random_ether_addr(pdata->mac_addr);
                printk(KERN_DEBUG
                        "ar71xx: using random MAC address for eth%d\n",
                        ar71xx_eth_instance);
        }
 
-       if (pdata->mii_bus_dev == NULL)
-               pdata->mii_bus_dev = &ar71xx_mdio_device.dev;
+       if (pdata->mii_bus_dev == NULL) {
+               switch (ar71xx_soc) {
+               case AR71XX_SOC_AR9341:
+               case AR71XX_SOC_AR9342:
+               case AR71XX_SOC_AR9344:
+                       if (id == 0)
+                               pdata->mii_bus_dev = &ar71xx_mdio0_device.dev;
+                       else
+                               pdata->mii_bus_dev = &ar71xx_mdio1_device.dev;
+                       break;
+
+               case AR71XX_SOC_AR7241:
+               case AR71XX_SOC_AR9330:
+               case AR71XX_SOC_AR9331:
+                       pdata->mii_bus_dev = &ar71xx_mdio1_device.dev;
+                       break;
+
+               default:
+                       pdata->mii_bus_dev = &ar71xx_mdio0_device.dev;
+                       break;
+               }
+       }
 
        /* Reset the device */
        ar71xx_device_stop(pdata->reset_bit);
@@ -580,3 +984,24 @@ static int __init ar71xx_kmac_setup(char *str)
        return 1;
 }
 __setup("kmac=", ar71xx_kmac_setup);
+
+void __init ar71xx_init_mac(unsigned char *dst, const unsigned char *src,
+                           unsigned offset)
+{
+       u32 t;
+
+       if (!is_valid_ether_addr(src)) {
+               memset(dst, '\0', ETH_ALEN);
+               return;
+       }
+
+       t = (((u32) src[3]) << 16) + (((u32) src[4]) << 8) + ((u32) src[5]);
+       t += offset;
+
+       dst[0] = src[0];
+       dst[1] = src[1];
+       dst[2] = src[2];
+       dst[3] = (t >> 16) & 0xff;
+       dst[4] = (t >> 8) & 0xff;
+       dst[5] = t & 0xff;
+}