From bfe277fce1283c46d0af562a77817afddbf102e3 Mon Sep 17 00:00:00 2001 From: Andrejs Cainikovs Date: Fri, 25 Feb 2022 17:53:19 +0100 Subject: arm64: dts: imx8mp-verdin: move USB_1 extcon node Given that the USB OTG ID pin is defined in the SOM schematics, it should be part of the SOM device tree, not the carrier board. Signed-off-by: Andrejs Cainikovs --- arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 11 ----------- arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 9 +++++++++ 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'arch/arm64/boot/dts/freescale') diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi index 4f86b3bbbbf1..e44bfb5efe9d 100755 --- a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi @@ -4,13 +4,6 @@ */ / { - extcon_usb_1_id: usb_1_id { - compatible = "linux,extcon-usb-gpio"; - id-gpio = <&gpio2 10 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usb_1_id>; - }; - /* Carrier Board Supply +V1.8 */ reg_1p8v: regulator-1p8v { compatible = "regulator-fixed"; @@ -217,10 +210,6 @@ status = "okay"; }; -&usb_dwc3_0 { - extcon = <&extcon_usb_1_id>; -}; - &usb3_1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi index 3fd3813639a6..ca6408f5734f 100755 --- a/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi @@ -576,6 +576,14 @@ reg = <0x57>; status = "disabled"; }; + + /* USB_1 ID */ + extcon_usb_1_id: usb_1_id { + compatible = "linux,extcon-usb-gpio"; + id-gpio = <&gpio2 10 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb_1_id>; + }; }; &ldb { @@ -720,6 +728,7 @@ }; &usb_dwc3_0 { + extcon = <&extcon_usb_1_id>; dr_mode = "otg"; hnp-disable; srp-disable; -- cgit v1.2.3