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

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

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



This reverts commit 6ed3c43d.

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: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e9a92b2b

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_ORION

        tristate  "Support for Marvell Orion on-chip EHCI USB controller"

        depends on USB_EHCI_HCD && PLAT_ORION

        default y

        ---help---

          Enables support for the on-chip EHCI controller on

          Morvell Orion chips.



config USB_EHCI_HCD_VT8500

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

        depends on USB_EHCI_HCD && ARCH_VT8500

drivers/usb/host/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 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_EHCI_HCD_ORION)+= ehci-orion.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
@@ -1272,6 +1272,11 @@ MODULE_LICENSE ("GPL"); 
#define XILINX_OF_PLATFORM_DRIVER	ehci_hcd_xilinx_of_driver

#endif



#ifdef CONFIG_PLAT_ORION

#include "ehci-orion.c"

#define	PLATFORM_DRIVER		ehci_orion_driver

#endif



#ifdef CONFIG_USB_W90X900_EHCI

#include "ehci-w90x900.c"

#define	PLATFORM_DRIVER		ehci_hcd_w90x900_driver
@@ -1338,7 +1343,6 @@ MODULE_LICENSE ("GPL"); 
	!IS_ENABLED(CONFIG_USB_EHCI_MXC) && \

	!defined(PLATFORM_DRIVER) && \

	!IS_ENABLED(CONFIG_ARCH_VT8500) && \

	!IS_ENABLED(CONFIG_PLAT_ORION) && \

	!defined(PS3_SYSTEM_BUS_DRIVER) && \

	!defined(OF_PLATFORM_DRIVER) && \

	!defined(XILINX_OF_PLATFORM_DRIVER)

drivers/usb/host/ehci-orion.c

+48 −42
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ 
#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/usb.h>

#include <linux/usb/hcd.h>

#include <linux/io.h>

#include <linux/dma-mapping.h>



#include "ehci.h"





#define rdl(off)	__raw_readl(hcd->regs + (off))

#define wrl(off, val)	__raw_writel((val), hcd->regs + (off))
@@ -41,17 +34,6 @@ 
#define USB_PHY_IVREF_CTRL	0x440

#define USB_PHY_TST_GRP_CTRL	0x450



#define DRIVER_DESC "EHCI orion driver"



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



static struct hc_driver __read_mostly ehci_orion_hc_driver;



static const struct ehci_driver_overrides orion_overrides __initdata = {

	.reset = ehci_setup,

};





/*

 * Implement Orion USB controller specification guidelines

 */
@@ -122,6 +104,51 @@ static void orion_usb_phy_v1_setup(struct usb_hcd *hcd) 
	wrl(USB_MODE, 0x13);

}



static const struct hc_driver ehci_orion_hc_driver = {

	.description = hcd_name,

	.product_desc = "Marvell Orion EHCI",

	.hcd_priv_size = sizeof(struct ehci_hcd),



	/*

	 * generic hardware linkage

	 */

	.irq = ehci_irq,

	.flags = HCD_MEMORY | HCD_USB2,



	/*

	 * basic lifecycle operations

	 */

	.reset = ehci_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 void

ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,

			     const struct mbus_dram_target_info *dram)
@@ -296,6 +323,8 @@ static int __exit ehci_orion_drv_remove(struct platform_device *pdev) 
	return 0;

}



MODULE_ALIAS("platform:orion-ehci");



static const struct of_device_id ehci_orion_dt_ids[] = {

	{ .compatible = "marvell,orion-ehci", },

	{},
@@ -307,31 +336,8 @@ static struct platform_driver ehci_orion_driver = { 
	.remove		= __exit_p(ehci_orion_drv_remove),

	.shutdown	= usb_hcd_platform_shutdown,

	.driver = {

		.name	= hcd_name,

		.name	= "orion-ehci",

		.owner  = THIS_MODULE,

		.of_match_table = of_match_ptr(ehci_orion_dt_ids),

	},

};
 


static int __init ehci_orion_init(void)

{

	if (usb_disabled())

		return -ENODEV;



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



	ehci_init_driver(&ehci_orion_hc_driver, &orion_overrides);

	return platform_driver_register(&ehci_orion_driver);

}

module_init(ehci_orion_init);



static void __exit ehci_orion_cleanup(void)

{

	platform_driver_unregister(&ehci_orion_driver);

}

module_exit(ehci_orion_cleanup);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_ALIAS("platform:ehci-orion");

MODULE_AUTHOR("Tzachi Perelstein");

MODULE_LICENSE("GPL");