Commit d5fb7f1b authored by Jordan Crouse's avatar Jordan Crouse Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: OHCI for AU1200 



ALCHEMY:  Add OHCI support for AU1200

Updated by moving the OHCI support out of the EHCI patch.

Signed-off-by: default avatarJordan Crouse <jordan.crouse@amd.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 76fa9a24

arch/mips/au1000/common/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
static struct resource au1xxx_usb_ohci_resources[] = {

	[0] = {

		.start		= USB_OHCI_BASE,

		.end		= USB_OHCI_BASE + USB_OHCI_LEN,

		.end		= USB_OHCI_BASE + USB_OHCI_LEN - 1,

		.flags		= IORESOURCE_MEM,

	},

	[1] = {

drivers/usb/host/ohci-au1xxx.c

+87 −15
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 


#include <asm/mach-au1x00/au1000.h>



#ifndef	CONFIG_SOC_AU1200



#define USBH_ENABLE_BE (1<<0)

#define USBH_ENABLE_C  (1<<1)

#define USBH_ENABLE_E  (1<<2)
@@ -37,21 +39,68 @@ 
#error not byte order defined

#endif



#else   /* Au1200 */



#define USB_HOST_CONFIG    (USB_MSR_BASE + USB_MSR_MCFG)

#define USB_MCFG_PFEN     (1<<31)

#define USB_MCFG_RDCOMB   (1<<30)

#define USB_MCFG_SSDEN    (1<<23)

#define USB_MCFG_OHCCLKEN (1<<16)

#define USB_MCFG_UCAM     (1<<7)

#define USB_MCFG_OBMEN    (1<<1)

#define USB_MCFG_OMEMEN   (1<<0)



#define USBH_ENABLE_CE    USB_MCFG_OHCCLKEN

#ifdef CONFIG_DMA_COHERENT

#define USBH_ENABLE_INIT  (USB_MCFG_OHCCLKEN \

                         | USB_MCFG_PFEN | USB_MCFG_RDCOMB \

                         | USB_MCFG_SSDEN | USB_MCFG_UCAM \

                         | 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)



#endif  /* Au1200 */



extern int usb_disabled(void);



/*-------------------------------------------------------------------------*/



static void au1xxx_start_hc(struct platform_device *dev)

static void au1xxx_start_ohc(struct platform_device *dev)

{

	printk(KERN_DEBUG __FILE__

		": starting Au1xxx OHCI USB Controller\n");



	/* enable host controller */



#ifndef CONFIG_SOC_AU1200



	au_writel(USBH_ENABLE_CE, USB_HOST_CONFIG);

	udelay(1000);

	au_writel(USBH_ENABLE_INIT, USB_HOST_CONFIG);

	udelay(1000);



#else   /* Au1200 */



	/* 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);

	au_writel(USBH_ENABLE_INIT | au_readl(USB_HOST_CONFIG), USB_HOST_CONFIG);

	au_readl(USB_HOST_CONFIG);

	udelay(1000);



#endif  /* Au1200 */



	/* wait for reset complete (read register twice; see au1500 errata) */

	while (au_readl(USB_HOST_CONFIG),

		!(au_readl(USB_HOST_CONFIG) & USBH_ENABLE_RD))
@@ -61,13 +110,25 @@ static void au1xxx_start_hc(struct platform_device *dev) 
	": Clock to USB host has been enabled \n");

}



static void au1xxx_stop_hc(struct platform_device *dev)

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 */



	/* Disable mem */

	au_writel(~USBH_DISABLE & au_readl(USB_HOST_CONFIG), USB_HOST_CONFIG);

	udelay(1000);

	/* Disable clock */

	au_writel(~USBH_ENABLE_CE & au_readl(USB_HOST_CONFIG), USB_HOST_CONFIG);

	au_readl(USB_HOST_CONFIG);

#endif  /* Au1200 */

}
@@ -78,7 +139,7 @@ static void au1xxx_stop_hc(struct platform_device *dev) 




/**

 * usb_hcd_au1xxx_probe - initialize Au1xxx-based HCDs

 * usb_ohci_au1xxx_probe - initialize Au1xxx-based HCDs

 * Context: !in_interrupt()

 *

 * Allocates basic resources for this USB host controller, and
@@ -86,14 +147,25 @@ static void au1xxx_stop_hc(struct platform_device *dev) 
 * through the hotplug entry's driver_data.

 *

 */

int usb_hcd_au1xxx_probe (const struct hc_driver *driver,

static int usb_ohci_au1xxx_probe(const struct hc_driver *driver,

			  struct platform_device *dev)

{

	int retval;

	struct usb_hcd *hcd;



#if defined(CONFIG_SOC_AU1200) && defined(CONFIG_DMA_COHERENT)

	/* Au1200 AB USB does not support coherent memory */

	if (!(read_c0_prid() & 0xff)) {

		pr_info("%s: this is chip revision AB !!\n",

			dev->dev.name);

		pr_info("%s: update your board or re-configure the kernel\n",

			dev->dev.name);

		return -ENODEV;

	}

#endif



	if (dev->resource[1].flags != IORESOURCE_IRQ) {

		pr_debug ("resource[1] is not IORESOURCE_IRQ");

		pr_debug("resource[1] is not IORESOURCE_IRQ\n");

		return -ENOMEM;

	}
@@ -104,26 +176,26 @@ int usb_hcd_au1xxx_probe (const struct hc_driver *driver, 
	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");

		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");

		pr_debug("ioremap failed\n");

		retval = -ENOMEM;

		goto err2;

	}



	au1xxx_start_hc(dev);

	au1xxx_start_ohc(dev);

	ohci_hcd_init(hcd_to_ohci(hcd));



	retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT);

	retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT | SA_SHIRQ);

	if (retval == 0)

		return retval;



	au1xxx_stop_hc(dev);

	au1xxx_stop_ohc(dev);

	iounmap(hcd->regs);

 err2:

	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
@@ -146,10 +218,10 @@ int usb_hcd_au1xxx_probe (const struct hc_driver *driver, 
 * context, normally "rmmod", "apmd", or something similar.

 *

 */

void usb_hcd_au1xxx_remove (struct usb_hcd *hcd, struct platform_device *dev)

static void usb_ohci_au1xxx_remove(struct usb_hcd *hcd, struct platform_device *dev)

{

	usb_remove_hcd(hcd);

	au1xxx_stop_hc(dev);

	au1xxx_stop_ohc(dev);

	iounmap(hcd->regs);

	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);

	usb_put_hcd(hcd);
@@ -235,7 +307,7 @@ static int ohci_hcd_au1xxx_drv_probe(struct platform_device *pdev) 
	if (usb_disabled())

		return -ENODEV;



	ret = usb_hcd_au1xxx_probe(&ohci_au1xxx_hc_driver, pdev);

	ret = usb_ohci_au1xxx_probe(&ohci_au1xxx_hc_driver, pdev);

	return ret;

}
@@ -243,7 +315,7 @@ static int ohci_hcd_au1xxx_drv_remove(struct platform_device *pdev) 
{

	struct usb_hcd *hcd = platform_get_drvdata(pdev);



	usb_hcd_au1xxx_remove(hcd, pdev);

	usb_ohci_au1xxx_remove(hcd, pdev);

	return 0;

}

	/*TBD*/

CRA Git | Maintained and supported by SUSTech CRA and CCSE