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

Commit 6166805c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "USB: EHCI: make ehci-vt8500 a separate driver" 



This reverts commit d57ada0c.

All of these are wrong and need to be reverted for now.

Cc: Manjunath Goudar <manjunath.goudar@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Prisk <linux@prisktech.co.nz>
Cc: Alexey Charkov <alchark@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 04867125

drivers/usb/host/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -162,14 +162,6 @@ config USB_EHCI_HCD_OMAP 
	  Enables support for the on-chip EHCI controller on

	  OMAP3 and later chips.



config USB_EHCI_HCD_VT8500

        tristate "Support for VT8500 on-chip EHCI USB controller"

        depends on USB_EHCI_HCD && ARCH_VT8500

        default y

        ---help---

          Enables support for the on-chip EHCI controller on

          VT8500 chips.



config USB_EHCI_MSM

	bool "Support for MSM on-chip EHCI USB controller"

	depends on USB_EHCI_HCD && ARCH_MSM

drivers/usb/host/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o 
obj-$(CONFIG_USB_EHCI_MXC)	+= ehci-mxc.o



obj-$(CONFIG_USB_OXU210HP_HCD)	+= oxu210hp-hcd.o

obj-$(CONFIG_USB_EHCI_HCD_VT8500)+= ehci-vt8500.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

drivers/usb/host/ehci-hcd.c

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

#endif



#ifdef CONFIG_ARCH_VT8500

#include "ehci-vt8500.c"

#define	PLATFORM_DRIVER		vt8500_ehci_driver

#endif



#ifdef CONFIG_PLAT_SPEAR

#include "ehci-spear.c"

#define PLATFORM_DRIVER		spear_ehci_hcd_driver
@@ -1342,7 +1347,6 @@ MODULE_LICENSE ("GPL"); 
	!IS_ENABLED(CONFIG_USB_CHIPIDEA_HOST) && \

	!IS_ENABLED(CONFIG_USB_EHCI_MXC) && \

	!defined(PLATFORM_DRIVER) && \

	!IS_ENABLED(CONFIG_ARCH_VT8500) && \

	!defined(PS3_SYSTEM_BUS_DRIVER) && \

	!defined(OF_PLATFORM_DRIVER) && \

	!defined(XILINX_OF_PLATFORM_DRIVER)

drivers/usb/host/ehci-vt8500.c

+40 −33
Original line number Diff line number Diff line
@@ -16,25 +16,52 @@ 
 *

 */



#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 <linux/of.h>

#include <linux/platform_device.h>



#include "ehci.h"

static const struct hc_driver vt8500_ehci_hc_driver = {

	.description		= hcd_name,

	.product_desc		= "VT8500 EHCI",

	.hcd_priv_size		= sizeof(struct ehci_hcd),



#define DRIVER_DESC "vt8500 On-Chip EHCI Host driver"

	/*

	 * generic hardware linkage

	 */

	.irq			= ehci_irq,

	.flags			= HCD_MEMORY | HCD_USB2,



static const char hcd_name[] = "ehci-vt8500";

	/*

	 * basic lifecycle operations

	 */

	.reset			= ehci_setup,

	.start			= ehci_run,

	.stop			= ehci_stop,

	.shutdown		= ehci_shutdown,



static struct hc_driver __read_mostly vt8500_ehci_hc_driver;

	/*

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



static const struct ehci_driver_overrides ehci_vt8500_overrides __initdata = {

	.reset = ehci_setup,

	/*

	 * 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 vt8500_ehci_dma_mask = DMA_BIT_MASK(32);
@@ -113,31 +140,11 @@ static struct platform_driver vt8500_ehci_driver = { 
	.remove		= vt8500_ehci_drv_remove,

	.shutdown	= usb_hcd_platform_shutdown,

	.driver = {

		.name	= hcd_name,

		.name	= "vt8500-ehci",

		.owner	= THIS_MODULE,

		.of_match_table = of_match_ptr(vt8500_ehci_ids),

	}

};



static int __init ehci_vt8500_init(void)

{

	if (usb_disabled())

		return -ENODEV;



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

	ehci_init_driver(&vt8500_ehci_hc_driver, &ehci_vt8500_overrides);

	return platform_driver_register(&vt8500_ehci_driver);

}

module_init(ehci_vt8500_init);



static void __exit ehci_vt8500_cleanup(void)

{

	platform_driver_unregister(&vt8500_ehci_driver);

}

module_exit(ehci_vt8500_cleanup);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_AUTHOR("Alexey Charkov");

MODULE_LICENSE("GPL v2");

MODULE_ALIAS("platform:vt8500-ehci");

MODULE_DEVICE_TABLE(of, vt8500_ehci_ids);