ARM: imx: dh-imx6: Enable DM regulator

Enable DM support for regulators and fixed regulator driver and
convert USB Vbus control over to the regulators defined in DT.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Ludwig Zenz <lzenz@dh-electronics.com>
Cc: Stefano Babic <sbabic@denx.de>
Tested-by: Ludwig Zenz <lzenz@dh-electronics.com>

diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c
index 1d41690c0ca41fe4ae42ed2411a82cef08b7cd57..24141088c992f4ff75a27e4c8ee6fd5999f429aa 100644 (file)
--- a/board/dhelectronics/dh_imx6/dh_imx6.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6.c
@@ -196,7 +196,6 @@ int board_eth_init(bd_t *bis)
 #ifdef CONFIG_USB_EHCI_MX6
 static void setup_usb(void)
 {
-       gpio_request(IMX_GPIO_NR(3, 31), "USB-VBUS");
        /*
         * Set daisy chain for otg_pin_id on MX6Q.
         * For MX6DL, this bit is reserved.
@@ -211,22 +210,6 @@ int board_usb_phy_mode(int port)
        else
                return USB_INIT_DEVICE;
 }
-
-int board_ehci_power(int port, int on)
-{
-       switch (port) {
-       case 0:
-               break;
-       case 1:
-               gpio_direction_output(IMX_GPIO_NR(3, 31), !!on);
-               break;
-       default:
-               printf("MXC USB port %d not yet supported\n", port);
-               return -EINVAL;
-       }
-
-       return 0;
-}
 #endif
 
 static int setup_dhcom_mac_from_fuse(void)

diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
index 3b24dd326ec47244a2a71febc3c21f19c537802b..77b5afdbb773dfaf90e6274c2e372b82187ab291 100644 (file)
--- a/configs/dh_imx6_defconfig
+++ b/configs/dh_imx6_defconfig
@@ -64,6 +64,8 @@ CONFIG_FEC_MXC=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_SCSI=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y