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

Commit 502fa841 authored by Gabor Juhos's avatar Gabor Juhos Committed by Greg Kroah-Hartman
Browse files

USB: ehci: add bus glue for the Atheros AR71XX/AR724X/AR91XX SoCs 



The Atheros AR71XX/AR91XX SoCs have a built-in EHCI controller.
This patch adds the necessary glue code to make the generic EHCI
driver usable for them.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarImre Kaloz <kaloz@openwrt.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 01da92f7

arch/mips/ath79/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -26,12 +26,15 @@ config ATH79_MACH_PB44 
endmenu



config SOC_AR71XX

	select USB_ARCH_HAS_EHCI

	def_bool n



config SOC_AR724X

	select USB_ARCH_HAS_EHCI

	def_bool n



config SOC_AR913X

	select USB_ARCH_HAS_EHCI

	def_bool n



config ATH79_DEV_AR913X_WMAC

drivers/usb/host/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -208,6 +208,15 @@ config USB_CNS3XXX_EHCI 
	  It is needed for high-speed (480Mbit/sec) USB 2.0 device

	  support.



config USB_EHCI_ATH79

	bool "EHCI support for AR7XXX/AR9XXX SoCs"

	depends on USB_EHCI_HCD && (SOC_AR71XX || SOC_AR724X || SOC_AR913X)

	select USB_EHCI_ROOT_HUB_TT

	default y

	---help---

	  Enables support for the built-in EHCI controller present

	  on the Atheros AR7XXX/AR9XXX SoCs.



config USB_OXU210HP_HCD

	tristate "OXU210HP HCD support"

	depends on USB

drivers/usb/host/ehci-ath79.c

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

 *  Bus Glue for Atheros AR7XXX/AR9XXX built-in EHCI controller.

 *

 *  Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org>

 *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>

 *

 *  Parts of this file are based on Atheros' 2.6.15 BSP

 *	Copyright (C) 2007 Atheros Communications, Inc.

 *

 *  This program 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>



enum {

	EHCI_ATH79_IP_V1 = 0,

	EHCI_ATH79_IP_V2,

};



static const struct platform_device_id ehci_ath79_id_table[] = {

	{

		.name		= "ar71xx-ehci",

		.driver_data	= EHCI_ATH79_IP_V1,

	},

	{

		.name		= "ar724x-ehci",

		.driver_data	= EHCI_ATH79_IP_V2,

	},

	{

		.name		= "ar913x-ehci",

		.driver_data	= EHCI_ATH79_IP_V2,

	},

	{

		/* terminating entry */

	},

};



MODULE_DEVICE_TABLE(platform, ehci_ath79_id_table);



static int ehci_ath79_init(struct usb_hcd *hcd)

{

	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	struct platform_device *pdev = to_platform_device(hcd->self.controller);

	const struct platform_device_id *id;

	int ret;



	id = platform_get_device_id(pdev);

	if (!id) {

		dev_err(hcd->self.controller, "missing device id\n");

		return -EINVAL;

	}



	switch (id->driver_data) {

	case EHCI_ATH79_IP_V1:

		ehci->caps = hcd->regs;

		ehci->regs = hcd->regs +

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

		break;



	case EHCI_ATH79_IP_V2:

		hcd->has_tt = 1;



		ehci->caps = hcd->regs + 0x100;

		ehci->regs = hcd->regs + 0x100 +

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

		break;



	default:

		BUG();

	}



	dbg_hcs_params(ehci, "reset");

	dbg_hcc_params(ehci, "reset");

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

	ehci->sbrn = 0x20;



	ehci_reset(ehci);



	ret = ehci_init(hcd);

	if (ret)

		return ret;



	ehci_port_power(ehci, 0);



	return 0;

}



static const struct hc_driver ehci_ath79_hc_driver = {

	.description		= hcd_name,

	.product_desc		= "Atheros built-in EHCI controller",

	.hcd_priv_size		= sizeof(struct ehci_hcd),

	.irq			= ehci_irq,

	.flags			= HCD_MEMORY | HCD_USB2,



	.reset			= ehci_ath79_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,



	.relinquish_port	= ehci_relinquish_port,

	.port_handed_over	= ehci_port_handed_over,



	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,

};



static int ehci_ath79_probe(struct platform_device *pdev)

{

	struct usb_hcd *hcd;

	struct resource *res;

	int irq;

	int ret;



	if (usb_disabled())

		return -ENODEV;



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res) {

		dev_dbg(&pdev->dev, "no IRQ specified\n");

		return -ENODEV;

	}

	irq = res->start;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_dbg(&pdev->dev, "no base address specified\n");

		return -ENODEV;

	}



	hcd = usb_create_hcd(&ehci_ath79_hc_driver, &pdev->dev,

			     dev_name(&pdev->dev));

	if (!hcd)

		return -ENOMEM;



	hcd->rsrc_start	= res->start;

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



	if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {

		dev_dbg(&pdev->dev, "controller already in use\n");

		ret = -EBUSY;

		goto err_put_hcd;

	}



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

	if (!hcd->regs) {

		dev_dbg(&pdev->dev, "error mapping memory\n");

		ret = -EFAULT;

		goto err_release_region;

	}



	ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);

	if (ret)

		goto err_iounmap;



	return 0;



err_iounmap:

	iounmap(hcd->regs);



err_release_region:

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

err_put_hcd:

	usb_put_hcd(hcd);

	return ret;

}



static int ehci_ath79_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);

	usb_put_hcd(hcd);



	return 0;

}



static struct platform_driver ehci_ath79_driver = {

	.probe		= ehci_ath79_probe,

	.remove		= ehci_ath79_remove,

	.id_table	= ehci_ath79_id_table,

	.driver = {

		.owner	= THIS_MODULE,

		.name	= "ath79-ehci",

	}

};



MODULE_ALIAS(PLATFORM_MODULE_PREFIX "ath79-ehci");

drivers/usb/host/ehci-hcd.c

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

#endif



#ifdef CONFIG_USB_EHCI_ATH79

#include "ehci-ath79.c"

#define PLATFORM_DRIVER		ehci_ath79_driver

#endif



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

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

    !defined(XILINX_OF_PLATFORM_DRIVER)