From 60de5ed33ca6a496a4fdc53b9083cd9c68373456 Mon Sep 17 00:00:00 2001 From: Hoegeun Kwon Date: Wed, 8 Mar 2017 13:54:11 +0900 Subject: [PATCH 1/4] arm64: dts: exynos: Remove the OF graph from DSI node The OF graph is not needed because the panel is a child of dsi. Remove the ports node in DSI node. Signed-off-by: Hoegeun Kwon Reviewed-by: Andrzej Hajda Reviewed-by: Andi Shyti Signed-off-by: Krzysztof Kozlowski --- .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index e2b0da2c0bc7..804a27093344 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -310,20 +310,6 @@ &dsi { samsung,pll-clock-frequency = <24000000>; pinctrl-names = "default"; pinctrl-0 = <&te_irq>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@1 { - reg = <1>; - - dsi_out: endpoint { - samsung,burst-clock-frequency = <512000000>; - samsung,esc-clock-frequency = <16000000>; - }; - }; - }; }; &hdmi { From a64d0ece9fdd29714f488531b49f0ed30a61678a Mon Sep 17 00:00:00 2001 From: Dongwoo Lee Date: Tue, 20 Jun 2017 16:12:23 +0900 Subject: [PATCH 2/4] arm64: dts: exynos: Fix wrong label for USB 3.0 controller node Exynos5433 has two usb 3.0 controllers: usbhost and usbdrd. usbhost is host-only controller whereas usbdrd supports both peripheral and host mode. "drd" means dual-role device, so usbhost cannot be labeled with the name containing "drd". However, the label usbdrd_dwc3_0 was used for usbhost's dwc3 node. It seems it obviously fault because TM2 and TM2E doesn't use usbhost but dr_mode property is assigned to it. This patch assigns the proper label for two dwc3 nodes. Signed-off-by: Dongwoo Lee Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 +- arch/arm64/boot/dts/exynos/exynos5433.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index 804a27093344..477c3bc30c00 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -1202,7 +1202,7 @@ &usbdrd30 { status = "okay"; }; -&usbdrd_dwc3_0 { +&usbdrd_dwc3 { dr_mode = "otg"; }; diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi index 727f36abf3d4..7fe994b750da 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi @@ -1367,7 +1367,7 @@ usbdrd30: usbdrd { ranges; status = "disabled"; - dwc3@15400000 { + usbdrd_dwc3: dwc3@15400000 { compatible = "snps,dwc3"; reg = <0x15400000 0x10000>; interrupts = ; @@ -1414,7 +1414,7 @@ usbhost30: usbhost { ranges; status = "disabled"; - usbdrd_dwc3_0: dwc3@15a00000 { + usbhost_dwc3: dwc3@15a00000 { compatible = "snps,dwc3"; reg = <0x15a00000 0x10000>; interrupts = ; From 6d00a55d4661327a45e835af6e1bd23d28a78430 Mon Sep 17 00:00:00 2001 From: Dongwoo Lee Date: Tue, 20 Jun 2017 16:12:24 +0900 Subject: [PATCH 3/4] arm64: dts: exynos: Add extcon property for TM2 and TM2E Since commit 9840354ff429 ("usb: dwc3: Add dual-role support") dwc3 node requires extcon property to be initialized as OTG mode and it supports dual-role mode operation. Signed-off-by: Dongwoo Lee Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index 477c3bc30c00..4daca1ec540d 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -1204,6 +1204,7 @@ &usbdrd30 { &usbdrd_dwc3 { dr_mode = "otg"; + extcon = <&muic>; }; &usbdrd30_phy { From 10acba1293db5c28d1b81d673e75c2415cb96f62 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Tue, 4 Jul 2017 17:17:39 +0800 Subject: [PATCH 4/4] arm64: dts: exynos: Remove num-slots from exynos platforms dwmmc driver deprecated num-slots and plan to get rid of it finally. Just move a step to cleanup it from DT. Cc: Jaehoon Chung Signed-off-by: Shawn Lin Reviewed-by: Jaehoon Chung Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi | 2 -- arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index 4daca1ec540d..94cde8773c6a 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -832,7 +832,6 @@ &i2s0 { &mshc_0 { status = "okay"; - num-slots = <1>; mmc-hs200-1_8v; mmc-hs400-1_8v; cap-mmc-highspeed; @@ -854,7 +853,6 @@ &mshc_0 { &mshc_2 { status = "okay"; - num-slots = <1>; cap-sd-highspeed; disable-wp; cd-gpios = <&gpa2 4 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts index e5892bb0ae6e..4a8b1fb51243 100644 --- a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts +++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts @@ -359,7 +359,6 @@ pmic_irq: pmic-irq { &mmc_0 { status = "okay"; - num-slots = <1>; cap-mmc-highspeed; mmc-hs200-1_8v; non-removable; @@ -375,7 +374,6 @@ &mmc_0 { &mmc_2 { status = "okay"; - num-slots = <1>; cap-sd-highspeed; card-detect-delay = <200>; clock-frequency = <400000000>;