mx51evk: Use gpio_direction_input prior to gpio_get_value

[u-boot] / board / freescale / mx51evk / mx51evk.c

diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index e5b0929f65e0b4641373127e5072805f25713436..b505a710543f362b6f94c4f7354a48d5af271344 100644 (file)
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -35,6 +35,7 @@
 #include <pmic.h>
 #include <fsl_pmic.h>
 #include <mc13892.h>
+#include <usb/ehci-fsl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -172,6 +173,65 @@ static void setup_iomux_spi(void)
 }
 #endif
 
+#ifdef CONFIG_USB_EHCI_MX5
+#define MX51EVK_USBH1_HUB_RST  IOMUX_TO_GPIO(MX51_PIN_GPIO1_7) /* GPIO1_7 */
+#define MX51EVK_USBH1_STP      IOMUX_TO_GPIO(MX51_PIN_USBH1_STP) /* GPIO1_27 */
+#define MX51EVK_USB_CLK_EN_B   IOMUX_TO_GPIO(MX51_PIN_EIM_D18) /* GPIO2_1 */
+#define MX51EVK_USB_PHY_RESET  IOMUX_TO_GPIO(MX51_PIN_EIM_D21) /* GPIO2_5 */
+
+#define USBH1_PAD      (PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH |          \
+                        PAD_CTL_100K_PU | PAD_CTL_PUE_PULL |           \
+                        PAD_CTL_PKE_ENABLE | PAD_CTL_HYS_ENABLE)
+#define GPIO_PAD       (PAD_CTL_DRV_HIGH | PAD_CTL_PKE_ENABLE |        \
+                        PAD_CTL_SRE_FAST)
+#define NO_PAD         (1 << 16)
+
+static void setup_usb_h1(void)
+{
+       setup_iomux_usb_h1();
+
+       /* GPIO_1_7 for USBH1 hub reset */
+       mxc_request_iomux(MX51_PIN_GPIO1_7, IOMUX_CONFIG_ALT0);
+       mxc_iomux_set_pad(MX51_PIN_GPIO1_7, NO_PAD);
+
+       /* GPIO_2_1 */
+       mxc_request_iomux(MX51_PIN_EIM_D17, IOMUX_CONFIG_ALT1);
+       mxc_iomux_set_pad(MX51_PIN_EIM_D17, GPIO_PAD);
+
+       /* GPIO_2_5 for USB PHY reset */
+       mxc_request_iomux(MX51_PIN_EIM_D21, IOMUX_CONFIG_ALT1);
+       mxc_iomux_set_pad(MX51_PIN_EIM_D21, GPIO_PAD);
+}
+
+int board_ehci_hcd_init(int port)
+{
+       /* Set USBH1_STP to GPIO and toggle it */
+       mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_GPIO);
+       mxc_iomux_set_pad(MX51_PIN_USBH1_STP, USBH1_PAD);
+
+       gpio_direction_output(MX51EVK_USBH1_STP, 0);
+       gpio_direction_output(MX51EVK_USB_PHY_RESET, 0);
+       mdelay(10);
+       gpio_set_value(MX51EVK_USBH1_STP, 1);
+
+       /* Set back USBH1_STP to be function */
+       mxc_request_iomux(MX51_PIN_USBH1_STP, IOMUX_CONFIG_ALT0);
+       mxc_iomux_set_pad(MX51_PIN_USBH1_STP, USBH1_PAD);
+
+       /* De-assert USB PHY RESETB */
+       gpio_set_value(MX51EVK_USB_PHY_RESET, 1);
+
+       /* Drive USB_CLK_EN_B line low */
+       gpio_direction_output(MX51EVK_USB_CLK_EN_B, 0);
+
+       /* Reset USB hub */
+       gpio_direction_output(MX51EVK_USBH1_HUB_RST, 0);
+       mdelay(2);
+       gpio_set_value(MX51EVK_USBH1_HUB_RST, 1);
+       return 0;
+}
+#endif
+
 static void power_init(void)
 {
        unsigned int val;
@@ -261,19 +321,22 @@ static void power_init(void)
 }
 
 #ifdef CONFIG_FSL_ESDHC
-int board_mmc_getcd(u8 *cd, struct mmc *mmc)
+int board_mmc_getcd(struct mmc *mmc)
 {
        struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
+       int ret;
 
        mxc_request_iomux(MX51_PIN_GPIO1_0, IOMUX_CONFIG_ALT1);
+       gpio_direction_input(0);
        mxc_request_iomux(MX51_PIN_GPIO1_6, IOMUX_CONFIG_ALT0);
+       gpio_direction_input(6);
 
        if (cfg->esdhc_base == MMC_SDHC1_BASE_ADDR)
-               *cd = gpio_get_value(0);
+               ret = !gpio_get_value(0);
        else
-               *cd = gpio_get_value(6);
+               ret = !gpio_get_value(6);
 
-       return 0;
+       return ret;
 }
 
 int board_mmc_init(bd_t *bis)
@@ -394,6 +457,9 @@ int board_early_init_f(void)
 {
        setup_iomux_uart();
        setup_iomux_fec();
+#ifdef CONFIG_USB_EHCI_MX5
+       setup_usb_h1();
+#endif
 
        return 0;
 }