From 8a4d409a07bde76b7b6e17b72bc8f25dc35ea83b Mon Sep 17 00:00:00 2001 From: Emanuele Ghidoli Date: Wed, 12 Apr 2023 13:53:46 +0200 Subject: arm64: dts: colibri-imx8x: move usb otg_id and vbus regulator to SoM dtsi Move usb extcon gpio and usbh vbus regulator nodes to SoM device tree include file as they are standard functionality. Keep those nodes disabled by default to allow non-standard carrier-board design to use the pristine SoM dtsi file. Upstream-Status: Pending - No USB support as of now in upstream linux. Signed-off-by: Emanuele Ghidoli --- .../boot/dts/freescale/imx8x-colibri-eval-v3.dtsi | 26 +++++++--------------- .../boot/dts/freescale/imx8x-colibri-iris.dtsi | 22 ++++-------------- arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 20 +++++++++++++++++ 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi index 6e87fb534033..6c67ec54f5ec 100644 --- a/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi @@ -17,24 +17,6 @@ #clock-cells = <0>; clock-frequency = <16000000>; }; - - extcon_usbc_det: usbc_det { - compatible = "linux,extcon-usb-gpio"; - id-gpio = <&lsio_gpio5 9 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbc_det>; - }; - - reg_usbh_vbus: regulator-usbh-vbus { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbh1_reg>; - gpio = <&lsio_gpio4 3 GPIO_ACTIVE_LOW>; - regulator-always-on; - regulator-max-microvolt = <5000000>; - regulator-min-microvolt = <5000000>; - regulator-name = "usbh_vbus"; - }; }; /* Colibri Analogue Inputs */ @@ -46,6 +28,10 @@ status = "okay"; }; +&extcon_usbc_det { + status = "okay"; +}; + &i2c1 { status = "okay"; @@ -118,6 +104,10 @@ status = "okay"; }; +®_usbh_vbus { + status = "okay"; +}; + /* USB PHY for &usbotg3 */ &usb3_phy { status = "okay"; diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri-iris.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri-iris.dtsi index 88ce018f610c..7bbddad9085a 100644 --- a/arch/arm64/boot/dts/freescale/imx8x-colibri-iris.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8x-colibri-iris.dtsi @@ -9,30 +9,12 @@ rtc1 = &rtc; }; - extcon_usbc_det: usbc_det { - compatible = "linux,extcon-usb-gpio"; - id-gpio = <&lsio_gpio5 9 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbc_det>; - }; - reg_3v3: regulator-3v3 { compatible = "regulator-fixed"; regulator-max-microvolt = <3300000>; regulator-min-microvolt = <3300000>; regulator-name = "3.3V"; }; - - reg_usbh_vbus: regulator-usbh-vbus { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbh1_reg>; - regulator-name = "usbh_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&lsio_gpio4 3 GPIO_ACTIVE_LOW>; - regulator-always-on; - }; }; /* Colibri Analogue Inputs */ @@ -146,6 +128,10 @@ status = "okay"; }; +®_usbh_vbus { + status = "okay"; +}; + /* USB PHY for &usbotg3 */ &usb3_phy { status = "okay"; diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi index a1b69b76544f..705012e2f059 100644 --- a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi @@ -64,6 +64,14 @@ }; }; + extcon_usbc_det: usbc-det { + compatible = "linux,extcon-usb-gpio"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbc_det>; + id-gpio = <&lsio_gpio5 9 GPIO_ACTIVE_HIGH>; + status = "disabled"; + }; + panel_dpi: panel-dpi { compatible = "panel-dpi"; backlight = <&backlight>; @@ -110,6 +118,18 @@ regulator-name = "vref-1v8"; }; + reg_usbh_vbus: regulator-usbh-vbus { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh1_reg>; + gpio = <&lsio_gpio4 3 GPIO_ACTIVE_LOW>; + regulator-always-on; + regulator-max-microvolt = <5000000>; + regulator-min-microvolt = <5000000>; + regulator-name = "usbh_vbus"; + status = "disabled"; + }; + reserved-memory { #address-cells = <2>; #size-cells = <2>; -- cgit v1.2.3