[ARM] tegra: Don't share tegra_usb1_resources
Benoit Goby [Thu, 29 Jul 2010 03:16:43 +0000 (20:16 -0700)]
Don't share tegra_usb1_resources as both tegra-udc and ehci1 are loaded
in otg mode.

Change-Id: Id5c9a076572e18662b5d3e7835f638b1cc5a1e07
Signed-off-by: Benoit Goby <benoit@android.com>

arch/arm/mach-tegra/devices.c

index 8247bfa..d59e964 100644 (file)
@@ -639,6 +639,19 @@ struct platform_device tegra_w1_device = {
        .num_resources = ARRAY_SIZE(w1_resources),
 };
 
+static struct resource tegra_udc_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_usb1_resources[] = {
        [0] = {
                .start  = TEGRA_USB_BASE,
@@ -693,8 +706,8 @@ struct platform_device tegra_udc_device = {
                .coherent_dma_mask = DMA_BIT_MASK(32),
                .platform_data  = &tegra_udc_pdata,
        },
-       .resource = tegra_usb1_resources,
-       .num_resources = ARRAY_SIZE(tegra_usb1_resources),
+       .resource = tegra_udc_resources,
+       .num_resources = ARRAY_SIZE(tegra_udc_resources),
 };
 
 static u64 tegra_ehci_dmamask = DMA_BIT_MASK(32);