usb: host: tegra: replace CONFIG_USB_HOTPLUG to tegra_ehci_platform_data
Kurt Yi [Wed, 11 Jan 2012 12:11:07 +0000 (21:11 +0900)]
remove CONFIG_USB_HOTPLUG and add default_enable into tegra_ehci_platform_data
We can't use different def_config because whistler & ventana source code
is merged in same tree.

BUG 923705

Change-Id: I3dfdf237d80865831264f02104c89c8088101905
Reviewed-on: http://git-master/r/74574
Signed-off-by: Kurt Yi <kyi@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/75888
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

Rebase-Id: Rca89c447a143c2ff6aeacf3a972849e6c946a2f4

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

index 28e3eb6..7914402 100644 (file)
@@ -663,22 +663,24 @@ static struct usb_phy_plat_data tegra_usb_phy_pdata[] = {
        },
 };
 
-
 static struct tegra_ehci_platform_data tegra_ehci_pdata[] = {
        [0] = {
                        .phy_config = &utmi_phy_config[0],
                        .operating_mode = TEGRA_USB_HOST,
                        .power_down_on_bus_suspend = 1,
+                       .default_enable = false,
        },
        [1] = {
                        .phy_config = &utmi_phy_config[1],
                        .operating_mode = TEGRA_USB_HOST,
                        .power_down_on_bus_suspend = 1,
+                       .default_enable = false,
        },
        [2] = {
                        .phy_config = &utmi_phy_config[2],
                        .operating_mode = TEGRA_USB_HOST,
                        .power_down_on_bus_suspend = 1,
+                       .default_enable = false,
        },
 };