[ARM] tegra: add EHCI and UDC controllers to devices.c
Gary King [Wed, 28 Jul 2010 23:22:31 +0000 (16:22 -0700)]
update harmony and ventana to use the common UDC definition, rather
than using the current duplicated definitions

Change-Id: I2e3aca674ab35305a0c516bd22e044382280d05e
Signed-off-by: Gary King <gking@nvidia.com>

Rebase-Id: Rc52fc5252a9865ab70abae98f25a643d13750423

arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-ventana.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/devices.h

index a7b769e..12ac495 100644 (file)
@@ -23,7 +23,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/dma-mapping.h>
-#include <linux/fsl_devices.h>
 #include <linux/pda_power.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
@@ -287,7 +286,7 @@ static struct platform_device *harmony_devices[] __initdata = {
        &tegra_pcm_device,
        &harmony_audio_device,
        &tegra_nand_device,
-       &tegra_otg,
+       &tegra_udc_device,
        &pda_power_device,
        &tegra_i2c_device1,
        &tegra_i2c_device2,
index eef1898..d9440c6 100644 (file)
@@ -28,7 +28,6 @@
 #include <linux/i2c.h>
 #include <linux/pda_power.h>
 #include <linux/dma-mapping.h>
-#include <linux/fsl_devices.h>
 #include <linux/delay.h>
 
 #include <mach/iomap.h>
@@ -73,40 +72,6 @@ static __initdata struct tegra_clk_init_table ventana_clk_init_table[] = {
        { NULL,         NULL,           0,              0},
 };
 
-/* OTG gadget device */
-static u64 tegra_otg_dmamask = DMA_BIT_MASK(32);
-
-
-static struct resource tegra_otg_resources[] = {
-       [0] = {
-               .start  = TEGRA_USB_BASE,
-               .end    = TEGRA_USB_BASE + TEGRA_USB_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = INT_USB,
-               .end    = INT_USB,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct fsl_usb2_platform_data tegra_otg_pdata = {
-       .operating_mode = FSL_USB2_DR_DEVICE,
-       .phy_mode       = FSL_USB2_PHY_UTMI,
-};
-
-static struct platform_device tegra_otg = {
-       .name = "fsl-tegra-udc",
-       .id   = -1,
-       .dev  = {
-               .dma_mask               = &tegra_otg_dmamask,
-               .coherent_dma_mask      = 0xffffffff,
-               .platform_data = &tegra_otg_pdata,
-       },
-       .resource = tegra_otg_resources,
-       .num_resources = ARRAY_SIZE(tegra_otg_resources),
-};
-
 /* PDA power */
 static struct pda_power_pdata pda_power_pdata = {
 };
@@ -143,7 +108,7 @@ static struct platform_device tegra_gart_dev = {
 
 static struct platform_device *ventana_devices[] __initdata = {
        &debug_uart,
-       &tegra_otg,
+       &tegra_udc_device,
        &pda_power_device,
        &tegra_gart_dev,
 };
index b1fa46d..c0c740d 100644 (file)
@@ -724,3 +724,96 @@ struct platform_device tegra_w1_device = {
        .resource      = w1_resources,
        .num_resources = ARRAY_SIZE(w1_resources),
 };
+
+static struct resource tegra_usb1_resources[] = {
+       [0] = {
+               .start  = TEGRA_USB_BASE,
+               .end    = TEGRA_USB_BASE + TEGRA_USB_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = INT_USB,
+               .end    = INT_USB,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct resource tegra_usb2_resources[] = {
+       [0] = {
+               .start  = TEGRA_USB2_BASE,
+               .end    = TEGRA_USB2_BASE + TEGRA_USB2_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = INT_USB2,
+               .end    = INT_USB2,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct resource tegra_usb3_resources[] = {
+       [0] = {
+               .start  = TEGRA_USB3_BASE,
+               .end    = TEGRA_USB3_BASE + TEGRA_USB3_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = INT_USB3,
+               .end    = INT_USB3,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static u64 tegra_udc_dmamask = DMA_BIT_MASK(32);
+
+static struct fsl_usb2_platform_data tegra_udc_pdata = {
+       .operating_mode = FSL_USB2_DR_DEVICE,
+       .phy_mode       = FSL_USB2_PHY_UTMI,
+};
+
+struct platform_device tegra_udc_device = {
+       .name   = "fsl-tegra-udc",
+       .id     = -1,
+       .dev    = {
+               .dma_mask       = &tegra_udc_dmamask,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
+               .platform_data  = &tegra_udc_pdata,
+       },
+       .resource = tegra_usb1_resources,
+       .num_resources = ARRAY_SIZE(tegra_usb1_resources),
+};
+
+static u64 tegra_ehci_dmamask = DMA_BIT_MASK(32);
+
+struct platform_device tegra_ehci1_device = {
+       .name   = "tegra-ehci",
+       .id     = 0,
+       .dev    = {
+               .dma_mask       = &tegra_ehci_dmamask,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
+       },
+       .resource = tegra_usb1_resources,
+       .num_resources = ARRAY_SIZE(tegra_usb1_resources),
+};
+
+struct platform_device tegra_ehci2_device = {
+       .name   = "tegra-ehci",
+       .id     = 1,
+       .dev    = {
+               .dma_mask       = &tegra_ehci_dmamask,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
+       },
+       .resource = tegra_usb2_resources,
+       .num_resources = ARRAY_SIZE(tegra_usb2_resources),
+};
+
+struct platform_device tegra_ehci3_device = {
+       .name   = "tegra-ehci",
+       .id     = 2,
+       .dev    = {
+               .dma_mask       = &tegra_ehci_dmamask,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
+       },
+       .resource = tegra_usb3_resources,
+       .num_resources = ARRAY_SIZE(tegra_usb3_resources),
+};
index d1e21fb..7caf2c3 100644 (file)
@@ -55,5 +55,9 @@ extern struct platform_device tegra_i2s_device2;
 extern struct platform_device tegra_das_device;
 extern struct platform_device tegra_pcm_device;
 extern struct platform_device tegra_w1_device;
+extern struct platform_device tegra_udc_device;
+extern struct platform_device tegra_ehci1_device;
+extern struct platform_device tegra_ehci2_device;
+extern struct platform_device tegra_ehci3_device;
 
 #endif