1 files changed, 17 insertions, 17 deletions

diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c
index 6021dd00ec75..e54e4bf61cfd 100644
--- a/arch/arm/mach-mx5/board-mx51_babbage.c
+++ b/arch/arm/mach-mx5/board-mx51_babbage.c
@@ -36,7 +36,7 @@
 
 #define BABBAGE_USB_HUB_RESET   IMX_GPIO_NR(1, 7)
 #define BABBAGE_USBH1_STP       IMX_GPIO_NR(1, 27)
-#define BABBAGE_PHY_RESET       IMX_GPIO_NR(2, 5)
+#define BABBAGE_USB_PHY_RESET   IMX_GPIO_NR(2, 5)
 #define BABBAGE_FEC_PHY_RESET   IMX_GPIO_NR(2, 14)
 #define BABBAGE_POWER_KEY       IMX_GPIO_NR(2, 21)
 #define BABBAGE_ECSPI1_CS0      IMX_GPIO_NR(4, 24)
@@ -110,6 +110,9 @@ static iomux_v3_cfg_t mx51babbage_pads[] = {
         /* USB HUB reset line*/
         MX51_PAD_GPIO1_7__GPIO1_7,
 
+        /* USB PHY reset line */
+        MX51_PAD_EIM_D21__GPIO2_5,
+
         /* FEC */
         MX51_PAD_EIM_EB2__FEC_MDIO,
         MX51_PAD_EIM_EB3__FEC_RDATA1,
@@ -169,34 +172,31 @@ static struct imxi2c_platform_data babbage_hsi2c_data = {
         .bitrate = 400000,
 };
 
+static struct gpio mx51_babbage_usbh1_gpios[] = {
+        { BABBAGE_USBH1_STP, GPIOF_OUT_INIT_LOW, "usbh1_stp" },
+        { BABBAGE_USB_PHY_RESET, GPIOF_OUT_INIT_LOW, "usbh1_phy_reset" },
+};
+
 static int gpio_usbh1_active(void)
 {
         iomux_v3_cfg_t usbh1stp_gpio = MX51_PAD_USBH1_STP__GPIO1_27;
-        iomux_v3_cfg_t phyreset_gpio = MX51_PAD_EIM_D21__GPIO2_5;
         int ret;
 
         /* Set USBH1_STP to GPIO and toggle it */
         mxc_iomux_v3_setup_pad(usbh1stp_gpio);
-        ret = gpio_request(BABBAGE_USBH1_STP, "usbh1_stp");
+        ret = gpio_request_array(mx51_babbage_usbh1_gpios,
+                                        ARRAY_SIZE(mx51_babbage_usbh1_gpios));
 
         if (ret) {
-                pr_debug("failed to get MX51_PAD_USBH1_STP__GPIO_1_27: %d\n", ret);
+                pr_debug("failed to get USBH1 pins: %d\n", ret);
                 return ret;
         }
-        gpio_direction_output(BABBAGE_USBH1_STP, 0);
-        gpio_set_value(BABBAGE_USBH1_STP, 1);
-        msleep(100);
-        gpio_free(BABBAGE_USBH1_STP);
-
-        /* De-assert USB PHY RESETB */
-        mxc_iomux_v3_setup_pad(phyreset_gpio);
-        ret = gpio_request(BABBAGE_PHY_RESET, "phy_reset");
 
-        if (ret) {
-                pr_debug("failed to get MX51_PAD_EIM_D21__GPIO_2_5: %d\n", ret);
-                return ret;
-        }
-        gpio_direction_output(BABBAGE_PHY_RESET, 1);
+        msleep(100);
+        gpio_set_value(BABBAGE_USBH1_STP, 1);
+        gpio_set_value(BABBAGE_USB_PHY_RESET, 1);
+        gpio_free_array(mx51_babbage_usbh1_gpios,
+                                        ARRAY_SIZE(mx51_babbage_usbh1_gpios));
         return 0;
 }