On 23:04 Thu 07 Feb , manjunath.goudar@xxxxxxxxxx wrote:
> From: Manjunath Goudar <manjunath.goudar@xxxxxxxxxx>
>
> Separate the Atmel host controller driver from ehci-hcd host code
> into its own driver module.
>
> Signed-off-by: Manjunath Goudar <manjunath.goudar@xxxxxxxxxx>
> Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> Cc: Greg KH <greg@xxxxxxxxx>
> Cc: Grant Likely <grant.likely@xxxxxxxxxxxx>
> Cc: Rob Herring <rob.herring@xxxxxxxxxxx>
> Cc: Andrew Victor <linux@xxxxxxxxxxxx>
> Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@xxxxxxxxxxxx>
> Cc: linux-usb@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
Best Regards,
J.
> ---
> drivers/usb/host/Kconfig | 7 ++++
> drivers/usb/host/Makefile | 1 +
> drivers/usb/host/ehci-atmel.c | 78 ++++++++++++++++++++++-------------------
> drivers/usb/host/ehci-hcd.c | 6 +---
> 4 files changed, 51 insertions(+), 41 deletions(-)
>
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index 3689b7b..5a13f9d 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -176,6 +176,13 @@ config USB_EHCI_HCD_ORION
> ---help---
> Enables support for the on-chip EHCI controller on
> Morvell Orion chips.
> +config USB_EHCI_HCD_AT91
> + tristate "Support for Atmel on-chip EHCI USB controller"
> + depends on USB_EHCI_HCD && ARCH_AT91
> + default y
> + ---help---
> + Enables support for the on-chip EHCI controller on
> + Atmel chips.
>
> config USB_EHCI_MSM
> bool "Support for MSM on-chip EHCI USB controller"
> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> index 23b07dd..96b4839 100644
> --- a/drivers/usb/host/Makefile
> +++ b/drivers/usb/host/Makefile
> @@ -31,6 +31,7 @@ obj-$(CONFIG_USB_EHCI_HCD_OMAP) += ehci-omap.o
> obj-$(CONFIG_USB_EHCI_HCD_SPEAR)+= ehci-spear.o
> obj-$(CONFIG_USB_EHCI_HCD_ORION)+= ehci-orion.o
> obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o
> +obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o
> obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
> obj-$(CONFIG_USB_ISP1362_HCD) += isp1362-hcd.o
> obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o
> diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
> index 27639487..2f06711 100644
> --- a/drivers/usb/host/ehci-atmel.c
> +++ b/drivers/usb/host/ehci-atmel.c
> @@ -15,6 +15,19 @@
> #include <linux/platform_device.h>
> #include <linux/of.h>
> #include <linux/of_platform.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/usb.h>
> +#include <linux/usb/hcd.h>
> +#include <linux/io.h>
> +#include <linux/dma-mapping.h>
> +
> +#include "ehci.h"
> +
> +#define DRIVER_DESC "EHCI atmel driver"
> +
> +static const char hcd_name[] = "ehci-atmel";
> +static struct hc_driver __read_mostly ehci_atmel_hc_driver;
>
> /* interface and function clocks */
> static struct clk *iclk, *fclk;
> @@ -60,41 +73,6 @@ static int ehci_atmel_setup(struct usb_hcd *hcd)
> return ehci_setup(hcd);
> }
>
> -static const struct hc_driver ehci_atmel_hc_driver = {
> - .description = hcd_name,
> - .product_desc = "Atmel EHCI UHP HS",
> - .hcd_priv_size = sizeof(struct ehci_hcd),
> -
> - /* generic hardware linkage */
> - .irq = ehci_irq,
> - .flags = HCD_MEMORY | HCD_USB2,
> -
> - /* basic lifecycle operations */
> - .reset = ehci_atmel_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,
> - .endpoint_reset = ehci_endpoint_reset,
> -
> - /* 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,
> -
> - .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
> -};
> -
> static u64 at91_ehci_dma_mask = DMA_BIT_MASK(32);
>
> static int ehci_atmel_drv_probe(struct platform_device *pdev)
> @@ -210,7 +188,35 @@ static struct platform_driver ehci_atmel_driver = {
> .remove = ehci_atmel_drv_remove,
> .shutdown = usb_hcd_platform_shutdown,
> .driver = {
> - .name = "atmel-ehci",
> + .name = hcd_name,
> .of_match_table = of_match_ptr(atmel_ehci_dt_ids),
> },
> };
> +
> +static const struct ehci_driver_overrides atmel_overrides __initdata = {
> + .reset = ehci_atmel_setup,
> +};
> +
> +static int __init ehci_atmel_init(void)
> +{
> + if (usb_disabled())
> + return -ENODEV;
> +
> + pr_info("%s: " DRIVER_DESC "\n", hcd_name);
> + ehci_init_driver(&ehci_atmel_hc_driver, &atmel_overrides);
> + return platform_driver_register(&ehci_atmel_driver);
> +}
> +module_init(ehci_atmel_init);
> +
> +static void __exit ehci_atmel_cleanup(void)
> +{
> + platform_driver_unregister(&ehci_atmel_driver);
> +}
> +module_exit(ehci_atmel_cleanup);
> +
> +MODULE_DESCRIPTION(DRIVER_DESC);
> +
> +MODULE_ALIAS("platform:ehci-atmel");
> +MODULE_AUTHOR("Nicolas Ferre");
> +MODULE_LICENSE("GPL");
> +
> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
> index 5a19a57..628ed139 100644
> --- a/drivers/usb/host/ehci-hcd.c
> +++ b/drivers/usb/host/ehci-hcd.c
> @@ -1272,11 +1272,6 @@ MODULE_LICENSE ("GPL");
> #define PLATFORM_DRIVER ehci_hcd_w90x900_driver
> #endif
>
> -#ifdef CONFIG_ARCH_AT91
> -#include "ehci-atmel.c"
> -#define PLATFORM_DRIVER ehci_atmel_driver
> -#endif
> -
> #ifdef CONFIG_USB_OCTEON_EHCI
> #include "ehci-octeon.c"
> #define PLATFORM_DRIVER ehci_octeon_driver
> @@ -1334,6 +1329,7 @@ MODULE_LICENSE ("GPL");
> !defined(PLATFORM_DRIVER) && \
> !IS_ENABLED(CONFIG_USB_EHCI_HCD_OMAP) && \
> !IS_ENABLED(CONFIG_PLAT_SPEAR) && \
> + !IS_ENABLED(CONFIG_ARCH_AT91) && \
> !defined(PS3_SYSTEM_BUS_DRIVER) && \
> !defined(OF_PLATFORM_DRIVER) && \
> !defined(XILINX_OF_PLATFORM_DRIVER)
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
