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

Commit 928fb68e authored by Manjunath Goudar's avatar Manjunath Goudar Committed by Greg Kroah-Hartman
Browse files

USB: OHCI: make ohci-platform a separate driver 



This patch splits the ohci-platform code from ohci-hcd out
into its own separate driver module.This work is part of enabling
multi-platform kernels on ARM.

In V2:
  -Passed "hcd" argument instead of "ohci" in ohci_setup() because it is
   using "struct usb_hcd" argument.
In V3:
  -Directly passed "hcd" argument not required to call ohci_to_hcd() function.

Signed-off-by: default avatarManjunath Goudar <manjunath.goudar@linaro.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 23735365

drivers/usb/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ config USB_CNS3XXX_OHCI 
	  It is needed for low-speed USB 1.0 device support.



config USB_OHCI_HCD_PLATFORM

	bool "Generic OHCI driver for a platform device"

	tristate "Generic OHCI driver for a platform device"

	default n

	---help---

	  Adds an OHCI host driver for a generic platform device, which

drivers/usb/host/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ obj-$(CONFIG_USB_ISP1362_HCD) += isp1362-hcd.o 


obj-$(CONFIG_USB_OHCI_HCD)	+= ohci-hcd.o

obj-$(CONFIG_USB_OHCI_HCD_PCI)	+= ohci-pci.o

obj-$(CONFIG_USB_OHCI_HCD_PLATFORM)	+= ohci-platform.o



obj-$(CONFIG_USB_UHCI_HCD)	+= uhci-hcd.o

obj-$(CONFIG_USB_FHCI_HCD)	+= fhci.o

drivers/usb/host/ohci-hcd.c

+1 −5
Original line number Diff line number Diff line
@@ -1262,12 +1262,8 @@ MODULE_LICENSE ("GPL"); 
#define PLATFORM_DRIVER		ohci_hcd_tilegx_driver

#endif



#ifdef CONFIG_USB_OHCI_HCD_PLATFORM

#include "ohci-platform.c"

#define PLATFORM_DRIVER		ohci_platform_driver

#endif



#if	!IS_ENABLED(CONFIG_USB_OHCI_HCD_PCI) &&	\

	!IS_ENABLED(CONFIG_USB_OHCI_HCD_PLATFORM) && \

	!defined(PLATFORM_DRIVER) &&	\

	!defined(OMAP1_PLATFORM_DRIVER) &&	\

	!defined(OMAP3_PLATFORM_DRIVER) &&	\

drivers/usb/host/ohci-platform.c

+41 −47
Original line number Diff line number Diff line
@@ -13,16 +13,28 @@ 
 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */



#include <linux/hrtimer.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/err.h>

#include <linux/platform_device.h>

#include <linux/usb/ohci_pdriver.h>

#include <linux/usb.h>

#include <linux/usb/hcd.h>



#include "ohci.h"



#define DRIVER_DESC "OHCI generic platform driver"



static const char hcd_name[] = "ohci-platform";



static int ohci_platform_reset(struct usb_hcd *hcd)

{

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

	struct usb_ohci_pdata *pdata = pdev->dev.platform_data;

	struct ohci_hcd *ohci = hcd_to_ohci(hcd);

	int err;



	if (pdata->big_endian_desc)

		ohci->flags |= OHCI_QUIRK_BE_DESC;
@@ -30,58 +42,17 @@ static int ohci_platform_reset(struct usb_hcd *hcd) 
		ohci->flags |= OHCI_QUIRK_BE_MMIO;

	if (pdata->no_big_frame_no)

		ohci->flags |= OHCI_QUIRK_FRAME_NO;



	ohci_hcd_init(ohci);



	if (pdata->num_ports)

		ohci->num_ports = pdata->num_ports;



	err = ohci_init(ohci);



	return err;

	return ohci_setup(hcd);

}



static int ohci_platform_start(struct usb_hcd *hcd)

{

	struct ohci_hcd *ohci = hcd_to_ohci(hcd);

	int err;



	err = ohci_run(ohci);

	if (err < 0) {

		ohci_err(ohci, "can't start\n");

		ohci_stop(hcd);

	}



	return err;

}



static const struct hc_driver ohci_platform_hc_driver = {

	.description		= hcd_name,

	.product_desc		= "Generic Platform OHCI Controller",

	.hcd_priv_size		= sizeof(struct ohci_hcd),



	.irq			= ohci_irq,

	.flags			= HCD_MEMORY | HCD_USB11,

static struct hc_driver __read_mostly ohci_platform_hc_driver;



static const struct ohci_driver_overrides platform_overrides __initconst = {

	.product_desc =	"Generic Platform OHCI controller",

	.reset =	ohci_platform_reset,

	.start			= ohci_platform_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 ohci_platform_probe(struct platform_device *dev)
@@ -222,3 +193,26 @@ static struct platform_driver ohci_platform_driver = { 
		.pm	= &ohci_platform_pm_ops,

	}

};



static int __init ohci_platform_init(void)

{

	if (usb_disabled())

		return -ENODEV;



	pr_info("%s: " DRIVER_DESC "\n", hcd_name);



	ohci_init_driver(&ohci_platform_hc_driver, &platform_overrides);

	return platform_driver_register(&ohci_platform_driver);

}

module_init(ohci_platform_init);



static void __exit ohci_platform_cleanup(void)

{

	platform_driver_unregister(&ohci_platform_driver);

}

module_exit(ohci_platform_cleanup);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_AUTHOR("Hauke Mehrtens");

MODULE_AUTHOR("Alan Stern");

MODULE_LICENSE("GPL");