From 4ca99fe81aead026cf7540f9eea7bcbc180189c7 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Fri, 21 Jun 2019 00:49:47 +0200 Subject: [PATCH] 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 Cc: Ludwig Zenz Cc: Stefano Babic Tested-by: Ludwig Zenz --- board/dhelectronics/dh_imx6/dh_imx6.c | 17 ----------------- configs/dh_imx6_defconfig | 2 ++ 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 1d41690c0c..24141088c9 100644 --- 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 3b24dd326e..77b5afdbb7 100644 --- 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 -- 2.25.1