diff options
| author | Venu Byravarasu <vbyravarasu@nvidia.com> | 2012-06-07 15:01:27 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-06-07 17:55:23 -0700 |
| commit | b2559afb96d67510a191872c3bff44e9a60cf6e8 (patch) | |
| tree | 159841c8b52686263e8216290ff0bb6e98db4aad /drivers/usb/otg | |
| parent | 3954ebe6f374e2cd0e0fde4742883dddd6202a7e (diff) | |
usb: otg: tegra: Add builtin host support to tegra OTG
bug 947300
Change-Id: Ib9f1b796faa94d8424cfca41c7ec29d5360ef60c
Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Reviewed-on: http://git-master/r/106983
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/usb/otg')
| -rw-r--r-- | drivers/usb/otg/tegra-otg.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/drivers/usb/otg/tegra-otg.c b/drivers/usb/otg/tegra-otg.c index 3bb43c6a9799..9aa155caaebd 100644 --- a/drivers/usb/otg/tegra-otg.c +++ b/drivers/usb/otg/tegra-otg.c @@ -66,6 +66,7 @@ struct tegra_otg_data { callback_t charger_cb; void *charger_cb_data; bool interrupt_mode; + bool builtin_host; }; static struct tegra_otg_data *tegra_clone; @@ -104,8 +105,12 @@ static unsigned long enable_interrupt(struct tegra_otg_data *tegra, bool en) clk_enable(tegra->clk); val = otg_readl(tegra, USB_PHY_WAKEUP); - if (en) - val |= USB_INT_EN; + if (en) { + if (tegra->builtin_host) + val |= USB_INT_EN; + else + val = USB_VBUS_INT_EN | USB_VBUS_WAKEUP_EN | USB_ID_PIN_WAKEUP_EN; + } else val &= ~USB_INT_EN; otg_writel(tegra, val, USB_PHY_WAKEUP); @@ -147,6 +152,7 @@ static void tegra_start_host(struct tegra_otg_data *tegra) memcpy(platform_data, pdata->ehci_pdata, sizeof(struct tegra_usb_platform_data)); pdev->dev.platform_data = platform_data; + tegra->builtin_host = !pdata->ehci_pdata->builtin_host_disabled; val = platform_device_add(pdev); if (val) @@ -253,7 +259,7 @@ static void irq_work(struct work_struct *work) DBG("%s(%d) got vbus interrupt\n", __func__, __LINE__); } - if (!(status & USB_ID_STATUS)) + if (!(status & USB_ID_STATUS) && (status & USB_ID_INT_EN)) to = OTG_STATE_A_HOST; else if (status & USB_VBUS_STATUS && from != OTG_STATE_A_HOST) to = OTG_STATE_B_PERIPHERAL; @@ -302,8 +308,12 @@ static int tegra_otg_set_peripheral(struct otg_transceiver *otg, if ((val & USB_ID_STATUS) && (val & USB_VBUS_STATUS)) val |= USB_VBUS_INT_STATUS; - else if (!(val & USB_ID_STATUS)) - val |= USB_ID_INT_STATUS; + else if (!(val & USB_ID_STATUS)) { + if(!tegra->builtin_host) + val &= ~USB_ID_INT_STATUS; + else + val |= USB_ID_INT_STATUS; + } else val &= ~(USB_ID_INT_STATUS | USB_VBUS_INT_STATUS); @@ -364,7 +374,6 @@ static ssize_t store_host_en(struct device *dev, struct device_attribute *attr, struct platform_device *pdev = to_platform_device(dev); struct tegra_otg_data *tegra = platform_get_drvdata(pdev); unsigned long host; - int err; if (sscanf(buf, "%d", &host) != 1 || host < 0 || host > 1) return -EINVAL; @@ -542,7 +551,12 @@ static void tegra_otg_resume(struct device *dev) /* Enable interrupt and call work to set to appropriate state */ spin_lock_irqsave(&tegra->lock, flags); - tegra->int_status = (val | USB_INT_EN); + if (tegra->builtin_host) + tegra->int_status = val | USB_INT_EN; + else + tegra->int_status = val | USB_VBUS_INT_EN | USB_VBUS_WAKEUP_EN | + USB_ID_PIN_WAKEUP_EN; + spin_unlock_irqrestore(&tegra->lock, flags); irq_work(&tegra->work); |