diff options
| author | Rakesh Bodla <rbodla@nvidia.com> | 2011-03-30 15:27:42 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:54:45 -0700 |
| commit | be27dfe98c8b7441ff1c521d66e336efbcedde60 (patch) | |
| tree | 9523d6941943a0116eb57cee38971d2ccf3f78e7 /drivers/usb | |
| parent | d08f30c345d951fc56872808359c9c7b3fcf9c89 (diff) | |
ARM: tegra: usb: Fixing usb break after kernel merge
After kernel merge usb is broken. This is due to
improper merge of usb files. Fixed all the merge
issues.
Bug 807534
Original-Change-Id: Id9f6ae0022a84bcc7b4e39965a469ae8947faa83
Reviewed-on: http://git-master/r/24806
Reviewed-by: Rakesh Bodla <rbodla@nvidia.com>
Tested-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-by: Hanumanth Venkateswa Moganty <vmoganty@nvidia.com>
Change-Id: Ib5f76a2660f8d761eac08721c7d147b8cc11c2bf
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/fsl_udc_core.c | 14 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-tegra.c | 3 | ||||
| -rw-r--r-- | drivers/usb/otg/tegra-otg.c | 1 |
3 files changed, 8 insertions, 10 deletions
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index 9b6ec6e38aad..91cbc296077a 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -662,13 +662,13 @@ static int fsl_ep_disable(struct usb_ep *_ep) return -EINVAL; } + /* disable ep on controller */ + ep_num = ep_index(ep); #if defined(CONFIG_ARCH_TEGRA) /* Touch the registers if cable is connected and phy is on */ if (vbus_enabled()) #endif { - /* disable ep on controller */ - ep_num = ep_index(ep); epctrl = fsl_readl(&dr_regs->endptctrl[ep_num]); if (ep_is_in(ep)) epctrl &= ~EPCTRL_TX_ENABLE; @@ -1057,7 +1057,7 @@ static int fsl_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req) done(ep, req, -ECONNRESET); /* Enable EP */ -out:; +out: #if defined(CONFIG_ARCH_TEGRA) /* Touch the registers if cable is connected and phy is on */ if(vbus_enabled()) @@ -1137,7 +1137,7 @@ static void fsl_ep_fifo_flush(struct usb_ep *_ep) unsigned long timeout; #define FSL_UDC_FLUSH_TIMEOUT 1000 -#ifdef CONFIG_ARCH_TEGRA +#if defined(CONFIG_ARCH_TEGRA) /* Touch the registers if cable is connected and phy is on */ if (!vbus_enabled()) return; @@ -2812,15 +2812,15 @@ static int __init fsl_udc_probe(struct platform_device *pdev) udc_controller->vbus_active = 0; udc_controller->usb_state = USB_STATE_DEFAULT; otg_set_peripheral(udc_controller->transceiver, &udc_controller->gadget); - return 0; } -#endif - +#else #ifdef CONFIG_ARCH_TEGRA /* Power down the phy if cable is not connected */ if(!vbus_enabled()) fsl_udc_clk_suspend(); #endif +#endif + return 0; err_unregister: diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index b9917ce8c433..a851abb7d7e1 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -271,7 +271,6 @@ done: return retval; } -#ifdef CONFIG_PM static void tegra_ehci_restart(struct usb_hcd *hcd) { struct ehci_hcd *ehci = hcd_to_ehci(hcd); @@ -294,6 +293,7 @@ static void tegra_ehci_restart(struct usb_hcd *hcd) } down_write(&ehci_cf_port_reset_rwsem); + hcd->state = HC_STATE_RUNNING; ehci_writel(ehci, FLAG_CF, &ehci->regs->configured_flag); /* flush posted writes */ ehci_readl(ehci, &ehci->regs->command); @@ -442,7 +442,6 @@ restart: return 0; } -#endif static void tegra_ehci_shutdown(struct usb_hcd *hcd) { diff --git a/drivers/usb/otg/tegra-otg.c b/drivers/usb/otg/tegra-otg.c index a4c2b621f9ed..386bb8b922da 100644 --- a/drivers/usb/otg/tegra-otg.c +++ b/drivers/usb/otg/tegra-otg.c @@ -341,7 +341,6 @@ static int tegra_otg_probe(struct platform_device *pdev) } INIT_WORK (&tegra->work, irq_work); - clk_disable(tegra->clk); dev_info(&pdev->dev, "otg transceiver registered\n"); clk_disable(tegra->clk); return 0; |