From 398f79cbb4f9ad51d338b1ff882242ccb8bbab20 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 23 Nov 2017 09:02:14 +0100 Subject: ARM: dts: imx7-colibri: rename USB host regulator Some carrier boards use the USB VBUS regulator for both USB DR controllers. Hence the reference to the OTG2 instance is confusing. Rename the pinctrl and regulator to "usbh". Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler --- arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 6 +++--- arch/arm/boot/dts/imx7-colibri.dtsi | 2 +- arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index 9df5c90b57af..efb3b96384cf 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -88,10 +88,10 @@ regulator-max-microvolt = <5000000>; }; - reg_usb_otg2_vbus: regulator-usb-otg2-vbus { + reg_usbh_vbus: regulator-usbh-vbus { compatible = "regulator-fixed"; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbotg2_reg>; + pinctrl-0 = <&pinctrl_usbh_reg>; regulator-name = "VCC_USB[1-4]"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; @@ -318,7 +318,7 @@ &usbotg1 { extcon = <&extcon_usbc_det>, <&extcon_usbc_det>; - vbus-supply = <®_usb_otg2_vbus>; + vbus-supply = <®_usbh_vbus>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 8853b844fac2..168c28404f52 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -622,7 +622,7 @@ >; }; - pinctrl_usbotg2_reg: gpio-usbotg2-vbus { + pinctrl_usbh_reg: gpio-usbh-vbus { fsl,pins = < MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 /* SODIMM 129 USBH PEN */ >; diff --git a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts index 7f2e34264978..136e11ab4893 100644 --- a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts @@ -51,6 +51,6 @@ }; &usbotg2 { - vbus-supply = <®_usb_otg2_vbus>; + vbus-supply = <®_usbh_vbus>; status = "okay"; }; -- cgit v1.2.3