ar71xx: ar913x_wmac device support into a separate file

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / devices.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
index d55022f88a58c07b79912010c7c447a1968a56e8..6f6ec421014974fd0e7628a56acfb05d45816640 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
@@ -18,7 +18,6 @@
 #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>
 
@@ -42,6 +41,19 @@ static struct resource ar71xx_ohci_resources[] = {
        },
 };
 
+static struct resource ar7240_ohci_resources[] = {
+       [0] = {
+               .start  = AR7240_OHCI_BASE,
+               .end    = AR7240_OHCI_BASE + AR7240_OHCI_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = AR71XX_CPU_IRQ_USB,
+               .end    = AR71XX_CPU_IRQ_USB,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
 static u64 ar71xx_ohci_dmamask = DMA_BIT_MASK(32);
 static struct platform_device ar71xx_ohci_device = {
        .name           = "ar71xx-ohci",
@@ -90,7 +102,10 @@ static struct platform_device ar71xx_ehci_device = {
        (RESET_MODULE_USB_HOST | RESET_MODULE_USB_PHY \
        | RESET_MODULE_USB_OHCI_DLL)
 
-static void ar71xx_usb_setup(void)
+#define AR7240_USB_RESET_MASK \
+       (RESET_MODULE_USB_HOST | RESET_MODULE_USB_OHCI_DLL_7240)
+
+static void __init ar71xx_usb_setup(void)
 {
        ar71xx_device_stop(AR71XX_USB_RESET_MASK);
        mdelay(1000);
@@ -105,7 +120,19 @@ static void ar71xx_usb_setup(void)
        mdelay(900);
 }
 
-static void ar91xx_usb_setup(void)
+static void __init ar7240_usb_setup(void)
+{
+       ar71xx_ohci_device.resource = ar7240_ohci_resources;
+
+       ar71xx_device_stop(AR7240_USB_RESET_MASK);
+       mdelay(1000);
+       ar71xx_device_start(AR7240_USB_RESET_MASK);
+
+       /* WAR for HW bug. Here it adjusts the duration between two SOFS */
+       ar71xx_usb_ctrl_wr(USB_CTRL_REG_FLADJ, 0x3);
+}
+
+static void __init ar91xx_usb_setup(void)
 {
        ar71xx_device_stop(RESET_MODULE_USBSUS_OVERRIDE);
        mdelay(10);
@@ -120,6 +147,11 @@ static void ar91xx_usb_setup(void)
 void __init ar71xx_add_device_usb(void)
 {
        switch (ar71xx_soc) {
+       case AR71XX_SOC_AR7240:
+               ar7240_usb_setup();
+               platform_device_register(&ar71xx_ohci_device);
+               break;
+
        case AR71XX_SOC_AR7130:
        case AR71XX_SOC_AR7141:
        case AR71XX_SOC_AR7161:
@@ -595,6 +627,9 @@ void __init ar71xx_add_device_eth(unsigned int id)
                        ar71xx_eth_instance);
        }
 
+       if (pdata->mii_bus_dev == NULL)
+               pdata->mii_bus_dev = &ar71xx_mdio_device.dev;
+
        /* Reset the device */
        ar71xx_device_stop(pdata->reset_bit);
        mdelay(100);
@@ -741,46 +776,6 @@ 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)
-{
-       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);
-}
-
 static struct platform_device ar71xx_dsa_switch_device = {
        .name           = "dsa",
        .id             = 0,
@@ -789,6 +784,8 @@ static struct platform_device ar71xx_dsa_switch_device = {
 void __init ar71xx_add_device_dsa(unsigned int id,
                                  struct dsa_platform_data *d)
 {
+       int i;
+
        switch (id) {
        case 0:
                d->netdev = &ar71xx_eth0_device.dev;
@@ -802,7 +799,10 @@ void __init ar71xx_add_device_dsa(unsigned int id,
                        id);
                return;
        }
-       d->mii_bus = &ar71xx_mdio_device.dev;
+
+       for (i = 0; i < d->nr_chips; i++)
+               d->chip[i].mii_bus = &ar71xx_mdio_device.dev;
+
        ar71xx_dsa_switch_device.dev.platform_data = d;
 
        platform_device_register(&ar71xx_dsa_switch_device);