summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorArtiste Hsu <chhsu@nvidia.com>2011-09-27 09:47:32 +0800
committerSimone Willett <swillett@nvidia.com>2011-09-27 15:16:17 -0700
commit9b500390784a8e1d11c0bd225c342781bc817b98 (patch)
tree94529bf21cc48c85cb09f34ba916cb472167dfac /drivers
parent3c5148a04fbc50c3200efe8793b8850ca07e05c2 (diff)
usb: host: tegra: Configurable USB hotplug
Hotplug on usb is supported when hotplug flag is set in platform data Bug 869745 Change-Id: I57ba0b18a2d4232b2df2074c91aff97c6e639e7d Reviewed-on: http://git-master/r/54588 Tested-by: Artiste Hsu <chhsu@nvidia.com> Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/host/ehci-tegra.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 2e84ee1e9f7c..2ee41aa81124 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -64,6 +64,7 @@ struct tegra_ehci_hcd {
int bus_suspended;
int port_resuming;
int power_down_on_bus_suspend;
+ int hotplug;
struct delayed_work work;
enum tegra_usb_phy_port_speed port_speed;
struct work_struct clk_timer_work;
@@ -111,7 +112,7 @@ static irqreturn_t tegra_ehci_irq (struct usb_hcd *hcd)
spin_unlock (&ehci->lock);
}
}
- if (tegra->phy->instance == 2) {
+ if (tegra->hotplug) {
spin_lock(&ehci->lock);
val = readl(hcd->regs + TEGRA_USB_SUSP_CTRL_OFFSET);
if ((val & TEGRA_USB_PHY_CLK_VALID_INT_STS)) {
@@ -1048,6 +1049,7 @@ static int tegra_ehci_probe(struct platform_device *pdev)
tegra->host_resumed = 1;
tegra->power_down_on_bus_suspend = pdata->power_down_on_bus_suspend;
+ tegra->hotplug = pdata->hotplug;
tegra->ehci = hcd_to_ehci(hcd);
irq = platform_get_irq(pdev, 0);