Skip to content

L
linux
Commit 53c81a34 authored by Manuel Lauss's avatar Manuel Lauss Committed by Greg Kroah-Hartman
Browse files
Options

USB: Au1xxx-usb: clean up ohci/ehci bus glue sources. 

- Fold multiple probe/remove callbacks into one function;
- minor style fixes, no functional changes.

Tested on Au1200.
Signed-off-by: default avatarManuel Lauss <mano@roarinelk.homelinux.net>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e04199b2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 334 deletions
drivers/usb/host/ehci-au1xxx.c
View file @ 53c81a34
This diff is collapsed.
drivers/usb/host/ohci-au1xxx.c
View file @ 53c81a34
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
#ifdef __LITTLE_ENDIAN #ifdef __LITTLE_ENDIAN
#define USBH_ENABLE_INIT (USBH_ENABLE_CE | USBH_ENABLE_E | USBH_ENABLE_C) #define USBH_ENABLE_INIT (USBH_ENABLE_CE | USBH_ENABLE_E | USBH_ENABLE_C)
#elif __BIG_ENDIAN #elif __BIG_ENDIAN
#define USBH_ENABLE_INIT (USBH_ENABLE_CE | USBH_ENABLE_E | USBH_ENABLE_C | USBH_ENABLE_BE) #define USBH_ENABLE_INIT (USBH_ENABLE_CE | USBH_ENABLE_E | USBH_ENABLE_C | \
USBH_ENABLE_BE)
#else #else
#error not byte order defined #error not byte order defined
#endif #endif
...@@ -46,213 +47,87 @@ ...@@ -46,213 +47,87 @@
#define USB_MCFG_RDCOMB (1<<30) #define USB_MCFG_RDCOMB (1<<30)
#define USB_MCFG_SSDEN (1<<23) #define USB_MCFG_SSDEN (1<<23)
#define USB_MCFG_OHCCLKEN (1<<16) #define USB_MCFG_OHCCLKEN (1<<16)
#ifdef CONFIG_DMA_COHERENT
#define USB_MCFG_UCAM (1<<7) #define USB_MCFG_UCAM (1<<7)
#else
#define USB_MCFG_UCAM (0)
#endif
#define USB_MCFG_OBMEN (1<<1) #define USB_MCFG_OBMEN (1<<1)
#define USB_MCFG_OMEMEN (1<<0) #define USB_MCFG_OMEMEN (1<<0)
#define USBH_ENABLE_CE USB_MCFG_OHCCLKEN #define USBH_ENABLE_CE USB_MCFG_OHCCLKEN
#ifdef CONFIG_DMA_COHERENT
#define USBH_ENABLE_INIT (USB_MCFG_OHCCLKEN \ #define USBH_ENABLE_INIT (USB_MCFG_PFEN | USB_MCFG_RDCOMB | \
| USB_MCFG_PFEN | USB_MCFG_RDCOMB \ USBH_ENABLE_CE | USB_MCFG_SSDEN | \
| USB_MCFG_SSDEN | USB_MCFG_UCAM \ USB_MCFG_UCAM | \
| USB_MCFG_OBMEN | USB_MCFG_OMEMEN) USB_MCFG_OBMEN | USB_MCFG_OMEMEN)
#else
#define USBH_ENABLE_INIT (USB_MCFG_OHCCLKEN \
| USB_MCFG_PFEN | USB_MCFG_RDCOMB \
| USB_MCFG_SSDEN \
| USB_MCFG_OBMEN | USB_MCFG_OMEMEN)
#endif
#define USBH_DISABLE (USB_MCFG_OBMEN | USB_MCFG_OMEMEN) #define USBH_DISABLE (USB_MCFG_OBMEN | USB_MCFG_OMEMEN)
#endif /* Au1200 */ #endif /* Au1200 */
extern int usb_disabled(void); extern int usb_disabled(void);
/*-------------------------------------------------------------------------*/ static void au1xxx_start_ohc(void)
static void au1xxx_start_ohc(struct platform_device *dev)
{ {
printk(KERN_DEBUG __FILE__
": starting Au1xxx OHCI USB Controller\n");
/* enable host controller */ /* enable host controller */
#ifndef CONFIG_SOC_AU1200 #ifndef CONFIG_SOC_AU1200
au_writel(USBH_ENABLE_CE, USB_HOST_CONFIG); au_writel(USBH_ENABLE_CE, USB_HOST_CONFIG);
udelay(1000); au_sync();
au_writel(USBH_ENABLE_INIT, USB_HOST_CONFIG);
udelay(1000); udelay(1000);
#else /* Au1200 */ au_writel(au_readl(USB_HOST_CONFIG) | USBH_ENABLE_INIT, USB_HOST_CONFIG);
au_sync();
/* write HW defaults again in case Yamon cleared them */
if (au_readl(USB_HOST_CONFIG) == 0) {
au_writel(0x00d02000, USB_HOST_CONFIG);
au_readl(USB_HOST_CONFIG);
udelay(1000);
}
au_writel(USBH_ENABLE_CE | au_readl(USB_HOST_CONFIG), USB_HOST_CONFIG);
au_readl(USB_HOST_CONFIG);
udelay(1000); udelay(1000);
au_writel(USBH_ENABLE_INIT | au_readl(USB_HOST_CONFIG), USB_HOST_CONFIG);
au_readl(USB_HOST_CONFIG);
udelay(1000);
#endif /* Au1200 */
#ifndef CONFIG_SOC_AU1200
/* wait for reset complete (read register twice; see au1500 errata) */ /* wait for reset complete (read register twice; see au1500 errata) */
while (au_readl(USB_HOST_CONFIG), while (au_readl(USB_HOST_CONFIG),
!(au_readl(USB_HOST_CONFIG) & USBH_ENABLE_RD)) !(au_readl(USB_HOST_CONFIG) & USBH_ENABLE_RD))
#endif
udelay(1000); udelay(1000);
printk(KERN_DEBUG __FILE__
": Clock to USB host has been enabled \n");
}
static void au1xxx_stop_ohc(struct platform_device *dev)
{
printk(KERN_DEBUG __FILE__
": stopping Au1xxx OHCI USB Controller\n");
#ifndef CONFIG_SOC_AU1200
/* Disable clock */
au_writel(au_readl(USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG);
#else /* Au1200 */ #else /* Au1200 */
au_writel(au_readl(USB_HOST_CONFIG) | USBH_ENABLE_CE, USB_HOST_CONFIG);
/* Disable mem */ au_sync();
au_writel(~USBH_DISABLE & au_readl(USB_HOST_CONFIG), USB_HOST_CONFIG);
udelay(1000); udelay(1000);
/* Disable clock */
au_writel(~USBH_ENABLE_CE & au_readl(USB_HOST_CONFIG), USB_HOST_CONFIG); au_writel(au_readl(USB_HOST_CONFIG) | USBH_ENABLE_INIT, USB_HOST_CONFIG);
au_readl(USB_HOST_CONFIG); au_sync();
udelay(2000);
#endif /* Au1200 */ #endif /* Au1200 */
} }
static void au1xxx_stop_ohc(void)
/*-------------------------------------------------------------------------*/
/* configure so an HC device and id are always provided */
/* always called with process context; sleeping is OK */
/**
* usb_ohci_au1xxx_probe - initialize Au1xxx-based HCDs
* Context: !in_interrupt()
*
* Allocates basic resources for this USB host controller, and
* then invokes the start() method for the HCD associated with it
* through the hotplug entry's driver_data.
*
*/
static int usb_ohci_au1xxx_probe(const struct hc_driver *driver,
struct platform_device *dev)
{ {
int retval; #ifdef CONFIG_SOC_AU1200
struct usb_hcd *hcd; /* Disable mem */
au_writel(au_readl(USB_HOST_CONFIG) & ~USBH_DISABLE, USB_HOST_CONFIG);
#if defined(CONFIG_SOC_AU1200) && defined(CONFIG_DMA_COHERENT) au_sync();
/* Au1200 AB USB does not support coherent memory */ udelay(1000);
if (!(read_c0_prid() & 0xff)) {
pr_info("%s: this is chip revision AB !!\n",
dev->name);
pr_info("%s: update your board or re-configure the kernel\n",
dev->name);
return -ENODEV;
}
#endif #endif
/* Disable clock */
if (dev->resource[1].flags != IORESOURCE_IRQ) { au_writel(au_readl(USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG);
pr_debug("resource[1] is not IORESOURCE_IRQ\n"); au_sync();
return -ENOMEM;
}
hcd = usb_create_hcd(driver, &dev->dev, "au1xxx");
if (!hcd)
return -ENOMEM;
hcd->rsrc_start = dev->resource[0].start;
hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1;
if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
pr_debug("request_mem_region failed\n");
retval = -EBUSY;
goto err1;
}
hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
if (!hcd->regs) {
pr_debug("ioremap failed\n");
retval = -ENOMEM;
goto err2;
}
au1xxx_start_ohc(dev);
ohci_hcd_init(hcd_to_ohci(hcd));
retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED | IRQF_SHARED);
if (retval == 0)
return retval;
au1xxx_stop_ohc(dev);
iounmap(hcd->regs);
err2:
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
err1:
usb_put_hcd(hcd);
return retval;
}
/* may be called without controller electrically present */
/* may be called with controller, bus, and devices active */
/**
* usb_hcd_au1xxx_remove - shutdown processing for Au1xxx-based HCDs
* @dev: USB Host Controller being removed
* Context: !in_interrupt()
*
* Reverses the effect of usb_hcd_au1xxx_probe(), first invoking
* the HCD's stop() method. It is always called from a thread
* context, normally "rmmod", "apmd", or something similar.
*
*/
static void usb_ohci_au1xxx_remove(struct usb_hcd *hcd, struct platform_device *dev)
{
usb_remove_hcd(hcd);
au1xxx_stop_ohc(dev);
iounmap(hcd->regs);
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
usb_put_hcd(hcd);
} }
/*-------------------------------------------------------------------------*/ static int __devinit ohci_au1xxx_start(struct usb_hcd *hcd)
static int __devinit
ohci_au1xxx_start (struct usb_hcd *hcd)
{ {
struct ohci_hcd *ohci = hcd_to_ohci (hcd); struct ohci_hcd *ohci = hcd_to_ohci(hcd);
int ret; int ret;
ohci_dbg (ohci, "ohci_au1xxx_start, ohci:%p", ohci); ohci_dbg(ohci, "ohci_au1xxx_start, ohci:%p", ohci);
if ((ret = ohci_init (ohci)) < 0) if ((ret = ohci_init(ohci)) < 0)
return ret; return ret;
if ((ret = ohci_run (ohci)) < 0) { if ((ret = ohci_run(ohci)) < 0) {
err ("can't start %s", hcd->self.bus_name); err ("can't start %s", hcd->self.bus_name);
ohci_stop (hcd); ohci_stop(hcd);
return ret; return ret;
} }
return 0; return 0;
} }
/*-------------------------------------------------------------------------*/
static const struct hc_driver ohci_au1xxx_hc_driver = { static const struct hc_driver ohci_au1xxx_hc_driver = {
.description = hcd_name, .description = hcd_name,
.product_desc = "Au1xxx OHCI", .product_desc = "Au1xxx OHCI",
...@@ -296,18 +171,66 @@ static const struct hc_driver ohci_au1xxx_hc_driver = { ...@@ -296,18 +171,66 @@ static const struct hc_driver ohci_au1xxx_hc_driver = {
.start_port_reset = ohci_start_port_reset, .start_port_reset = ohci_start_port_reset,
}; };
/*-------------------------------------------------------------------------*/
static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev) static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev)
{ {
int ret; int ret;
struct usb_hcd *hcd;
pr_debug ("In ohci_hcd_au1xxx_drv_probe");
if (usb_disabled()) if (usb_disabled())
return -ENODEV; return -ENODEV;
ret = usb_ohci_au1xxx_probe(&ohci_au1xxx_hc_driver, pdev); #if defined(CONFIG_SOC_AU1200) && defined(CONFIG_DMA_COHERENT)
/* Au1200 AB USB does not support coherent memory */
if (!(read_c0_prid() & 0xff)) {
printk(KERN_INFO "%s: this is chip revision AB !!\n",
pdev->name);
printk(KERN_INFO "%s: update your board or re-configure "
"the kernel\n", pdev->name);
return -ENODEV;
}
#endif
if (pdev->resource[1].flags != IORESOURCE_IRQ) {
pr_debug("resource[1] is not IORESOURCE_IRQ\n");
return -ENOMEM;
}
hcd = usb_create_hcd(&ohci_au1xxx_hc_driver, &pdev->dev, "au1xxx");
if (!hcd)
return -ENOMEM;
hcd->rsrc_start = pdev->resource[0].start;
hcd->rsrc_len = pdev->resource[0].end - pdev->resource[0].start + 1;
if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
pr_debug("request_mem_region failed\n");
ret = -EBUSY;
goto err1;
}
hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
if (!hcd->regs) {
pr_debug("ioremap failed\n");
ret = -ENOMEM;
goto err2;
}
au1xxx_start_ohc();
ohci_hcd_init(hcd_to_ohci(hcd));
ret = usb_add_hcd(hcd, pdev->resource[1].start,
IRQF_DISABLED | IRQF_SHARED);
if (ret == 0) {
platform_set_drvdata(pdev, hcd);
return ret;
}
au1xxx_stop_ohc();
iounmap(hcd->regs);
err2:
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
err1:
usb_put_hcd(hcd);
return ret; return ret;
} }
...@@ -315,9 +238,16 @@ static int ohci_hcd_au1xxx_drv_remove(struct platform_device *pdev) ...@@ -315,9 +238,16 @@ static int ohci_hcd_au1xxx_drv_remove(struct platform_device *pdev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = platform_get_drvdata(pdev);
usb_ohci_au1xxx_remove(hcd, pdev); usb_remove_hcd(hcd);
au1xxx_stop_ohc();
iounmap(hcd->regs);
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
usb_put_hcd(hcd);
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
/*TBD*/ /*TBD*/
/*static int ohci_hcd_au1xxx_drv_suspend(struct platform_device *dev) /*static int ohci_hcd_au1xxx_drv_suspend(struct platform_device *dev)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7