From d56d3861e259ecbc05ed6f3cf0e1ad9b451c2d10 Mon Sep 17 00:00:00 2001 From: James Wilson Date: Tue, 23 Nov 2010 15:00:44 -0600 Subject: [PATCH] [ARM] tegra: stingray: Do not load usb devices in factory and recovery mode Skips adding USB and gadget devices when both using a factory cable and in recovery mode. Change-Id: Ibf47ded70237d83d5b1b49bcfc24e3c976ff03ce Signed-off-by: James Wilson --- arch/arm/mach-tegra/board-stingray.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-tegra/board-stingray.c b/arch/arm/mach-tegra/board-stingray.c index ba0cac1b5aa8..a746011b0976 100644 --- a/arch/arm/mach-tegra/board-stingray.c +++ b/arch/arm/mach-tegra/board-stingray.c @@ -719,7 +719,9 @@ static void stingray_usb_init(void) tegra_ehci2_device.dev.platform_data = &tegra_ehci_pdata[1]; tegra_ehci3_device.dev.platform_data = &tegra_ehci_pdata[2]; - platform_device_register(&tegra_udc_device); + if (strncmp(boot_mode, "factorycable", BOOT_MODE_MAX_LEN) || + !mot_boot_recovery) + platform_device_register(&tegra_udc_device); platform_device_register(&tegra_ehci2_device); platform_device_register(&tegra_ehci3_device); #ifdef CONFIG_USB_ANDROID_RNDIS @@ -748,7 +750,10 @@ static void stingray_usb_init(void) platform_data->serial_number = usb_serial_num; androidusb_device.dev.platform_data = platform_data; - platform_device_register(&androidusb_device); + + if (strncmp(boot_mode, "factorycable", BOOT_MODE_MAX_LEN) || + !mot_boot_recovery) + platform_device_register(&androidusb_device); } static void stingray_reset(char mode, const char *cmd) -- 2.34.1