Merge tag 'omap-for-v3.11/pm-serial-signed' of git://git.kernel.org/pub/scm/linux...

[~andy/linux] / arch / arm / mach-omap2 / usb-host.c

diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index aa27d7f5cbb7a760596337903fd0e61ac22e647b..544c92bf60cca9d81729cb1639818775e6cc753b 100644 (file)
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -188,125 +188,6 @@ static void __init setup_ehci_io_mux(const enum usbhs_omap_port_mode *port_mode)
        return;
 }
 
-static
-void __init setup_4430ehci_io_mux(const enum usbhs_omap_port_mode *port_mode)
-{
-       switch (port_mode[0]) {
-       case OMAP_EHCI_PORT_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 OMAP_EHCI_PORT_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 OMAP_USBHS_PORT_MODE_UNUSED:
-       default:
-                       break;
-       }
-       switch (port_mode[1]) {
-       case OMAP_EHCI_PORT_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 OMAP_EHCI_PORT_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 OMAP_USBHS_PORT_MODE_UNUSED:
-       default:
-                       break;
-       }
-}
-
 static void __init setup_ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)
 {
        switch (port_mode[0]) {
@@ -404,78 +285,6 @@ static void __init setup_ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)
        }
 }
 
-static
-void __init setup_4430ohci_io_mux(const enum usbhs_omap_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("usbb1_mm_rxdp",
-                       OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usbb1_mm_rxdm",
-                       OMAP_PIN_INPUT_PULLDOWN);
-
-       case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
-       case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
-               omap_mux_init_signal("usbb1_mm_rxrcv",
-                       OMAP_PIN_INPUT_PULLDOWN);
-
-       case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
-       case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
-               omap_mux_init_signal("usbb1_mm_txen",
-                       OMAP_PIN_INPUT_PULLDOWN);
-
-
-       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
-       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
-               omap_mux_init_signal("usbb1_mm_txdat",
-                       OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usbb1_mm_txse0",
-                       OMAP_PIN_INPUT_PULLDOWN);
-               break;
-
-       case OMAP_USBHS_PORT_MODE_UNUSED:
-       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("usbb2_mm_rxdp",
-                       OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usbb2_mm_rxdm",
-                       OMAP_PIN_INPUT_PULLDOWN);
-
-       case OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM:
-       case OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM:
-               omap_mux_init_signal("usbb2_mm_rxrcv",
-                       OMAP_PIN_INPUT_PULLDOWN);
-
-       case OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0:
-       case OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0:
-               omap_mux_init_signal("usbb2_mm_txen",
-                       OMAP_PIN_INPUT_PULLDOWN);
-
-
-       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0:
-       case OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM:
-               omap_mux_init_signal("usbb2_mm_txdat",
-                       OMAP_PIN_INPUT_PULLDOWN);
-               omap_mux_init_signal("usbb2_mm_txse0",
-                       OMAP_PIN_INPUT_PULLDOWN);
-               break;
-
-       case OMAP_USBHS_PORT_MODE_UNUSED:
-       default:
-               break;
-       }
-}
-
 void __init usbhs_init(struct usbhs_omap_platform_data *pdata)
 {
        struct omap_hwmod       *uhh_hwm, *tll_hwm;
@@ -489,9 +298,6 @@ void __init usbhs_init(struct usbhs_omap_platform_data *pdata)
                if (omap_rev() <= OMAP3430_REV_ES2_1)
                        pdata->single_ulpi_bypass = true;
 
-       } else if (cpu_is_omap44xx()) {
-               setup_4430ehci_io_mux(pdata->port_mode);
-               setup_4430ohci_io_mux(pdata->port_mode);
        }
 
        uhh_hwm = omap_hwmod_lookup(USBHS_UHH_HWMODNAME);