summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorFrank Li <Frank.Li@freescale.com>2010-03-22 17:47:24 +0800
committerAlejandro Gonzalez <alex.gonzalez@digi.com>2010-05-25 11:20:15 +0200
commit788b2650530fa47852887e1ca494c7b84d9ff175 (patch)
tree9a4a07d21df0789d642d382954ebe2fff373f3a1 /arch
parente651e996cd1700f645ba7c62a4e9d18c9b3b163d (diff)
ENGR00121873 MX28 enable usb otg
USB ID pin have not config. module arcotg_udc.ko should insert after echi_hcd.ko Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-mx28/mx28evk_pins.c12
-rw-r--r--arch/arm/plat-mxs/usb_common.c30
2 files changed, 12 insertions, 30 deletions
diff --git a/arch/arm/mach-mx28/mx28evk_pins.c b/arch/arm/mach-mx28/mx28evk_pins.c
index 2bb8c5826c2f..8f8591dcda02 100644
--- a/arch/arm/mach-mx28/mx28evk_pins.c
+++ b/arch/arm/mach-mx28/mx28evk_pins.c
@@ -93,6 +93,18 @@ static struct pin_desc mx28evk_fixed_pins[] = {
.fun = PIN_GPIO,
.data = 1,
},
+
+#if defined(CONFIG_USB_OTG)
+ {
+ .name = "usb0_id",
+ .id = PINID_AUART1_RTS,
+ .fun = PIN_FUN2,
+ .data = 1,
+ .pull = 1,
+ .pullup = 1,
+ },
+#endif
+
#if defined(CONFIG_CAN_FLEXCAN) || defined(CONFIG_CAN_FLEXCAN_MODULE)
{
.name = "CAN1_TX",
diff --git a/arch/arm/plat-mxs/usb_common.c b/arch/arm/plat-mxs/usb_common.c
index c9a65a0accb2..5d8d0b6d9285 100644
--- a/arch/arm/plat-mxs/usb_common.c
+++ b/arch/arm/plat-mxs/usb_common.c
@@ -107,36 +107,6 @@ EXPORT_SYMBOL(fsl_platform_set_usb_phy_dis);
#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)