ARM: am3517_evm: Fix pin muxing to enable EHCI Host in the future

This patch enables the pinmuxing to support gpio_57 for phy reset
and fixes the pinmuxing for the ECHI tranceiver.  The clocks
don't appear to by fully enabled yet, so OMAP-EHCI on am3517 is
still not yet working, but we're one step closer.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/board/logicpd/am3517evm/am3517evm.h b/board/logicpd/am3517evm/am3517evm.h
index 99a08032e0381afe9d345e17388125f7e91efa60..0e5b8326bac7ffbfce995faf90475fa0fce06215 100644 (file)
--- a/board/logicpd/am3517evm/am3517evm.h
+++ b/board/logicpd/am3517evm/am3517evm.h
@@ -111,7 +111,7 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(GPMC_NCS3),          (IDIS | PTU | EN  | M0)) \
        MUX_VAL(CP(GPMC_NCS4),          (IEN  | PTU | EN  | M0)) \
        MUX_VAL(CP(GPMC_NCS5),          (IDIS | PTU | EN  | M0)) \
-       MUX_VAL(CP(GPMC_NCS6),          (IEN  | PTD | DIS | M0)) \
+       MUX_VAL(CP(GPMC_NCS6),          (IDIS | PTD | DIS | M4)) \
        MUX_VAL(CP(GPMC_NCS7),          (IEN  | PTU | EN  | M0)) \
        MUX_VAL(CP(GPMC_CLK),           (IDIS | PTU | EN  | M0)) \
        MUX_VAL(CP(GPMC_NADV_ALE),      (IDIS | PTD | DIS | M0)) \
@@ -339,18 +339,18 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(JTAG_EMU0),          (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(JTAG_EMU1),          (IEN  | PTD | DIS | M0)) \
        /* ETK (ES2 onwards) */\
-       MUX_VAL(CP(ETK_CLK_ES2),        (IDIS | PTU | EN  | M0)) \
-       MUX_VAL(CP(ETK_CTL_ES2),        (IDIS | PTD | DIS | M0)) \
-       MUX_VAL(CP(ETK_D0_ES2),         (IEN  | PTD | DIS | M0)) \
-       MUX_VAL(CP(ETK_D1_ES2),         (IEN  | PTD | DIS | M0)) \
-       MUX_VAL(CP(ETK_D2_ES2),         (IEN  | PTD | EN  | M0)) \
-       MUX_VAL(CP(ETK_D3_ES2),         (IEN  | PTD | DIS | M0)) \
-       MUX_VAL(CP(ETK_D4_ES2),         (IEN  | PTD | DIS | M0)) \
-       MUX_VAL(CP(ETK_D5_ES2),         (IEN  | PTD | DIS | M0)) \
-       MUX_VAL(CP(ETK_D6_ES2),         (IEN  | PTD | DIS | M0)) \
-       MUX_VAL(CP(ETK_D7_ES2),         (IEN  | PTD | DIS | M0)) \
-       MUX_VAL(CP(ETK_D8_ES2),         (IEN  | PTD | DIS | M0)) \
-       MUX_VAL(CP(ETK_D9_ES2),         (IEN  | PTD | DIS | M0)) \
+       MUX_VAL(CP(ETK_CLK_ES2),        (IDIS | PTU | EN  | M3)) /*HSUSB1_STP*/\
+       MUX_VAL(CP(ETK_CTL_ES2),        (IDIS | PTU | DIS | M3)) /*HSUSB1_CLK*/\
+       MUX_VAL(CP(ETK_D0_ES2),         (IEN  | PTU | DIS | M3)) /*HSUSB1_DATA0*/\
+       MUX_VAL(CP(ETK_D1_ES2),         (IEN  | PTU | DIS | M3)) /*HSUSB1_DATA1*/\
+       MUX_VAL(CP(ETK_D2_ES2),         (IEN  | PTU | DIS | M3)) /*HSUSB1_DATA2*/\
+       MUX_VAL(CP(ETK_D3_ES2),         (IEN  | PTU | DIS | M3)) /*HSUSB1_DATA7*/\
+       MUX_VAL(CP(ETK_D4_ES2),         (IEN  | PTU | DIS | M3)) /*HSUSB1_DATA4*/\
+       MUX_VAL(CP(ETK_D5_ES2),         (IEN  | PTU | DIS | M3)) /*HSUSB1_DATA5*/\
+       MUX_VAL(CP(ETK_D6_ES2),         (IEN  | PTU | DIS | M3)) /*HSUSB1_DATA6*/\
+       MUX_VAL(CP(ETK_D7_ES2),         (IEN  | PTU | DIS | M3)) /*HSUSB1_DATA3*/\
+       MUX_VAL(CP(ETK_D8_ES2),         (IEN  | PTU | DIS | M3)) /*HSUSB1_DIR*/\
+       MUX_VAL(CP(ETK_D9_ES2),         (IEN  | PTU | DIS | M3)) /*HSUSB1_NXT*/\
        MUX_VAL(CP(ETK_D10_ES2),        (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(ETK_D11_ES2),        (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(ETK_D12_ES2),        (IEN  | PTD | DIS | M0)) \

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index e0521abe90396216fcf228fd7291c6ef8417be86..2e8481890fb42e76a664dd921e6e0df86086a115 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -28,6 +28,8 @@
  * Enable CONFIG_USB_MUSB_GADGET for Device functionalities.
  */
 
+#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       57
+
 #ifdef CONFIG_USB_MUSB_AM35X
 
 #ifdef CONFIG_USB_MUSB_HOST