ARM: tegra: ardbeg: register UTMI3 along with UTMI2

USB 2.0 controller registers UTMI3 along with UTMI2
as UTMI3_XUSB_PORT_OWNER bit is not allocated
through the odmdata.

Change-Id: Ib6bfc28aedbe0fef8d7a8de1e2cb19ca16cf5dca
Signed-off-by: Rohith Seelaboyina <rseelaboyina@nvidia.com>
Reviewed-on: http://git-master/r/249621
(cherry picked from commit 819b419d8fa4816acd5122757ac47f45294fb1c9)
Reviewed-on: http://git-master/r/251895
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

diff --git a/arch/arm/mach-tegra/board-ardbeg.c b/arch/arm/mach-tegra/board-ardbeg.c
index 87265cd3cd86deca32c7880aa7ee85f150e2e70d..adb24519581856f4b85d0a35e2f7643c727fa12d 100644 (file)
--- a/arch/arm/mach-tegra/board-ardbeg.c
+++ b/arch/arm/mach-tegra/board-ardbeg.c
@@ -697,7 +697,7 @@ static void ardbeg_usb_init(void)
                }
        }
 #endif
-       if (!(usb_port_owner_info & UTMI3_PORT_OWNER_XUSB)) {
+       if (!(usb_port_owner_info & UTMI2_PORT_OWNER_XUSB)) {
                tegra_ehci3_device.dev.platform_data = &tegra_ehci3_utmi_pdata;
                platform_device_register(&tegra_ehci3_device);
        }

diff --git a/arch/arm/mach-tegra/board-ardbeg.h b/arch/arm/mach-tegra/board-ardbeg.h
index 138997b721ac0201c12dbb7d6dda615e321cae07..011854396aa0654ec7bf728a6eb8b66c0d1963be 100644 (file)
--- a/arch/arm/mach-tegra/board-ardbeg.h
+++ b/arch/arm/mach-tegra/board-ardbeg.h
@@ -86,8 +86,7 @@ enum tegra_bb_type {
 
 #define UTMI1_PORT_OWNER_XUSB   0x1
 #define UTMI2_PORT_OWNER_XUSB   0x2
-#define UTMI3_PORT_OWNER_XUSB   0x4
-#define HSIC1_PORT_OWNER_XUSB   0x8
+#define HSIC1_PORT_OWNER_XUSB   0x4
 
 /* Touchscreen definitions */
 #ifdef CONFIG_ARCH_TEGRA_11x_SOC