From 1d5c7c583d9b43d1c59b853d6d05e5028ed01d8a Mon Sep 17 00:00:00 2001 From: Dongwoo Lee Date: Thu, 25 Jan 2018 14:33:27 +0900 Subject: [PATCH] arm: dts: odroidxu3: Remove extcon node for a host-only USB 3.0 port The host-only USB 3.0 port on odroid-xu3 doesn't provide connection detection through GPIO, but extcon node is configured for this port. This unnecessary extcon node just represents wrong state for USB connection. Thus, this patch removes extcon node for a host-only USB port and configures USB controller in odroid-xu3 specific device tree. Change-Id: I4be1ae7e8a8a4ca80e53cc6a8b408f7f57a89ea1 Signed-off-by: Dongwoo Lee --- .../boot/dts/exynos5422-odroidxu3-common.dtsi | 26 ------------------- arch/arm/boot/dts/exynos5422-odroidxu3.dts | 16 ++++++++++++ 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi index 04b44e9c3034..0e813f414f1f 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi @@ -374,20 +374,6 @@ clocks = <&i2s0 CLK_I2S_CDCLK>; }; }; - - usb_extcon_a: odroid-usbotg-a { - compatible = "extcon-odroid-usbotg"; - pinctrl-names = "default"; - pinctrl-0 = <&otg_ida &vbus_deta>; - otg-id-gpio = <&gpx1 1 0>; - vbus-det-gpio = <&gpx3 4 0>; - }; - - usb_extcon_b: odroid-usbotg-b { - compatible = "extcon-odroid-usbotg"; - pinctrl-0 = <&vbus_detb>; - vbus-det-gpio = <&gpx3 5 0>; - }; }; &bus_wcore { @@ -594,22 +580,10 @@ mali-supply = <&buck4_reg>; }; -&usbdrd3_0 { - extcon = <&usb_extcon_b>; -}; - -&usbdrd3_1 { - extcon = <&usb_extcon_a>; -}; - &usbdrd_dwc3_0 { dr_mode = "host"; }; -&usbdrd_dwc3_1 { - dr_mode = "otg"; -}; - &cpu0 { cpu-cluster.0-supply = <&buck2_reg>; }; diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3.dts b/arch/arm/boot/dts/exynos5422-odroidxu3.dts index 78e6a502f320..14c569a4d8f8 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3.dts +++ b/arch/arm/boot/dts/exynos5422-odroidxu3.dts @@ -16,6 +16,14 @@ / { model = "Hardkernel Odroid XU3"; compatible = "hardkernel,odroid-xu3", "samsung,exynos5800", "samsung,exynos5"; + + usb_extcon_a: odroid-usbotg-a { + compatible = "extcon-odroid-usbotg"; + pinctrl-names = "default"; + pinctrl-0 = <&otg_ida &vbus_deta>; + otg-id-gpio = <&gpx1 1 0>; + vbus-det-gpio = <&gpx3 4 0>; + }; }; &i2c_0 { @@ -49,3 +57,11 @@ shunt-resistor = <10000>; }; }; + +&usbdrd3_1 { + extcon = <&usb_extcon_a>; +}; + +&usbdrd_dwc3_1 { + dr_mode = "otg"; +}; -- 2.34.1