Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 760efe69 authored by Mac Lin's avatar Mac Lin Committed by Anton Vorontsov
Browse files

USB: cns3xxx: Add EHCI and OHCI bus glue for cns3xxx SOCs 



The CNS3XXX SOC has include USB EHCI and OHCI compatible controllers.
This patch adds the necessary glue logic to allow ehci-hcd and ohci-hcd
drivers to work on CNS3XXX

The EHCI and OHCI controllers share a common clock control and reset
bit, therefore additional check for the timming of enabling and disabling
is required. The USB bit of PLL Power Down Control is also shared by OTG,
24MHzUART clock, Crypto clock, PCIe reference clock, and Clock Scale
Generator. Therefore we only ensure it is enabled, while not disabling it.

Signed-off-by: default avatarMac Lin <mkl0301@gmail.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
parent cf36797f

drivers/usb/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ config USB_ARCH_HAS_OHCI 
	default y if MFD_TC6393XB

	default y if ARCH_W90X900

	default y if ARCH_DAVINCI_DA8XX

	default y if ARCH_CNS3XXX

	# PPC:

	default y if STB03xxx

	default y if PPC_MPC52xx
@@ -66,6 +67,7 @@ config USB_ARCH_HAS_EHCI 
	default y if ARCH_AT91SAM9G45

	default y if ARCH_MXC

	default y if ARCH_OMAP3

	default y if ARCH_CNS3XXX

	default PCI



# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.

drivers/usb/host/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -147,6 +147,14 @@ config USB_W90X900_EHCI 
	---help---

		Enables support for the W90X900 USB controller



config USB_CNS3XXX_EHCI

	bool "Cavium CNS3XXX EHCI Module"

	depends on USB_EHCI_HCD && ARCH_CNS3XXX

	---help---

	  Enable support for the CNS3XXX SOC's on-chip EHCI controller.

	  It is needed for high-speed (480Mbit/sec) USB 2.0 device

	  support.



config USB_OXU210HP_HCD

	tristate "OXU210HP HCD support"

	depends on USB
@@ -286,6 +294,13 @@ config USB_OHCI_HCD_SSB 


	  If unsure, say N.



config USB_CNS3XXX_OHCI

	bool "Cavium CNS3XXX OHCI Module"

	depends on USB_OHCI_HCD && ARCH_CNS3XXX

	---help---

	  Enable support for the CNS3XXX SOC's on-chip OHCI controller.

	  It is needed for low-speed USB 1.0 device support.



config USB_OHCI_BIG_ENDIAN_DESC

	bool

	depends on USB_OHCI_HCD

drivers/usb/host/ehci-cns3xxx.c

0 → 100644
+171 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2008 Cavium Networks

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as

 * published by the Free Software Foundation.

 */



#include <linux/platform_device.h>

#include <linux/atomic.h>

#include <mach/cns3xxx.h>

#include <mach/pm.h>



static int cns3xxx_ehci_init(struct usb_hcd *hcd)

{

	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	int retval;



	/*

	 * EHCI and OHCI share the same clock and power,

	 * resetting twice would cause the 1st controller been reset.

	 * Therefore only do power up  at the first up device, and

	 * power down at the last down device.

	 *

	 * Set USB AHB INCR length to 16

	 */

	if (atomic_inc_return(&usb_pwr_ref) == 1) {

		cns3xxx_pwr_power_up(1 << PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_USB);

		cns3xxx_pwr_clk_en(1 << PM_CLK_GATE_REG_OFFSET_USB_HOST);

		cns3xxx_pwr_soft_rst(1 << PM_SOFT_RST_REG_OFFST_USB_HOST);

		__raw_writel((__raw_readl(MISC_CHIP_CONFIG_REG) | (0X2 << 24)),

			MISC_CHIP_CONFIG_REG);

	}



	ehci->caps = hcd->regs;

	ehci->regs = hcd->regs

		+ HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));

	ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);



	hcd->has_tt = 0;

	ehci_reset(ehci);



	retval = ehci_init(hcd);

	if (retval)

		return retval;



	ehci_port_power(ehci, 0);



	return retval;

}



static const struct hc_driver cns3xxx_ehci_hc_driver = {

	.description		= hcd_name,

	.product_desc		= "CNS3XXX EHCI Host Controller",

	.hcd_priv_size		= sizeof(struct ehci_hcd),

	.irq			= ehci_irq,

	.flags			= HCD_MEMORY | HCD_USB2,

	.reset			= cns3xxx_ehci_init,

	.start			= ehci_run,

	.stop			= ehci_stop,

	.shutdown		= ehci_shutdown,

	.urb_enqueue		= ehci_urb_enqueue,

	.urb_dequeue		= ehci_urb_dequeue,

	.endpoint_disable	= ehci_endpoint_disable,

	.endpoint_reset		= ehci_endpoint_reset,

	.get_frame_number	= ehci_get_frame,

	.hub_status_data	= ehci_hub_status_data,

	.hub_control		= ehci_hub_control,

#ifdef CONFIG_PM

	.bus_suspend		= ehci_bus_suspend,

	.bus_resume		= ehci_bus_resume,

#endif

	.relinquish_port	= ehci_relinquish_port,

	.port_handed_over	= ehci_port_handed_over,



	.clear_tt_buffer_complete	= ehci_clear_tt_buffer_complete,

};



static int cns3xxx_ehci_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct usb_hcd *hcd;

	const struct hc_driver *driver = &cns3xxx_ehci_hc_driver;

	struct resource *res;

	int irq;

	int retval;



	if (usb_disabled())

		return -ENODEV;



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res) {

		dev_err(dev, "Found HC with no IRQ.\n");

		return -ENODEV;

	}

	irq = res->start;



	hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));

	if (!hcd)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "Found HC with no register addr.\n");

		retval = -ENODEV;

		goto err1;

	}



	hcd->rsrc_start = res->start;

	hcd->rsrc_len = res->end - res->start + 1;



	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,

				driver->description)) {

		dev_dbg(dev, "controller already in use\n");

		retval = -EBUSY;

		goto err1;

	}



	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);

	if (hcd->regs == NULL) {

		dev_dbg(dev, "error mapping memory\n");

		retval = -EFAULT;

		goto err2;

	}



	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);

	if (retval == 0)

		return retval;



	iounmap(hcd->regs);

err2:

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

err1:

	usb_put_hcd(hcd);



	return retval;

}



static int cns3xxx_ehci_remove(struct platform_device *pdev)

{

	struct usb_hcd *hcd = platform_get_drvdata(pdev);



	usb_remove_hcd(hcd);

	iounmap(hcd->regs);

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



	/*

	 * EHCI and OHCI share the same clock and power,

	 * resetting twice would cause the 1st controller been reset.

	 * Therefore only do power up  at the first up device, and

	 * power down at the last down device.

	 */

	if (atomic_dec_return(&usb_pwr_ref) == 0)

		cns3xxx_pwr_clk_dis(1 << PM_CLK_GATE_REG_OFFSET_USB_HOST);



	usb_put_hcd(hcd);



	platform_set_drvdata(pdev, NULL);



	return 0;

}



MODULE_ALIAS("platform:cns3xxx-ehci");



static struct platform_driver cns3xxx_ehci_driver = {

	.probe = cns3xxx_ehci_probe,

	.remove = cns3xxx_ehci_remove,

	.driver = {

		.name = "cns3xxx-ehci",

	},

};

drivers/usb/host/ehci-hcd.c

+5 −0
Original line number Diff line number Diff line
@@ -1216,6 +1216,11 @@ MODULE_LICENSE ("GPL"); 
#define PLATFORM_DRIVER		ehci_octeon_driver

#endif



#ifdef CONFIG_USB_CNS3XXX_EHCI

#include "ehci-cns3xxx.c"

#define PLATFORM_DRIVER		cns3xxx_ehci_driver

#endif



#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \

    !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \

    !defined(XILINX_OF_PLATFORM_DRIVER)

drivers/usb/host/ohci-cns3xxx.c

0 → 100644
+165 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2008 Cavium Networks

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as

 * published by the Free Software Foundation.

 */



#include <linux/platform_device.h>

#include <linux/atomic.h>

#include <mach/cns3xxx.h>

#include <mach/pm.h>



static int __devinit

cns3xxx_ohci_start(struct usb_hcd *hcd)

{

	struct ohci_hcd	*ohci = hcd_to_ohci(hcd);

	int ret;



	/*

	 * EHCI and OHCI share the same clock and power,

	 * resetting twice would cause the 1st controller been reset.

	 * Therefore only do power up  at the first up device, and

	 * power down at the last down device.

	 *

	 * Set USB AHB INCR length to 16

	 */

	if (atomic_inc_return(&usb_pwr_ref) == 1) {

		cns3xxx_pwr_power_up(1 << PM_PLL_HM_PD_CTRL_REG_OFFSET_PLL_USB);

		cns3xxx_pwr_clk_en(1 << PM_CLK_GATE_REG_OFFSET_USB_HOST);

		cns3xxx_pwr_soft_rst(1 << PM_SOFT_RST_REG_OFFST_USB_HOST);

		__raw_writel((__raw_readl(MISC_CHIP_CONFIG_REG) | (0X2 << 24)),

			MISC_CHIP_CONFIG_REG);

	}



	ret = ohci_init(ohci);

	if (ret < 0)

		return ret;



	ohci->num_ports = 1;



	ret = ohci_run(ohci);

	if (ret < 0) {

		err("can't start %s", hcd->self.bus_name);

		ohci_stop(hcd);

		return ret;

	}

	return 0;

}



static const struct hc_driver cns3xxx_ohci_hc_driver = {

	.description		= hcd_name,

	.product_desc		= "CNS3XXX OHCI Host controller",

	.hcd_priv_size		= sizeof(struct ohci_hcd),

	.irq			= ohci_irq,

	.flags			= HCD_USB11 | HCD_MEMORY,

	.start			= cns3xxx_ohci_start,

	.stop			= ohci_stop,

	.shutdown		= ohci_shutdown,

	.urb_enqueue		= ohci_urb_enqueue,

	.urb_dequeue		= ohci_urb_dequeue,

	.endpoint_disable	= ohci_endpoint_disable,

	.get_frame_number	= ohci_get_frame,

	.hub_status_data	= ohci_hub_status_data,

	.hub_control		= ohci_hub_control,

#ifdef CONFIG_PM

	.bus_suspend		= ohci_bus_suspend,

	.bus_resume		= ohci_bus_resume,

#endif

	.start_port_reset	= ohci_start_port_reset,

};



static int cns3xxx_ohci_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct usb_hcd *hcd;

	const struct hc_driver *driver = &cns3xxx_ohci_hc_driver;

	struct resource *res;

	int irq;

	int retval;



	if (usb_disabled())

		return -ENODEV;



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res) {

		dev_err(dev, "Found HC with no IRQ.\n");

		return -ENODEV;

	}

	irq = res->start;



	hcd = usb_create_hcd(driver, dev, dev_name(dev));

	if (!hcd)

		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "Found HC with no register addr.\n");

		retval = -ENODEV;

		goto err1;

	}

	hcd->rsrc_start = res->start;

	hcd->rsrc_len = res->end - res->start + 1;



	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,

			driver->description)) {

		dev_dbg(dev, "controller already in use\n");

		retval = -EBUSY;

		goto err1;

	}



	hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);

	if (!hcd->regs) {

		dev_dbg(dev, "error mapping memory\n");

		retval = -EFAULT;

		goto err2;

	}



	ohci_hcd_init(hcd_to_ohci(hcd));



	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);

	if (retval == 0)

		return retval;



	iounmap(hcd->regs);

err2:

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

err1:

	usb_put_hcd(hcd);

	return retval;

}



static int cns3xxx_ohci_remove(struct platform_device *pdev)

{

	struct usb_hcd *hcd = platform_get_drvdata(pdev);



	usb_remove_hcd(hcd);

	iounmap(hcd->regs);

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



	/*

	 * EHCI and OHCI share the same clock and power,

	 * resetting twice would cause the 1st controller been reset.

	 * Therefore only do power up  at the first up device, and

	 * power down at the last down device.

	 */

	if (atomic_dec_return(&usb_pwr_ref) == 0)

		cns3xxx_pwr_clk_dis(1 << PM_CLK_GATE_REG_OFFSET_USB_HOST);



	usb_put_hcd(hcd);



	platform_set_drvdata(pdev, NULL);



	return 0;

}



MODULE_ALIAS("platform:cns3xxx-ohci");



static struct platform_driver ohci_hcd_cns3xxx_driver = {

	.probe = cns3xxx_ohci_probe,

	.remove = cns3xxx_ohci_remove,

	.driver = {

		.name = "cns3xxx-ohci",

	},

};