From ebd5224ed3b97c2f4eb8e6135121d873950facd7 Mon Sep 17 00:00:00 2001 From: Rakesh Bodla Date: Wed, 28 Sep 2011 14:02:26 +0530 Subject: arm: tegra: usb: usb registration order Modified the usb registration order, otg is the first to be registered. Bug 835678 Reviewed-on: http://git-master/r/39505 (cherry picked from commit 4f43316f3cbe55dc75e67002bfff37dcbba4178e) Change-Id: I9914cfad251d03f0fb5035026c64e3194d88bb91 Reviewed-on: http://git-master/r/54911 Reviewed-by: Rohan Somvanshi Tested-by: Rohan Somvanshi --- arch/arm/mach-tegra/board-ventana.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 4e8e9c42d591..8e2a6a55aae6 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -666,11 +666,7 @@ static struct platform_device tegra_camera = { }; static struct platform_device *ventana_devices[] __initdata = { - &tegra_usb_fsg_device, - &androidusb_device, &pmu_device, - &tegra_udc_device, - &tegra_ehci2_device, &tegra_gart_device, &tegra_aes_device, #ifdef CONFIG_KEYBOARD_GPIO @@ -809,10 +805,15 @@ static void ventana_usb_init(void) int i; tegra_usb_phy_init(tegra_usb_phy_pdata, ARRAY_SIZE(tegra_usb_phy_pdata)); - + /* OTG should be the first to be registered */ tegra_otg_device.dev.platform_data = &tegra_otg_pdata; platform_device_register(&tegra_otg_device); + platform_device_register(&tegra_usb_fsg_device); + platform_device_register(&androidusb_device); + platform_device_register(&tegra_udc_device); + platform_device_register(&tegra_ehci2_device); + tegra_ehci3_device.dev.platform_data=&tegra_ehci_pdata[2]; platform_device_register(&tegra_ehci3_device); -- cgit v1.2.3