ENGR00120957-2 restructure usb device registration

Clean-up USB related Kconfigs. Remove the transceiver selections as this
is defined by the chip/board and is selected in platform data.
Use usb device resources defined in devices.c and fix resource sharing.
Use common otg transceiver functions.
Remove unnecessary OTG ifdefs.

Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>

2 files changed, 2 insertions, 59 deletions

diff --git a/arch/arm/plat-stmp3xxx/usb.h b/arch/arm/plat-stmp3xxx/usb.h
index 9c617fee6e12..3101f4f0cabe 100644
--- a/arch/arm/plat-stmp3xxx/usb.h
+++ b/arch/arm/plat-stmp3xxx/usb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -24,11 +24,8 @@ static void usb_host_phy_resume(struct fsl_usb2_platform_data *);
  * based on which transceiver is configured.
  * PDATA is a pointer to it.
  */
-#if defined(CONFIG_UTMI_MXC)
 static struct fsl_usb2_platform_data __maybe_unused dr_utmi_config;
 #define PDATA (&dr_utmi_config)
-#endif
-
 
 /*
  * Used to set pdata->operating_mode before registering the platform_device.
diff --git a/arch/arm/plat-stmp3xxx/usb_common.c b/arch/arm/plat-stmp3xxx/usb_common.c
index af4e35d5e95c..5e5687f070c0 100644
--- a/arch/arm/plat-stmp3xxx/usb_common.c
+++ b/arch/arm/plat-stmp3xxx/usb_common.c
@@ -1,8 +1,5 @@
 /*
- * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- *	otg_{get,set}_transceiver() are from arm/plat-omap/usb.c.
- *	which is Copyright (C) 2004 Texas Instruments, Inc.
+ * Copyright (C) 2009-2010 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -85,57 +82,6 @@ void fsl_usb_xcvr_unregister(struct fsl_xcvr_ops *xcvr_ops)
 }
 EXPORT_SYMBOL(fsl_usb_xcvr_unregister);
 
-#if defined(CONFIG_USB_OTG)
-static struct otg_transceiver *xceiv;
-
-/**
- * otg_get_transceiver - find the (single) OTG transceiver driver
- *
- * Returns the transceiver driver, after getting a refcount to it; or
- * null if there is no such transceiver.  The caller is responsible for
- * releasing that count.
- */
-struct otg_transceiver *otg_get_transceiver(void)
-{
-	pr_debug("%s xceiv=0x%p\n", __func__, xceiv);
-	if (xceiv)
-		get_device(xceiv->dev);
-	return xceiv;
-}
-EXPORT_SYMBOL(otg_get_transceiver);
-
-int otg_set_transceiver(struct otg_transceiver *x)
-{
-	pr_debug("%s xceiv=0x%p  x=0x%p\n", __func__, xceiv, x);
-	/*
-	if (x == NULL)
-		stmp3xxx_release_pin_group(&usb_mux_pins, "usb");
-		*/
-	if (xceiv && x)
-		return -EBUSY;
-	xceiv = x;
-	return 0;
-}
-EXPORT_SYMBOL(otg_set_transceiver);
-
-static struct resource *otg_resources;
-
-struct resource *otg_get_resources(void)
-{
-	pr_debug("otg_get_resources\n");
-	return otg_resources;
-}
-EXPORT_SYMBOL(otg_get_resources);
-
-int otg_set_resources(struct resource *resources)
-{
-	//stmp3xxx_request_pin_group(&usb_mux_pins, "usb");
-	otg_resources = resources;
-	return 0;
-}
-EXPORT_SYMBOL(otg_set_resources);
-#endif
-
 static struct fsl_xcvr_ops *fsl_usb_get_xcvr(char *name)
 {
 	int i;