ARM: tegra: Colibri T30: move ASIX reset to pin_mux_usb function

diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c
index 6dc28451c8917b4b020a5191eba2ab6fbdffcdb1..047e78e3aa3b41a3f472d72f294918b4826bdf4c 100644 (file)
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -37,66 +37,16 @@ void pinmux_init(void)
  */
 void pin_mux_usb(void)
 {
-       /*
-       udelay(100 * 1000);
-       printf("pin_mux_usb!!!\n");
+       /* Enable LAN_VBUS */
+       gpio_request(GPIO_PDD2, NULL);
+       gpio_direction_output(GPIO_PDD2, 1);
+
+       /* Reset ASIX using LAN_RESET */
        gpio_request(GPIO_PDD0, NULL);
-       pinmux_tristate_disable(PINGRP_PEX_L0_PRSNT_N);
        gpio_direction_output(GPIO_PDD0, 0);
 
-       udelay(20);
+       udelay(5);
 
        gpio_set_value(GPIO_PDD0, 1);
-       */
-}
-
-#if defined(CONFIG_TEGRA_MMC)
-/*
- * Do I2C/PMU writes to bring up SD card bus power
- *
- */
-void board_sdmmc_voltage_init(void)
-{
-       /*
-       uchar reg, data_buffer[1];
-       int i;
-*/
-//     i2c_set_bus_num(0);     /* PMU is on bus 0 */
-
-       /* TPS659110: LDO5_REG = 3.3v, ACTIVE to SDMMC1 */
-       /*
-       data_buffer[0] = 0x65;
-       reg = 0x32;
-
-       for (i = 0; i < MAX_I2C_RETRY; ++i) {
-               if (i2c_write(PMU_I2C_ADDRESS, reg, 1, data_buffer, 1))
-                       udelay(100);
-       }*/
-
-       /* TPS659110: GPIO7_REG = PDEN, output a 1 to EN_3V3_SYS */
-       /*
-       data_buffer[0] = 0x09;
-       reg = 0x67;
-
-       for (i = 0; i < MAX_I2C_RETRY; ++i) {
-               if (i2c_write(PMU_I2C_ADDRESS, reg, 1, data_buffer, 1))
-                       udelay(100);
-       }
-       */
 }
 
-/*
- * Routine: pin_mux_mmc
- * Description: setup the MMC muxes, power rails, etc.
- */
-void pin_mux_mmc(void)
-{
-       /*
-        * NOTE: We don't do mmc-specific pin muxes here.
-        * They were done globally in pinmux_init().
-        */
-
-       /* Bring up the SDIO1 power rail */
-       board_sdmmc_voltage_init();
-}
-#endif /* MMC */

diff --git a/board/toradex/colibri_t30/pinmux-config-colibri_t30.h b/board/toradex/colibri_t30/pinmux-config-colibri_t30.h
index 6a15a0dfa5a92e0fef01a70d7f5ff0818171e4bd..a87a9a8e1faed5a2f28cb2f0beee6550a7dab260 100644 (file)
--- a/board/toradex/colibri_t30/pinmux-config-colibri_t30.h
+++ b/board/toradex/colibri_t30/pinmux-config-colibri_t30.h
@@ -283,12 +283,12 @@ static struct pingroup_config tegra3_pinmux_common[] = {
        DEFAULT_PINMUX(SPI1_MISO, SPI1, NORMAL, NORMAL, INPUT),
 
        /* LAN_RESET */
-       DEFAULT_PINMUX(PEX_L0_PRSNT_N, PCIE, NORMAL, NORMAL, OUTPUT),
+       DEFAULT_PINMUX(PEX_L0_PRSNT_N, RSVD2, NORMAL, NORMAL, OUTPUT),
 
        DEFAULT_PINMUX(PEX_L0_RST_N, PCIE, NORMAL, NORMAL, OUTPUT),
 
        /* LAN_VBUS */
-       DEFAULT_PINMUX(PEX_L0_CLKREQ_N, RSVD2, NORMAL, NORMAL, INPUT),
+       DEFAULT_PINMUX(PEX_L0_CLKREQ_N, RSVD2, NORMAL, NORMAL, OUTPUT),
 
        DEFAULT_PINMUX(PEX_WAKE_N, PCIE, NORMAL, NORMAL, INPUT),
        DEFAULT_PINMUX(PEX_L1_PRSNT_N, PCIE, NORMAL, NORMAL, INPUT),

diff --git a/board/toradex/dts/tegra30-colibri_t30.dts b/board/toradex/dts/tegra30-colibri_t30.dts
index 4996fb2d78d659612c3a946aef4b1c976e150837..9a88936e88ab98be34410ecbe8915e09c6cb09d9 100644 (file)
--- a/board/toradex/dts/tegra30-colibri_t30.dts
+++ b/board/toradex/dts/tegra30-colibri_t30.dts
@@ -75,8 +75,6 @@
 
        /* Module internal USB for ASIX88772B */
        usb@7d004000 {
-               nvidia,phy-reset-gpio = <&gpio 232 0>;  /* PD0, PEX_L0_PRSNT_N */
-               nvidia,vbus-gpio = <&gpio 234 0>; /* PD2, PEX_L0_CLKREQ_N */
                phy_type = "utmi";
                status = "okay";
        };