From bdd9e97c84f69bab23f5542dc6ac2efa93e53224 Mon Sep 17 00:00:00 2001 From: Kurt Yi Date: Wed, 11 Jan 2012 21:11:07 +0900 Subject: usb: host: tegra: replace CONFIG_USB_HOTPLUG to tegra_ehci_platform_data 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 Signed-off-by: Varun Wadekar Reviewed-on: http://git-master/r/75888 Reviewed-by: Varun Colbert Tested-by: Varun Colbert --- arch/arm/mach-tegra/board-cardhu.c | 4 ++++ arch/arm/mach-tegra/board-enterprise.c | 4 ++++ arch/arm/mach-tegra/board-ventana.c | 4 ++++ arch/arm/mach-tegra/board-whistler.c | 3 +++ 4 files changed, 15 insertions(+) (limited to 'arch/arm/mach-tegra') diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 18ed959ef96a..da63ca698f71 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -708,6 +708,7 @@ static struct tegra_ehci_platform_data tegra_ehci_uhsic_pdata = { .phy_config = &uhsic_phy_config, .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = true, }; static struct tegra_ehci_platform_data tegra_ehci_pdata[] = { @@ -715,17 +716,20 @@ static struct tegra_ehci_platform_data tegra_ehci_pdata[] = { .phy_config = &utmi_phy_config[0], .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = true, }, [1] = { .phy_config = &utmi_phy_config[1], .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = true, }, [2] = { .phy_config = &utmi_phy_config[2], .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, .hotplug = 1, + .default_enable = true, }, }; diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index 8d95af3112f8..f631c9b93cb2 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -653,6 +653,7 @@ static struct tegra_ehci_platform_data tegra_ehci_uhsic_pdata = { .phy_config = &uhsic_phy_config, .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = true, }; static struct tegra_ehci_platform_data tegra_ehci_pdata[] = { @@ -660,16 +661,19 @@ static struct tegra_ehci_platform_data tegra_ehci_pdata[] = { .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, }, }; diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 23f946f643c6..097644021ebc 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -174,6 +174,7 @@ static struct tegra_ehci_platform_data ventana_ehci2_ulpi_platform_data = { .power_down_on_bus_suspend = 1, .phy_config = &ventana_ehci2_ulpi_phy_config, .phy_type = TEGRA_USB_PHY_TYPE_LINK_ULPI, + .default_enable = true, }; static struct tegra_i2c_platform_data ventana_i2c1_platform_data = { @@ -518,18 +519,21 @@ static struct tegra_ehci_platform_data tegra_ehci_pdata[] = { .phy_config = &utmi_phy_config[0], .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = true, }, [1] = { .phy_config = &ulpi_phy_config, .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, .phy_type = TEGRA_USB_PHY_TYPE_LINK_ULPI, + .default_enable = true, }, [2] = { .phy_config = &utmi_phy_config[1], .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, .hotplug = 1, + .default_enable = true, }, }; diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index 1f9c3b6f7c92..031ab936d870 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -511,16 +511,19 @@ static struct tegra_ehci_platform_data tegra_ehci_pdata[] = { .phy_config = &utmi_phy_config[0], .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = false, }, [1] = { .phy_config = &ulpi_phy_config, .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = false, }, [2] = { .phy_config = &utmi_phy_config[1], .operating_mode = TEGRA_USB_HOST, .power_down_on_bus_suspend = 1, + .default_enable = false, }, }; -- cgit v1.2.3