arm: omap4: usb: add platform init code for EHCI

- Add platform init code for EHCI on OMAP4
- Add pad configuration for PHY and TLL modes

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/usb-ehci.c b/arch/arm/mach-omap2/usb-ehci.c
index b11bf385d360485ba1d0b9ecbef4f3d33460a6ea..25eeadabc39b36b5a007f18205bcdb51589acc27 100644 (file)
--- a/arch/arm/mach-omap2/usb-ehci.c
+++ b/arch/arm/mach-omap2/usb-ehci.c
@@ -34,22 +34,15 @@
 
 static struct resource ehci_resources[] = {
        {
-               .start  = OMAP34XX_EHCI_BASE,
-               .end    = OMAP34XX_EHCI_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_EHCI_IRQ,
                .flags   = IORESOURCE_IRQ,
        }
 };
@@ -214,13 +207,148 @@ static void setup_ehci_io_mux(const enum ehci_hcd_omap_mode *port_mode)
        return;
 }
 
+static void setup_4430ehci_io_mux(const enum ehci_hcd_omap_mode *port_mode)
+{
+       switch (port_mode[0]) {
+       case EHCI_HCD_OMAP_MODE_PHY:
+               omap_mux_init_signal("usbb1_ulpiphy_stp",
+                       OMAP_PIN_OUTPUT);
+               omap_mux_init_signal("usbb1_ulpiphy_clk",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpiphy_dir",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpiphy_nxt",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpiphy_dat0",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpiphy_dat1",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpiphy_dat2",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpiphy_dat3",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpiphy_dat4",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpiphy_dat5",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpiphy_dat6",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpiphy_dat7",
+                       OMAP_PIN_INPUT_PULLDOWN);
+                       break;
+       case EHCI_HCD_OMAP_MODE_TLL:
+               omap_mux_init_signal("usbb1_ulpitll_stp",
+                       OMAP_PIN_INPUT_PULLUP);
+               omap_mux_init_signal("usbb1_ulpitll_clk",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpitll_dir",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpitll_nxt",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpitll_dat0",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpitll_dat1",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpitll_dat2",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpitll_dat3",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpitll_dat4",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpitll_dat5",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpitll_dat6",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb1_ulpitll_dat7",
+                       OMAP_PIN_INPUT_PULLDOWN);
+                       break;
+       case EHCI_HCD_OMAP_MODE_UNKNOWN:
+       default:
+                       break;
+       }
+       switch (port_mode[1]) {
+       case EHCI_HCD_OMAP_MODE_PHY:
+               omap_mux_init_signal("usbb2_ulpiphy_stp",
+                       OMAP_PIN_OUTPUT);
+               omap_mux_init_signal("usbb2_ulpiphy_clk",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpiphy_dir",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpiphy_nxt",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpiphy_dat0",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpiphy_dat1",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpiphy_dat2",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpiphy_dat3",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpiphy_dat4",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpiphy_dat5",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpiphy_dat6",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpiphy_dat7",
+                       OMAP_PIN_INPUT_PULLDOWN);
+                       break;
+       case EHCI_HCD_OMAP_MODE_TLL:
+               omap_mux_init_signal("usbb2_ulpitll_stp",
+                       OMAP_PIN_INPUT_PULLUP);
+               omap_mux_init_signal("usbb2_ulpitll_clk",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpitll_dir",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpitll_nxt",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpitll_dat0",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpitll_dat1",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpitll_dat2",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpitll_dat3",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpitll_dat4",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpitll_dat5",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpitll_dat6",
+                       OMAP_PIN_INPUT_PULLDOWN);
+               omap_mux_init_signal("usbb2_ulpitll_dat7",
+                       OMAP_PIN_INPUT_PULLDOWN);
+                       break;
+       case EHCI_HCD_OMAP_MODE_UNKNOWN:
+       default:
+                       break;
+       }
+}
+
 void __init usb_ehci_init(const struct ehci_hcd_omap_platform_data *pdata)
 {
        platform_device_add_data(&ehci_device, pdata, sizeof(*pdata));
 
        /* Setup Pin IO MUX for EHCI */
-       if (cpu_is_omap34xx())
+       if (cpu_is_omap34xx()) {
+               ehci_resources[0].start = OMAP34XX_EHCI_BASE;
+               ehci_resources[0].end   = OMAP34XX_EHCI_BASE + SZ_1K - 1;
+               ehci_resources[1].start = OMAP34XX_UHH_CONFIG_BASE;
+               ehci_resources[1].end   = OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1;
+               ehci_resources[2].start = OMAP34XX_USBTLL_BASE;
+               ehci_resources[2].end   = OMAP34XX_USBTLL_BASE + SZ_4K - 1;
+               ehci_resources[3].start = INT_34XX_EHCI_IRQ;
                setup_ehci_io_mux(pdata->port_mode);
+       } else if (cpu_is_omap44xx()) {
+               ehci_resources[0].start = OMAP44XX_HSUSB_EHCI_BASE;
+               ehci_resources[0].end   = OMAP44XX_HSUSB_EHCI_BASE + SZ_1K - 1;
+               ehci_resources[1].start = OMAP44XX_UHH_CONFIG_BASE;
+               ehci_resources[1].end   = OMAP44XX_UHH_CONFIG_BASE + SZ_2K - 1;
+               ehci_resources[2].start = OMAP44XX_USBTLL_BASE;
+               ehci_resources[2].end   = OMAP44XX_USBTLL_BASE + SZ_4K - 1;
+               ehci_resources[3].start = OMAP44XX_IRQ_EHCI;
+               setup_4430ehci_io_mux(pdata->port_mode);
+       }
 
        if (platform_device_register(&ehci_device) < 0) {
                printk(KERN_ERR "Unable to register HS-USB (EHCI) device\n");