ARM: tegra: ardbeg: register UTMI on USB1 based on odmdata
Rohith Seelaboyina [Tue, 9 Jul 2013 15:07:14 +0000 (20:07 +0530)]
On USB1 UTMI should be registered if odmdata is 0 else
HSIC should be registered.

Change-Id: I64ac09734e99fa6b8177309163148e1eabd6f8a9
Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com>
Reviewed-on: http://git-master/r/246458
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Tested-by: Mitch Luban <mluban@nvidia.com>

arch/arm/mach-tegra/board-ardbeg.c
arch/arm/mach-tegra/board-ardbeg.h

index 0b593ec..6bc15ad 100644 (file)
@@ -669,12 +669,16 @@ static void ardbeg_usb_init(void)
                /* Setup the udc platform data */
                tegra_udc_device.dev.platform_data = &tegra_udc_pdata;
        }
-
-       if (!(usb_port_owner_info & UTMI2_PORT_OWNER_XUSB)) {
 #ifdef CONFIG_ARCH_TEGRA_12x_SOC
-               tegra_ehci2_device.dev.platform_data = &tegra_ehci2_utmi_pdata;
-               platform_device_register(&tegra_ehci2_device);
+       if (!(usb_port_owner_info & UTMI2_PORT_OWNER_XUSB)) {
+               if (!modem_id) {
+                       tegra_ehci2_device.dev.platform_data =
+                               &tegra_ehci2_utmi_pdata;
+                       platform_device_register(&tegra_ehci2_device);
+               }
+       }
 #endif
+       if (!(usb_port_owner_info & UTMI3_PORT_OWNER_XUSB)) {
                tegra_ehci3_device.dev.platform_data = &tegra_ehci3_utmi_pdata;
                platform_device_register(&tegra_ehci3_device);
        }
index dbddef8..04bc4e8 100644 (file)
@@ -79,7 +79,8 @@ enum tegra_bb_type {
 
 #define UTMI1_PORT_OWNER_XUSB   0x1
 #define UTMI2_PORT_OWNER_XUSB   0x2
-#define HSIC1_PORT_OWNER_XUSB   0x4
+#define UTMI3_PORT_OWNER_XUSB   0x4
+#define HSIC1_PORT_OWNER_XUSB   0x8
 
 /* Touchscreen definitions */
 #ifdef CONFIG_ARCH_TEGRA_11x_SOC