arm: tegra: hsic: Remove use of hsic hub reset gpio on non-PM267 boards.
Michael Hsu [Sat, 7 May 2011 01:47:51 +0000 (18:47 -0700)]
Only PM267 board has SMSC4640 HSIC hub, which requires reset signal.
Do not use HSIC hub reset gpio on non-PM267 boards.

Original-Change-Id: I12d33aeab1a0c67b429e651ad373bd71ac6938cc
Reviewed-on: http://git-master/r/30786
Reviewed-by: Niket Sirsi <nsirsi@nvidia.com>
Tested-by: Niket Sirsi <nsirsi@nvidia.com>

Rebase-Id: R4937d49b112f656c5f16b6e087107f23a9c3ba69

arch/arm/mach-tegra/board-cardhu.c

index 6a8f9b1..cb27f58 100644 (file)
@@ -375,7 +375,7 @@ static struct usb_phy_plat_data tegra_usb_phy_pdata[] = {
 
 static struct tegra_ulpi_config uhsic_phy_config = {
        .enable_gpio = EN_HSIC_GPIO,
-       .reset_gpio = PM267_SMSC4640_HSIC_HUB_RESET_GPIO,
+       .reset_gpio = -1,
 };
 
 static struct tegra_ehci_platform_data tegra_ehci_uhsic_pdata = {
@@ -466,7 +466,12 @@ static void cardhu_usb_init(void)
        tegra_otg_device.dev.platform_data = &tegra_otg_pdata;
        platform_device_register(&tegra_otg_device);
 
-       if ((bi.board_id == BOARD_PM267) || (bi.board_id == BOARD_E1186)) {
+       if (bi.board_id == BOARD_PM267) {
+               uhsic_phy_config.reset_gpio =
+                       PM267_SMSC4640_HSIC_HUB_RESET_GPIO;
+               tegra_ehci2_device.dev.platform_data = &tegra_ehci_uhsic_pdata;
+       } else if ((bi.board_id == BOARD_PM269) ||
+               (bi.board_id == BOARD_E1186)) {
                tegra_ehci2_device.dev.platform_data = &tegra_ehci_uhsic_pdata;
        } else {
                tegra_ehci2_device.dev.platform_data = &tegra_ehci_pdata[1];