ar71xx: move phy interface setup into a separate function
[openwrt.git] / target / linux / ar71xx / files / arch / mips / ar71xx / devices.c
index 5ff65e0..0091ac2 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/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/dma-mapping.h>
 #include <linux/etherdevice.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
-#include <linux/ath9k_platform.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;
 
-/*
- * OHCI (USB full speed host controller)
- */
-static struct resource ar71xx_ohci_resources[] = {
-       [0] = {
-               .start  = AR71XX_OHCI_BASE,
-               .end    = AR71XX_OHCI_BASE + AR71XX_OHCI_SIZE - 1,
+static struct resource ar71xx_uart_resources[] = {
+       {
+               .start  = AR71XX_UART_BASE,
+               .end    = AR71XX_UART_BASE + AR71XX_UART_SIZE - 1,
                .flags  = IORESOURCE_MEM,
        },
-       [1] = {
-               .start  = AR71XX_MISC_IRQ_OHCI,
-               .end    = AR71XX_MISC_IRQ_OHCI,
-               .flags  = IORESOURCE_IRQ,
-       },
 };
 
-static u64 ar71xx_ohci_dmamask = DMA_BIT_MASK(32);
-static struct platform_device ar71xx_ohci_device = {
-       .name           = "ar71xx-ohci",
-       .id             = -1,
-       .resource       = ar71xx_ohci_resources,
-       .num_resources  = ARRAY_SIZE(ar71xx_ohci_resources),
+#define AR71XX_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
+static struct plat_serial8250_port ar71xx_uart_data[] = {
+       {
+               .mapbase        = AR71XX_UART_BASE,
+               .irq            = AR71XX_MISC_IRQ_UART,
+               .flags          = AR71XX_UART_FLAGS,
+               .iotype         = UPIO_MEM32,
+               .regshift       = 2,
+       }, {
+               /* terminating entry */
+       }
+};
+
+static struct platform_device ar71xx_uart_device = {
+       .name           = "serial8250",
+       .id             = PLAT8250_DEV_PLATFORM,
+       .resource       = ar71xx_uart_resources,
+       .num_resources  = ARRAY_SIZE(ar71xx_uart_resources),
        .dev = {
-               .dma_mask               = &ar71xx_ohci_dmamask,
-               .coherent_dma_mask      = DMA_BIT_MASK(32),
+               .platform_data  = ar71xx_uart_data
        },
 };
 
-/*
- * EHCI (USB full speed host controller)
- */
-static struct resource ar71xx_ehci_resources[] = {
-       [0] = {
-               .start  = AR71XX_EHCI_BASE,
-               .end    = AR71XX_EHCI_BASE + AR71XX_EHCI_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
+static struct resource ar933x_uart_resources[] = {
+       {
+               .start  = AR933X_UART_BASE,
+               .end    = AR933X_UART_BASE + AR71XX_UART_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
        },
-       [1] = {
-               .start  = AR71XX_CPU_IRQ_USB,
-               .end    = AR71XX_CPU_IRQ_USB,
-               .flags  = IORESOURCE_IRQ,
+       {
+               .start  = AR71XX_MISC_IRQ_UART,
+               .end    = AR71XX_MISC_IRQ_UART,
+               .flags  = IORESOURCE_IRQ,
        },
 };
 
-
-static u64 ar71xx_ehci_dmamask = DMA_BIT_MASK(32);
-static struct ar71xx_ehci_platform_data ar71xx_ehci_data;
-
-static struct platform_device ar71xx_ehci_device = {
-       .name           = "ar71xx-ehci",
-       .id             = -1,
-       .resource       = ar71xx_ehci_resources,
-       .num_resources  = ARRAY_SIZE(ar71xx_ehci_resources),
+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 = {
-               .dma_mask               = &ar71xx_ehci_dmamask,
-               .coherent_dma_mask      = DMA_BIT_MASK(32),
-               .platform_data          = &ar71xx_ehci_data,
+               .platform_data  = &ar933x_uart_data,
        },
 };
 
-#define AR71XX_USB_RESET_MASK \
-       (RESET_MODULE_USB_HOST | RESET_MODULE_USB_PHY \
-       | RESET_MODULE_USB_OHCI_DLL)
-
-static void ar71xx_usb_setup(void)
-{
-       ar71xx_device_stop(AR71XX_USB_RESET_MASK);
-       mdelay(1000);
-       ar71xx_device_start(AR71XX_USB_RESET_MASK);
-
-       /* Turning on the Buff and Desc swap bits */
-       ar71xx_usb_ctrl_wr(USB_CTRL_REG_CONFIG, 0xf0000);
-
-       /* WAR for HW bug. Here it adjusts the duration between two SOFS */
-       ar71xx_usb_ctrl_wr(USB_CTRL_REG_FLADJ, 0x20c00);
-
-       mdelay(900);
-}
-
-static void ar91xx_usb_setup(void)
+void __init ar71xx_add_device_uart(void)
 {
-       ar71xx_device_stop(RESET_MODULE_USBSUS_OVERRIDE);
-       mdelay(10);
-
-       ar71xx_device_start(RESET_MODULE_USB_HOST);
-       mdelay(10);
-
-       ar71xx_device_start(RESET_MODULE_USB_PHY);
-       mdelay(10);
-}
+       struct platform_device *pdev;
 
-void __init ar71xx_add_device_usb(void)
-{
        switch (ar71xx_soc) {
        case AR71XX_SOC_AR7130:
        case AR71XX_SOC_AR7141:
        case AR71XX_SOC_AR7161:
-               ar71xx_usb_setup();
-               platform_device_register(&ar71xx_ohci_device);
-               platform_device_register(&ar71xx_ehci_device);
-               break;
-
+       case AR71XX_SOC_AR7240:
+       case AR71XX_SOC_AR7241:
+       case AR71XX_SOC_AR7242:
        case AR71XX_SOC_AR9130:
        case AR71XX_SOC_AR9132:
-               ar91xx_usb_setup();
-               ar71xx_ehci_data.is_ar91xx = 1;
-               platform_device_register(&ar71xx_ehci_device);
+               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_uart_resources[] = {
+static struct resource ar71xx_mdio0_resources[] = {
        {
-               .start  = AR71XX_UART_BASE,
-               .end    = AR71XX_UART_BASE + AR71XX_UART_SIZE - 1,
+               .name   = "mdio_base",
                .flags  = IORESOURCE_MEM,
-       },
-};
-
-#define AR71XX_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
-static struct plat_serial8250_port ar71xx_uart_data[] = {
-       {
-               .mapbase        = AR71XX_UART_BASE,
-               .irq            = AR71XX_MISC_IRQ_UART,
-               .flags          = AR71XX_UART_FLAGS,
-               .iotype         = UPIO_MEM32,
-               .regshift       = 2,
-       }, {
-               /* terminating entry */
+               .start  = AR71XX_GE0_BASE,
+               .end    = AR71XX_GE0_BASE + 0x200 - 1,
        }
 };
 
-static struct platform_device ar71xx_uart_device = {
-       .name           = "serial8250",
-       .id             = PLAT8250_DEV_PLATFORM,
-       .resource       = ar71xx_uart_resources,
-       .num_resources  = ARRAY_SIZE(ar71xx_uart_resources),
+static struct ag71xx_mdio_platform_data ar71xx_mdio0_data;
+
+struct platform_device ar71xx_mdio0_device = {
+       .name           = "ag71xx-mdio",
+       .id             = 0,
+       .resource       = ar71xx_mdio0_resources,
+       .num_resources  = ARRAY_SIZE(ar71xx_mdio0_resources),
        .dev = {
-               .platform_data  = ar71xx_uart_data
+               .platform_data = &ar71xx_mdio0_data,
        },
 };
 
-void __init ar71xx_add_device_uart(void)
-{
-       ar71xx_uart_data[0].uartclk = ar71xx_ahb_freq;
-       platform_device_register(&ar71xx_uart_device);
-}
-
-static struct resource ar71xx_mdio_resources[] = {
+static struct resource ar71xx_mdio1_resources[] = {
        {
                .name   = "mdio_base",
                .flags  = IORESOURCE_MEM,
-               .start  = AR71XX_GE0_BASE + 0x20,
-               .end    = AR71XX_GE0_BASE + 0x38 - 1,
+               .start  = AR71XX_GE1_BASE,
+               .end    = AR71XX_GE1_BASE + 0x200 - 1,
        }
 };
 
-static struct ag71xx_mdio_platform_data ar71xx_mdio_data = {
-       .phy_mask       = 0xffffffff,
-};
+static struct ag71xx_mdio_platform_data ar71xx_mdio1_data;
 
-static struct platform_device ar71xx_mdio_device = {
+struct platform_device ar71xx_mdio1_device = {
        .name           = "ag71xx-mdio",
-       .id             = -1,
-       .resource       = ar71xx_mdio_resources,
-       .num_resources  = ARRAY_SIZE(ar71xx_mdio_resources),
+       .id             = 1,
+       .resource       = ar71xx_mdio1_resources,
+       .num_resources  = ARRAY_SIZE(ar71xx_mdio1_resources),
        .dev = {
-               .platform_data = &ar71xx_mdio_data,
+               .platform_data = &ar71xx_mdio1_data,
        },
 };
 
-void __init ar71xx_add_device_mdio(u32 phy_mask)
-{
-       ar71xx_mdio_data.phy_mask = phy_mask;
-       platform_device_register(&ar71xx_mdio_device);
-}
-
 static void ar71xx_set_pll(u32 cfg_reg, u32 pll_reg, u32 pll_val, u32 shift)
 {
        void __iomem *base;
@@ -235,6 +190,79 @@ static void ar71xx_set_pll(u32 cfg_reg, u32 pll_reg, u32 pll_val, u32 shift)
        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;
 
@@ -297,6 +325,16 @@ static void ar724x_set_pll_ge1(int speed)
        /* TODO */
 }
 
+static void ar7242_set_pll_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_pll_ge0(int speed)
 {
        u32 val = ar71xx_get_eth_pll(0, speed);
@@ -313,6 +351,26 @@ static void ar91xx_set_pll_ge1(int speed)
                         val, AR91XX_ETH1_PLL_SHIFT);
 }
 
+static void ar933x_set_pll_ge0(int speed)
+{
+       /* TODO */
+}
+
+static void ar933x_set_pll_ge1(int speed)
+{
+       /* TODO */
+}
+
+static void ar934x_set_pll_ge0(int speed)
+{
+       /* TODO */
+}
+
+static void ar934x_set_pll_ge1(int speed)
+{
+       /* TODO */
+}
+
 static void ar71xx_ddr_flush_ge0(void)
 {
        ar71xx_ddr_flush(AR71XX_DDR_REG_FLUSH_GE0);
@@ -343,16 +401,31 @@ 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",
                .flags  = IORESOURCE_MEM,
                .start  = AR71XX_GE0_BASE,
-               .end    = AR71XX_GE0_BASE + 0x20 - 1,
-       }, {
-               .name   = "mac_base2",
-               .flags  = IORESOURCE_MEM,
-               .start  = AR71XX_GE0_BASE + 0x38,
                .end    = AR71XX_GE0_BASE + 0x200 - 1,
        }, {
                .name   = "mii_ctrl",
@@ -371,7 +444,7 @@ struct ag71xx_platform_data ar71xx_eth0_data = {
        .reset_bit      = RESET_MODULE_GE0_MAC,
 };
 
-static struct platform_device ar71xx_eth0_device = {
+struct platform_device ar71xx_eth0_device = {
        .name           = "ag71xx",
        .id             = 0,
        .resource       = ar71xx_eth0_resources,
@@ -386,11 +459,6 @@ static struct resource ar71xx_eth1_resources[] = {
                .name   = "mac_base",
                .flags  = IORESOURCE_MEM,
                .start  = AR71XX_GE1_BASE,
-               .end    = AR71XX_GE1_BASE + 0x20 - 1,
-       }, {
-               .name   = "mac_base2",
-               .flags  = IORESOURCE_MEM,
-               .start  = AR71XX_GE1_BASE + 0x38,
                .end    = AR71XX_GE1_BASE + 0x200 - 1,
        }, {
                .name   = "mii_ctrl",
@@ -409,7 +477,7 @@ struct ag71xx_platform_data ar71xx_eth1_data = {
        .reset_bit      = RESET_MODULE_GE1_MAC,
 };
 
-static struct platform_device ar71xx_eth1_device = {
+struct platform_device ar71xx_eth1_device = {
        .name           = "ag71xx",
        .id             = 1,
        .resource       = ar71xx_eth1_resources,
@@ -427,10 +495,22 @@ static 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;
@@ -457,17 +537,40 @@ static void __init ar71xx_init_eth_pll_data(unsigned int id)
                break;
 
        case AR71XX_SOC_AR7240:
+       case AR71XX_SOC_AR7241:
                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();
        }
@@ -482,58 +585,73 @@ 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);
-
        switch (id) {
        case 0:
-               switch (ar71xx_eth0_data.phy_if_mode) {
+               switch (pdata->phy_if_mode) {
                case PHY_INTERFACE_MODE_MII:
-                       ar71xx_eth0_data.mii_if = MII0_CTRL_IF_MII;
+                       pdata->mii_if = MII0_CTRL_IF_MII;
                        break;
                case PHY_INTERFACE_MODE_GMII:
-                       ar71xx_eth0_data.mii_if = MII0_CTRL_IF_GMII;
+                       pdata->mii_if = MII0_CTRL_IF_GMII;
                        break;
                case PHY_INTERFACE_MODE_RGMII:
-                       ar71xx_eth0_data.mii_if = MII0_CTRL_IF_RGMII;
+                       pdata->mii_if = MII0_CTRL_IF_RGMII;
                        break;
                case PHY_INTERFACE_MODE_RMII:
-                       ar71xx_eth0_data.mii_if = MII0_CTRL_IF_RMII;
+                       pdata->mii_if = MII0_CTRL_IF_RMII;
                        break;
                default:
-                       printk(KERN_ERR "ar71xx: invalid PHY interface mode "
-                                       "for eth0\n");
-                       return;
+                       return -EINVAL;
                }
-               pdev = &ar71xx_eth0_device;
                break;
        case 1:
-               switch (ar71xx_eth1_data.phy_if_mode) {
+               switch (pdata->phy_if_mode) {
                case PHY_INTERFACE_MODE_RMII:
-                       ar71xx_eth1_data.mii_if = MII1_CTRL_IF_RMII;
+                       pdata->mii_if = MII1_CTRL_IF_RMII;
                        break;
                case PHY_INTERFACE_MODE_RGMII:
-                       ar71xx_eth1_data.mii_if = MII1_CTRL_IF_RGMII;
+                       pdata->mii_if = MII1_CTRL_IF_RGMII;
                        break;
                default:
-                       printk(KERN_ERR "ar71xx: invalid PHY interface mode "
-                                       "for eth1\n");
-                       return;
+                       return -EINVAL;
                }
-               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
@@ -551,12 +669,47 @@ void __init ar71xx_add_device_eth(unsigned int id)
                pdata->has_gbit = 1;
                break;
 
+       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_pll =  id ? ar724x_set_pll_ge1
+                                    : ar7242_set_pll_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->is_ar724x = 1;
+               if (ar71xx_soc == AR71XX_SOC_AR7240)
+                       pdata->is_ar7240 = 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_AR9130:
@@ -576,6 +729,49 @@ void __init ar71xx_add_device_eth(unsigned int id)
                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_pll =  id ? ar933x_set_pll_ge1
+                                    : ar933x_set_pll_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_pll =  id ? ar934x_set_pll_ge1
+                                    : ar934x_set_pll_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();
        }
@@ -593,16 +789,43 @@ 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) {
+               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);
+       mdelay(100);
+
+       ar71xx_device_start(pdata->reset_bit);
+       mdelay(100);
+
        platform_device_register(pdev);
        ar71xx_eth_instance++;
 }
@@ -631,88 +854,6 @@ void __init ar71xx_add_device_spi(struct ar71xx_spi_platform_data *pdata,
        platform_device_register(&ar71xx_spi_device);
 }
 
-void __init ar71xx_add_device_leds_gpio(int id, unsigned num_leds,
-                               struct gpio_led *leds)
-{
-       struct platform_device *pdev;
-       struct gpio_led_platform_data pdata;
-       struct gpio_led *p;
-       int err;
-
-       p = kmalloc(num_leds * sizeof(*p), GFP_KERNEL);
-       if (!p)
-               return;
-
-       memcpy(p, leds, num_leds * sizeof(*p));
-
-       pdev = platform_device_alloc("leds-gpio", id);
-       if (!pdev)
-               goto err_free_leds;
-
-       memset(&pdata, 0, sizeof(pdata));
-       pdata.num_leds = num_leds;
-       pdata.leds = p;
-
-       err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
-       if (err)
-               goto err_put_pdev;
-
-       err = platform_device_add(pdev);
-       if (err)
-               goto err_put_pdev;
-
-       return;
-
-err_put_pdev:
-       platform_device_put(pdev);
-
-err_free_leds:
-       kfree(p);
-}
-
-void __init ar71xx_add_device_gpio_buttons(int id,
-                                          unsigned poll_interval,
-                                          unsigned nbuttons,
-                                          struct gpio_button *buttons)
-{
-       struct platform_device *pdev;
-       struct gpio_buttons_platform_data pdata;
-       struct gpio_button *p;
-       int err;
-
-       p = kmalloc(nbuttons * sizeof(*p), GFP_KERNEL);
-       if (!p)
-               return;
-
-       memcpy(p, buttons, nbuttons * sizeof(*p));
-
-       pdev = platform_device_alloc("gpio-buttons", id);
-       if (!pdev)
-               goto err_free_buttons;
-
-       memset(&pdata, 0, sizeof(pdata));
-       pdata.poll_interval = poll_interval;
-       pdata.nbuttons = nbuttons;
-       pdata.buttons = p;
-
-       err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
-       if (err)
-               goto err_put_pdev;
-
-
-       err = platform_device_add(pdev);
-       if (err)
-               goto err_put_pdev;
-
-       return;
-
-err_put_pdev:
-       platform_device_put(pdev);
-
-err_free_buttons:
-       kfree(p);
-}
-
 void __init ar71xx_add_device_wdt(void)
 {
        platform_device_register_simple("ar71xx-wdt", -1, NULL, 0);
@@ -742,69 +883,37 @@ void __init ar71xx_parse_mac_addr(char *mac_str)
                                "\"%s\"\n", mac_str);
 }
 
-static struct resource ar91xx_wmac_resources[] = {
-       {
-               .start  = AR91XX_WMAC_BASE,
-               .end    = AR91XX_WMAC_BASE + AR91XX_WMAC_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = AR71XX_CPU_IRQ_WMAC,
-               .end    = AR71XX_CPU_IRQ_WMAC,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct ath9k_platform_data ar91xx_wmac_data;
-
-static struct platform_device ar91xx_wmac_device = {
-       .name           = "ath9k",
-       .id             = -1,
-       .resource       = ar91xx_wmac_resources,
-       .num_resources  = ARRAY_SIZE(ar91xx_wmac_resources),
-       .dev = {
-               .platform_data = &ar91xx_wmac_data,
-       },
-};
-
-void __init ar91xx_add_device_wmac(void)
+static int __init ar71xx_ethaddr_setup(char *str)
 {
-       u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-
-       memcpy(ar91xx_wmac_data.eeprom_data, ee,
-              sizeof(ar91xx_wmac_data.eeprom_data));
-
-       ar71xx_device_stop(RESET_MODULE_AMBA2WMAC);
-       mdelay(10);
-
-       ar71xx_device_start(RESET_MODULE_AMBA2WMAC);
-       mdelay(10);
-
-       platform_device_register(&ar91xx_wmac_device);
+       ar71xx_parse_mac_addr(str);
+       return 1;
 }
+__setup("ethaddr=", ar71xx_ethaddr_setup);
 
-static struct platform_device ar71xx_dsa_switch_device = {
-       .name           = "dsa",
-       .id             = 0,
-};
+static int __init ar71xx_kmac_setup(char *str)
+{
+       ar71xx_parse_mac_addr(str);
+       return 1;
+}
+__setup("kmac=", ar71xx_kmac_setup);
 
-void __init ar71xx_add_device_dsa(unsigned int id,
-                                 struct dsa_platform_data *d)
+void __init ar71xx_init_mac(unsigned char *dst, const unsigned char *src,
+                           unsigned offset)
 {
-       switch (id) {
-       case 0:
-               d->netdev = &ar71xx_eth0_device.dev;
-               break;
-       case 1:
-               d->netdev = &ar71xx_eth1_device.dev;
-               break;
-       default:
-               printk(KERN_ERR
-                       "ar71xx: invalid ethernet id %d for DSA switch\n",
-                       id);
+       u32 t;
+
+       if (!is_valid_ether_addr(src)) {
+               memset(dst, '\0', ETH_ALEN);
                return;
        }
-       d->mii_bus = &ar71xx_mdio_device.dev;
-       ar71xx_dsa_switch_device.dev.platform_data = d;
 
-       platform_device_register(&ar71xx_dsa_switch_device);
+       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;
 }
This page took 0.050806 seconds and 4 git commands to generate.