mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
![Uwe Kleine-König](/assets/img/avatar_default.png)
Commit
65fd427
(USB: ehci tdi : let's tdi_reset set host mode)
broke the build using ARM's mx51_defconfig:
CC drivers/usb/host/ehci-hcd.o
In file included from drivers/usb/host/ehci-hcd.c:1166:
drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function)
drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier is reported only once
drivers/usb/host/ehci-mxc.c:192: error: for each function it appears in.)
drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1
make[2]: *** [drivers/usb/host/ehci-hcd.o] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2
Fix it together with the warning about the unused variable and use
msleep instead of mdelay as requested by Alan Stern.
Cc: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tested-by: Nguyen Dinh-R00091 <R00091@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
300 lines
6.8 KiB
C
300 lines
6.8 KiB
C
/*
|
|
* Copyright (c) 2008 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
|
|
* Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/usb/otg.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <mach/mxc_ehci.h>
|
|
|
|
#define ULPI_VIEWPORT_OFFSET 0x170
|
|
|
|
struct ehci_mxc_priv {
|
|
struct clk *usbclk, *ahbclk;
|
|
struct usb_hcd *hcd;
|
|
};
|
|
|
|
/* called during probe() after chip reset completes */
|
|
static int ehci_mxc_setup(struct usb_hcd *hcd)
|
|
{
|
|
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
|
|
struct device *dev = hcd->self.controller;
|
|
struct mxc_usbh_platform_data *pdata = dev_get_platdata(dev);
|
|
int retval;
|
|
|
|
/* EHCI registers start at offset 0x100 */
|
|
ehci->caps = hcd->regs + 0x100;
|
|
ehci->regs = hcd->regs + 0x100 +
|
|
HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
|
|
dbg_hcs_params(ehci, "reset");
|
|
dbg_hcc_params(ehci, "reset");
|
|
|
|
/* cache this readonly data; minimize chip reads */
|
|
ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
|
|
|
|
hcd->has_tt = 1;
|
|
|
|
retval = ehci_halt(ehci);
|
|
if (retval)
|
|
return retval;
|
|
|
|
/* data structure init */
|
|
retval = ehci_init(hcd);
|
|
if (retval)
|
|
return retval;
|
|
|
|
ehci->sbrn = 0x20;
|
|
|
|
ehci_reset(ehci);
|
|
|
|
/* set up the PORTSCx register */
|
|
ehci_writel(ehci, pdata->portsc, &ehci->regs->port_status[0]);
|
|
|
|
/* is this really needed? */
|
|
msleep(10);
|
|
|
|
ehci_port_power(ehci, 0);
|
|
return 0;
|
|
}
|
|
|
|
static const struct hc_driver ehci_mxc_hc_driver = {
|
|
.description = hcd_name,
|
|
.product_desc = "Freescale On-Chip EHCI Host Controller",
|
|
.hcd_priv_size = sizeof(struct ehci_hcd),
|
|
|
|
/*
|
|
* generic hardware linkage
|
|
*/
|
|
.irq = ehci_irq,
|
|
.flags = HCD_USB2 | HCD_MEMORY,
|
|
|
|
/*
|
|
* basic lifecycle operations
|
|
*/
|
|
.reset = ehci_mxc_setup,
|
|
.start = ehci_run,
|
|
.stop = ehci_stop,
|
|
.shutdown = ehci_shutdown,
|
|
|
|
/*
|
|
* managing i/o requests and associated device resources
|
|
*/
|
|
.urb_enqueue = ehci_urb_enqueue,
|
|
.urb_dequeue = ehci_urb_dequeue,
|
|
.endpoint_disable = ehci_endpoint_disable,
|
|
|
|
/*
|
|
* scheduling support
|
|
*/
|
|
.get_frame_number = ehci_get_frame,
|
|
|
|
/*
|
|
* root hub support
|
|
*/
|
|
.hub_status_data = ehci_hub_status_data,
|
|
.hub_control = ehci_hub_control,
|
|
.bus_suspend = ehci_bus_suspend,
|
|
.bus_resume = ehci_bus_resume,
|
|
.relinquish_port = ehci_relinquish_port,
|
|
.port_handed_over = ehci_port_handed_over,
|
|
};
|
|
|
|
static int ehci_mxc_drv_probe(struct platform_device *pdev)
|
|
{
|
|
struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
|
|
struct usb_hcd *hcd;
|
|
struct resource *res;
|
|
int irq, ret;
|
|
struct ehci_mxc_priv *priv;
|
|
struct device *dev = &pdev->dev;
|
|
|
|
dev_info(&pdev->dev, "initializing i.MX USB Controller\n");
|
|
|
|
if (!pdata) {
|
|
dev_err(dev, "No platform data given, bailing out.\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
irq = platform_get_irq(pdev, 0);
|
|
|
|
hcd = usb_create_hcd(&ehci_mxc_hc_driver, dev, dev_name(dev));
|
|
if (!hcd)
|
|
return -ENOMEM;
|
|
|
|
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
|
|
if (!priv) {
|
|
ret = -ENOMEM;
|
|
goto err_alloc;
|
|
}
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!res) {
|
|
dev_err(dev, "Found HC with no register addr. Check setup!\n");
|
|
ret = -ENODEV;
|
|
goto err_get_resource;
|
|
}
|
|
|
|
hcd->rsrc_start = res->start;
|
|
hcd->rsrc_len = resource_size(res);
|
|
|
|
if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
|
|
dev_dbg(dev, "controller already in use\n");
|
|
ret = -EBUSY;
|
|
goto err_request_mem;
|
|
}
|
|
|
|
hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
|
|
if (!hcd->regs) {
|
|
dev_err(dev, "error mapping memory\n");
|
|
ret = -EFAULT;
|
|
goto err_ioremap;
|
|
}
|
|
|
|
/* call platform specific init function */
|
|
if (pdata->init) {
|
|
ret = pdata->init(pdev);
|
|
if (ret) {
|
|
dev_err(dev, "platform init failed\n");
|
|
goto err_init;
|
|
}
|
|
/* platforms need some time to settle changed IO settings */
|
|
mdelay(10);
|
|
}
|
|
|
|
/* enable clocks */
|
|
priv->usbclk = clk_get(dev, "usb");
|
|
if (IS_ERR(priv->usbclk)) {
|
|
ret = PTR_ERR(priv->usbclk);
|
|
goto err_clk;
|
|
}
|
|
clk_enable(priv->usbclk);
|
|
|
|
if (!cpu_is_mx35() && !cpu_is_mx25()) {
|
|
priv->ahbclk = clk_get(dev, "usb_ahb");
|
|
if (IS_ERR(priv->ahbclk)) {
|
|
ret = PTR_ERR(priv->ahbclk);
|
|
goto err_clk_ahb;
|
|
}
|
|
clk_enable(priv->ahbclk);
|
|
}
|
|
|
|
/* setup specific usb hw */
|
|
ret = mxc_initialize_usb_hw(pdev->id, pdata->flags);
|
|
if (ret < 0)
|
|
goto err_init;
|
|
|
|
/* Initialize the transceiver */
|
|
if (pdata->otg) {
|
|
pdata->otg->io_priv = hcd->regs + ULPI_VIEWPORT_OFFSET;
|
|
ret = otg_init(pdata->otg);
|
|
if (ret) {
|
|
dev_err(dev, "unable to init transceiver, probably missing\n");
|
|
ret = -ENODEV;
|
|
goto err_add;
|
|
}
|
|
ret = otg_set_vbus(pdata->otg, 1);
|
|
if (ret) {
|
|
dev_err(dev, "unable to enable vbus on transceiver\n");
|
|
goto err_add;
|
|
}
|
|
}
|
|
|
|
priv->hcd = hcd;
|
|
platform_set_drvdata(pdev, priv);
|
|
|
|
ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
|
|
if (ret)
|
|
goto err_add;
|
|
|
|
return 0;
|
|
|
|
err_add:
|
|
if (pdata && pdata->exit)
|
|
pdata->exit(pdev);
|
|
err_init:
|
|
if (priv->ahbclk) {
|
|
clk_disable(priv->ahbclk);
|
|
clk_put(priv->ahbclk);
|
|
}
|
|
err_clk_ahb:
|
|
clk_disable(priv->usbclk);
|
|
clk_put(priv->usbclk);
|
|
err_clk:
|
|
iounmap(hcd->regs);
|
|
err_ioremap:
|
|
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
|
err_request_mem:
|
|
err_get_resource:
|
|
kfree(priv);
|
|
err_alloc:
|
|
usb_put_hcd(hcd);
|
|
return ret;
|
|
}
|
|
|
|
static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)
|
|
{
|
|
struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
|
|
struct ehci_mxc_priv *priv = platform_get_drvdata(pdev);
|
|
struct usb_hcd *hcd = priv->hcd;
|
|
|
|
if (pdata && pdata->exit)
|
|
pdata->exit(pdev);
|
|
|
|
if (pdata->otg)
|
|
otg_shutdown(pdata->otg);
|
|
|
|
usb_remove_hcd(hcd);
|
|
iounmap(hcd->regs);
|
|
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
|
usb_put_hcd(hcd);
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
|
clk_disable(priv->usbclk);
|
|
clk_put(priv->usbclk);
|
|
if (priv->ahbclk) {
|
|
clk_disable(priv->ahbclk);
|
|
clk_put(priv->ahbclk);
|
|
}
|
|
|
|
kfree(priv);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void ehci_mxc_drv_shutdown(struct platform_device *pdev)
|
|
{
|
|
struct ehci_mxc_priv *priv = platform_get_drvdata(pdev);
|
|
struct usb_hcd *hcd = priv->hcd;
|
|
|
|
if (hcd->driver->shutdown)
|
|
hcd->driver->shutdown(hcd);
|
|
}
|
|
|
|
MODULE_ALIAS("platform:mxc-ehci");
|
|
|
|
static struct platform_driver ehci_mxc_driver = {
|
|
.probe = ehci_mxc_drv_probe,
|
|
.remove = __exit_p(ehci_mxc_drv_remove),
|
|
.shutdown = ehci_mxc_drv_shutdown,
|
|
.driver = {
|
|
.name = "mxc-ehci",
|
|
},
|
|
};
|