From: Benoit Goby <benoit@android.com>
Date: Thu, 29 Jul 2010 03:16:43 +0000 (-0700)
Subject: [ARM] tegra: Don't share tegra_usb1_resources
X-Git-Tag: firefly_0821_release~9833^2~305
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2234fe7157778d7ed5c05d61341cfabf43f98f7e;p=firefly-linux-kernel-4.4.55.git

[ARM] tegra: Don't share tegra_usb1_resources

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>
---

diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c
index 3d17f0fc7de2..6ba36e14d544 100644
--- a/arch/arm/mach-tegra/devices.c
+++ b/arch/arm/mach-tegra/devices.c
@@ -314,6 +314,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,
@@ -368,8 +381,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);