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

Commit dba63b2f authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: EHCI: fix build error in ehci-mxc 



This patch (as1643b) fixes a build error in ehci-hcd when compiling for
ARM with allmodconfig:

drivers/usb/host/ehci-hcd.c:1285:0: warning: "PLATFORM_DRIVER" redefined [enabled by default]
drivers/usb/host/ehci-hcd.c:1255:0: note: this is the location of the previous definition
drivers/usb/host/ehci-mxc.c:280:31: warning: 'ehci_mxc_driver' defined but not used [-Wunused-variable]
drivers/usb/host/ehci-hcd.c:1285:0: warning: "PLATFORM_DRIVER" redefined [enabled by default]
drivers/usb/host/ehci-hcd.c:1255:0: note: this is the location of the previous definition

The fix is to convert ehci-mxc over to the new "ehci-hcd is a library"
scheme so that it can coexist peacefully with the ehci-platform
driver.  As part of the conversion the ehci_mxc_priv data structure,
which was allocated dynamically, is now placed where it belongs: in
the private area at the end of struct ehci_hcd.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Tested-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9debc179

drivers/usb/host/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -148,7 +148,7 @@ config USB_EHCI_FSL 
	  Variation of ARC USB block used in some Freescale chips.

	  Variation of ARC USB block used in some Freescale chips.





config USB_EHCI_MXC

config USB_EHCI_MXC

	bool "Support for Freescale i.MX on-chip EHCI USB controller"

	tristate "Support for Freescale i.MX on-chip EHCI USB controller"

	depends on USB_EHCI_HCD && ARCH_MXC

	depends on USB_EHCI_HCD && ARCH_MXC

	select USB_EHCI_ROOT_HUB_TT

	select USB_EHCI_ROOT_HUB_TT

	---help---

	---help---

drivers/usb/host/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ obj-$(CONFIG_PCI) += pci-quirks.o 
obj-$(CONFIG_USB_EHCI_HCD)	+= ehci-hcd.o

obj-$(CONFIG_USB_EHCI_HCD)	+= ehci-hcd.o

obj-$(CONFIG_USB_EHCI_PCI)	+= ehci-pci.o

obj-$(CONFIG_USB_EHCI_PCI)	+= ehci-pci.o

obj-$(CONFIG_USB_EHCI_HCD_PLATFORM)	+= ehci-platform.o

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_OXU210HP_HCD)	+= oxu210hp-hcd.o

obj-$(CONFIG_USB_ISP116X_HCD)	+= isp116x-hcd.o

obj-$(CONFIG_USB_ISP116X_HCD)	+= isp116x-hcd.o

drivers/usb/host/ehci-hcd.c

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

#define	PLATFORM_DRIVER		ehci_fsl_driver

#endif

#endif





#ifdef CONFIG_USB_EHCI_MXC

#include "ehci-mxc.c"

#define PLATFORM_DRIVER		ehci_mxc_driver

#endif



#ifdef CONFIG_USB_EHCI_SH

#ifdef CONFIG_USB_EHCI_SH

#include "ehci-sh.c"

#include "ehci-sh.c"

#define PLATFORM_DRIVER		ehci_hcd_sh_driver

#define PLATFORM_DRIVER		ehci_hcd_sh_driver
@@ -1349,6 +1344,7 @@ MODULE_LICENSE ("GPL"); 
#if !IS_ENABLED(CONFIG_USB_EHCI_PCI) && \

#if !IS_ENABLED(CONFIG_USB_EHCI_PCI) && \

	!IS_ENABLED(CONFIG_USB_EHCI_HCD_PLATFORM) && \

	!IS_ENABLED(CONFIG_USB_EHCI_HCD_PLATFORM) && \

	!IS_ENABLED(CONFIG_USB_CHIPIDEA_HOST) && \

	!IS_ENABLED(CONFIG_USB_CHIPIDEA_HOST) && \

	!IS_ENABLED(CONFIG_USB_EHCI_MXC) && \

	!defined(PLATFORM_DRIVER) && \

	!defined(PLATFORM_DRIVER) && \

	!defined(PS3_SYSTEM_BUS_DRIVER) && \

	!defined(PS3_SYSTEM_BUS_DRIVER) && \

	!defined(OF_PLATFORM_DRIVER) && \

	!defined(OF_PLATFORM_DRIVER) && \

drivers/usb/host/ehci-mxc.c

+50 −70
Original line number Original line Diff line number Diff line
@@ -17,75 +17,38 @@ 
 * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 * Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */

 */





#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/io.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/clk.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/usb/otg.h>

#include <linux/usb/otg.h>

#include <linux/usb/ulpi.h>

#include <linux/usb/ulpi.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/usb.h>

#include <linux/usb/hcd.h>





#include <linux/platform_data/usb-ehci-mxc.h>

#include <linux/platform_data/usb-ehci-mxc.h>





#include <asm/mach-types.h>

#include <asm/mach-types.h>





#include "ehci.h"



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



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



#define ULPI_VIEWPORT_OFFSET	0x170

#define ULPI_VIEWPORT_OFFSET	0x170





struct ehci_mxc_priv {

struct ehci_mxc_priv {

	struct clk *usbclk, *ahbclk, *phyclk;

	struct clk *usbclk, *ahbclk, *phyclk;

	struct usb_hcd *hcd;

};

};





/* called during probe() after chip reset completes */

static struct hc_driver __read_mostly ehci_mxc_hc_driver;

static int ehci_mxc_setup(struct usb_hcd *hcd)

{

	hcd->has_tt = 1;



	return ehci_setup(hcd);

}



static const struct hc_driver ehci_mxc_hc_driver = {

	.description = hcd_name,

	.product_desc = "Freescale On-Chip EHCI Host Controller",

	.hcd_priv_size = sizeof(struct ehci_hcd),



	/*

	 * generic hardware linkage

	 */

	.irq = ehci_irq,

	.flags = HCD_USB2 | HCD_MEMORY,



	/*

	 * basic lifecycle operations

	 */

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





	/*

static const struct ehci_driver_overrides ehci_mxc_overrides __initdata = {

	 * root hub support

	.extra_priv_size =	sizeof(struct ehci_mxc_priv),

	 */

	.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 int ehci_mxc_drv_probe(struct platform_device *pdev)

static int ehci_mxc_drv_probe(struct platform_device *pdev)
@@ -112,12 +75,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) 
	if (!hcd)

	if (!hcd)

		return -ENOMEM;

		return -ENOMEM;





	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);

	if (!priv) {

		ret = -ENOMEM;

		goto err_alloc;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

	if (!res) {

		dev_err(dev, "Found HC with no register addr. Check setup!\n");

		dev_err(dev, "Found HC with no register addr. Check setup!\n");
@@ -135,6 +92,10 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) 
		goto err_alloc;

		goto err_alloc;

	}

	}





	hcd->has_tt = 1;

	ehci = hcd_to_ehci(hcd);

	priv = (struct ehci_mxc_priv *) ehci->priv;



	/* enable clocks */

	/* enable clocks */

	priv->usbclk = devm_clk_get(&pdev->dev, "ipg");

	priv->usbclk = devm_clk_get(&pdev->dev, "ipg");

	if (IS_ERR(priv->usbclk)) {

	if (IS_ERR(priv->usbclk)) {
@@ -169,8 +130,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) 
		mdelay(10);

		mdelay(10);

	}

	}





	ehci = hcd_to_ehci(hcd);



	/* EHCI registers start at offset 0x100 */

	/* EHCI registers start at offset 0x100 */

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

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

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

	ehci->regs = hcd->regs + 0x100 +
@@ -198,8 +157,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) 
		}

		}

	}

	}





	priv->hcd = hcd;

	platform_set_drvdata(pdev, hcd);

	platform_set_drvdata(pdev, priv);





	ret = usb_add_hcd(hcd, irq, IRQF_SHARED);

	ret = usb_add_hcd(hcd, irq, IRQF_SHARED);

	if (ret)

	if (ret)
@@ -244,8 +202,11 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev) 
static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)

static int __exit ehci_mxc_drv_remove(struct platform_device *pdev)

{

{

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

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

	struct ehci_mxc_priv *priv = platform_get_drvdata(pdev);

	struct usb_hcd *hcd = platform_get_drvdata(pdev);

	struct usb_hcd *hcd = priv->hcd;

	struct ehci_hcd *ehci = hcd_to_ehci(hcd);

	struct ehci_mxc_priv *priv = (struct ehci_mxc_priv *) ehci->priv;



	usb_remove_hcd(hcd);





	if (pdata && pdata->exit)

	if (pdata && pdata->exit)

		pdata->exit(pdev);

		pdata->exit(pdev);
@@ -253,23 +214,20 @@ static int __exit ehci_mxc_drv_remove(struct platform_device *pdev) 
	if (pdata->otg)

	if (pdata->otg)

		usb_phy_shutdown(pdata->otg);

		usb_phy_shutdown(pdata->otg);





	usb_remove_hcd(hcd);

	usb_put_hcd(hcd);

	platform_set_drvdata(pdev, NULL);



	clk_disable_unprepare(priv->usbclk);

	clk_disable_unprepare(priv->usbclk);

	clk_disable_unprepare(priv->ahbclk);

	clk_disable_unprepare(priv->ahbclk);





	if (priv->phyclk)

	if (priv->phyclk)

		clk_disable_unprepare(priv->phyclk);

		clk_disable_unprepare(priv->phyclk);





	usb_put_hcd(hcd);

	platform_set_drvdata(pdev, NULL);

	return 0;

	return 0;

}

}





static void ehci_mxc_drv_shutdown(struct platform_device *pdev)

static void ehci_mxc_drv_shutdown(struct platform_device *pdev)

{

{

	struct ehci_mxc_priv *priv = platform_get_drvdata(pdev);

	struct usb_hcd *hcd = platform_get_drvdata(pdev);

	struct usb_hcd *hcd = priv->hcd;





	if (hcd->driver->shutdown)

	if (hcd->driver->shutdown)

		hcd->driver->shutdown(hcd);

		hcd->driver->shutdown(hcd);
@@ -279,9 +237,31 @@ MODULE_ALIAS("platform:mxc-ehci"); 




static struct platform_driver ehci_mxc_driver = {

static struct platform_driver ehci_mxc_driver = {

	.probe = ehci_mxc_drv_probe,

	.probe = ehci_mxc_drv_probe,

	.remove = __exit_p(ehci_mxc_drv_remove),

	.remove = ehci_mxc_drv_remove,

	.shutdown = ehci_mxc_drv_shutdown,

	.shutdown = ehci_mxc_drv_shutdown,

	.driver = {

	.driver = {

		   .name = "mxc-ehci",

		   .name = "mxc-ehci",

	},

	},

};

};



static int __init ehci_mxc_init(void)

{

	if (usb_disabled())

		return -ENODEV;



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



	ehci_init_driver(&ehci_mxc_hc_driver, &ehci_mxc_overrides);

	return platform_driver_register(&ehci_mxc_driver);

}

module_init(ehci_mxc_init);



static void __exit ehci_mxc_cleanup(void)

{

	platform_driver_unregister(&ehci_mxc_driver);

}

module_exit(ehci_mxc_cleanup);



MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_AUTHOR("Sascha Hauer");

MODULE_LICENSE("GPL");