1 files changed, 155 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/usb-ehci.c b/arch/arm/mach-omap2/usb-ehci.c
index ee9f548d5d81..c68f799e83c5 100644
--- a/arch/arm/mach-omap2/usb-ehci.c
+++ b/arch/arm/mach-omap2/usb-ehci.c
@@ -236,3 +236,158 @@ void __init usb_ehci_init(const struct ehci_hcd_omap_platform_data *pdata)
 #endif /* CONFIG_USB_EHCI_HCD */
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
+static struct resource ohci_resources[] = {
+        {
+                .start  = OMAP34XX_OHCI_BASE,
+                .end    = OMAP34XX_OHCI_BASE + SZ_1K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = OMAP34XX_UHH_CONFIG_BASE,
+                .end    = OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = OMAP34XX_USBTLL_BASE,
+                .end    = OMAP34XX_USBTLL_BASE + SZ_4K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {       /* general IRQ */
+                .start  = INT_34XX_OHCI_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+static u64 ohci_dmamask = DMA_BIT_MASK(32);
+static struct platform_device ohci_device = {
+        .name           = "ohci-omap3",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = &ohci_dmamask,
+                .coherent_dma_mask      = 0xffffffff,
+        },
+        .num_resources  = ARRAY_SIZE(ohci_resources),
+        .resource       = ohci_resources,
+};
+static void setup_ohci_io_mux(const enum ohci_omap3_port_mode *port_mode)
+{
+        switch (port_mode[0]) {
+        case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
+        case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
+                omap_mux_init_signal("mm1_rxdp",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                omap_mux_init_signal("mm1_rxdm",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                /* FALLTHROUGH */
+        case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
+        case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
+                omap_mux_init_signal("mm1_rxrcv",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                /* FALLTHROUGH */
+        case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
+                omap_mux_init_signal("mm1_txen_n", OMAP_PIN_OUTPUT);
+                /* FALLTHROUGH */
+        case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
+                omap_mux_init_signal("mm1_txse0",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                omap_mux_init_signal("mm1_txdat",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                break;
+        case OMAP_OHCI_PORT_MODE_UNUSED:
+                /* FALLTHROUGH */
+        default:
+                break;
+        }
+        switch (port_mode[1]) {
+        case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
+        case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
+                omap_mux_init_signal("mm2_rxdp",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                omap_mux_init_signal("mm2_rxdm",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                /* FALLTHROUGH */
+        case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
+        case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
+                omap_mux_init_signal("mm2_rxrcv",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                /* FALLTHROUGH */
+        case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
+                omap_mux_init_signal("mm2_txen_n", OMAP_PIN_OUTPUT);
+                /* FALLTHROUGH */
+        case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
+                omap_mux_init_signal("mm2_txse0",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                omap_mux_init_signal("mm2_txdat",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                break;
+        case OMAP_OHCI_PORT_MODE_UNUSED:
+                /* FALLTHROUGH */
+        default:
+                break;
+        }
+        switch (port_mode[2]) {
+        case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
+        case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
+                omap_mux_init_signal("mm3_rxdp",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                omap_mux_init_signal("mm3_rxdm",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                /* FALLTHROUGH */
+        case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
+        case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
+                omap_mux_init_signal("mm3_rxrcv",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                /* FALLTHROUGH */
+        case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
+                omap_mux_init_signal("mm3_txen_n", OMAP_PIN_OUTPUT);
+                /* FALLTHROUGH */
+        case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
+        case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
+                omap_mux_init_signal("mm3_txse0",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                omap_mux_init_signal("mm3_txdat",
+                        OMAP_PIN_INPUT_PULLDOWN);
+                break;
+        case OMAP_OHCI_PORT_MODE_UNUSED:
+                /* FALLTHROUGH */
+        default:
+                break;
+        }
+}
+void __init usb_ohci_init(const struct ohci_hcd_omap_platform_data *pdata)
+{
+        platform_device_add_data(&ohci_device, pdata, sizeof(*pdata));
+        /* Setup Pin IO MUX for OHCI */
+        if (cpu_is_omap34xx())
+                setup_ohci_io_mux(pdata->port_mode);
+        if (platform_device_register(&ohci_device) < 0) {
+                pr_err("Unable to register FS-USB (OHCI) device\n");
+                return;
+        }
+}
+#else
+void __init usb_ohci_init(const struct ohci_hcd_omap_platform_data *pdata)
+{
+}
+#endif /* CONFIG_USB_OHCI_HCD */

diff --git a/arch/arm/mach-omap2/usb-ehci.c b/arch/arm/mach-omap2/usb-ehci.c index ee9f548d5d81..c68f799e83c5 100644 --- a/arch/arm/mach-omap2/usb-ehci.c +++ b/arch/arm/mach-omap2/usb-ehci.c
@@ -236,3 +236,158 @@ void __init usb_ehci_init(const struct ehci_hcd_omap_platform_data *pdata)
236		236
237	#endif /* CONFIG_USB_EHCI_HCD */	237	#endif /* CONFIG_USB_EHCI_HCD */
238		238
		239	#if defined(CONFIG_USB_OHCI_HCD) \|\| defined(CONFIG_USB_OHCI_HCD_MODULE)
		240
		241	static struct resource ohci_resources[] = {
		242	{
		243	.start = OMAP34XX_OHCI_BASE,
		244	.end = OMAP34XX_OHCI_BASE + SZ_1K - 1,
		245	.flags = IORESOURCE_MEM,
		246	},
		247	{
		248	.start = OMAP34XX_UHH_CONFIG_BASE,
		249	.end = OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1,
		250	.flags = IORESOURCE_MEM,
		251	},
		252	{
		253	.start = OMAP34XX_USBTLL_BASE,
		254	.end = OMAP34XX_USBTLL_BASE + SZ_4K - 1,
		255	.flags = IORESOURCE_MEM,
		256	},
		257	{ /* general IRQ */
		258	.start = INT_34XX_OHCI_IRQ,
		259	.flags = IORESOURCE_IRQ,
		260	}
		261	};
		262
		263	static u64 ohci_dmamask = DMA_BIT_MASK(32);
		264
		265	static struct platform_device ohci_device = {
		266	.name = "ohci-omap3",
		267	.id = 0,
		268	.dev = {
		269	.dma_mask = &ohci_dmamask,
		270	.coherent_dma_mask = 0xffffffff,
		271	},
		272	.num_resources = ARRAY_SIZE(ohci_resources),
		273	.resource = ohci_resources,
		274	};
		275
		276	static void setup_ohci_io_mux(const enum ohci_omap3_port_mode *port_mode)
		277	{
		278	switch (port_mode[0]) {
		279	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
		280	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
		281	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
		282	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
		283	omap_mux_init_signal("mm1_rxdp",
		284	OMAP_PIN_INPUT_PULLDOWN);
		285	omap_mux_init_signal("mm1_rxdm",
		286	OMAP_PIN_INPUT_PULLDOWN);
		287	/* FALLTHROUGH */
		288	case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
		289	case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
		290	omap_mux_init_signal("mm1_rxrcv",
		291	OMAP_PIN_INPUT_PULLDOWN);
		292	/* FALLTHROUGH */
		293	case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
		294	case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
		295	omap_mux_init_signal("mm1_txen_n", OMAP_PIN_OUTPUT);
		296	/* FALLTHROUGH */
		297	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
		298	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
		299	omap_mux_init_signal("mm1_txse0",
		300	OMAP_PIN_INPUT_PULLDOWN);
		301	omap_mux_init_signal("mm1_txdat",
		302	OMAP_PIN_INPUT_PULLDOWN);
		303	break;
		304	case OMAP_OHCI_PORT_MODE_UNUSED:
		305	/* FALLTHROUGH */
		306	default:
		307	break;
		308	}
		309	switch (port_mode[1]) {
		310	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
		311	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
		312	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
		313	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
		314	omap_mux_init_signal("mm2_rxdp",
		315	OMAP_PIN_INPUT_PULLDOWN);
		316	omap_mux_init_signal("mm2_rxdm",
		317	OMAP_PIN_INPUT_PULLDOWN);
		318	/* FALLTHROUGH */
		319	case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
		320	case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
		321	omap_mux_init_signal("mm2_rxrcv",
		322	OMAP_PIN_INPUT_PULLDOWN);
		323	/* FALLTHROUGH */
		324	case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
		325	case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
		326	omap_mux_init_signal("mm2_txen_n", OMAP_PIN_OUTPUT);
		327	/* FALLTHROUGH */
		328	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
		329	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
		330	omap_mux_init_signal("mm2_txse0",
		331	OMAP_PIN_INPUT_PULLDOWN);
		332	omap_mux_init_signal("mm2_txdat",
		333	OMAP_PIN_INPUT_PULLDOWN);
		334	break;
		335	case OMAP_OHCI_PORT_MODE_UNUSED:
		336	/* FALLTHROUGH */
		337	default:
		338	break;
		339	}
		340	switch (port_mode[2]) {
		341	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0:
		342	case OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM:
		343	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0:
		344	case OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM:
		345	omap_mux_init_signal("mm3_rxdp",
		346	OMAP_PIN_INPUT_PULLDOWN);
		347	omap_mux_init_signal("mm3_rxdm",
		348	OMAP_PIN_INPUT_PULLDOWN);
		349	/* FALLTHROUGH */
		350	case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
		351	case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
		352	omap_mux_init_signal("mm3_rxrcv",
		353	OMAP_PIN_INPUT_PULLDOWN);
		354	/* FALLTHROUGH */
		355	case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
		356	case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
		357	omap_mux_init_signal("mm3_txen_n", OMAP_PIN_OUTPUT);
		358	/* FALLTHROUGH */
		359	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
		360	case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
		361	omap_mux_init_signal("mm3_txse0",
		362	OMAP_PIN_INPUT_PULLDOWN);
		363	omap_mux_init_signal("mm3_txdat",
		364	OMAP_PIN_INPUT_PULLDOWN);
		365	break;
		366	case OMAP_OHCI_PORT_MODE_UNUSED:
		367	/* FALLTHROUGH */
		368	default:
		369	break;
		370	}
		371	}
		372
		373	void __init usb_ohci_init(const struct ohci_hcd_omap_platform_data *pdata)
		374	{
		375	platform_device_add_data(&ohci_device, pdata, sizeof(*pdata));
		376
		377	/* Setup Pin IO MUX for OHCI */
		378	if (cpu_is_omap34xx())
		379	setup_ohci_io_mux(pdata->port_mode);
		380
		381	if (platform_device_register(&ohci_device) < 0) {
		382	pr_err("Unable to register FS-USB (OHCI) device\n");
		383	return;
		384	}
		385	}
		386
		387	#else
		388
		389	void __init usb_ohci_init(const struct ohci_hcd_omap_platform_data *pdata)
		390	{
		391	}
		392
		393	#endif /* CONFIG_USB_OHCI_HCD */