From: Hoegeun Kwon <hoegeun.kwon@samsung.com>
Date: Wed, 3 Jul 2019 10:22:11 +0000 (+0900)
Subject: Revert "ARM: dts: bcm27xx: Fix to of_graph from bridge node for panel"
X-Git-Tag: accepted/tizen/unified/20190704.040506^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F209213%2F1;p=platform%2Fkernel%2Flinux-rpi3.git

Revert "ARM: dts: bcm27xx: Fix to of_graph from bridge node for panel"

This reverts commit b2f6ad21a0bab8e59926666f717a4f6c53066a2d.

There is a problem with the hdmi and revert the patch.

Change-Id: Ia69d10c067ff69d192162b0598f43028c4a05f9b
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
---

diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
index 89bbd53..976ad46d 100644
--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -180,4 +180,10 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	status = "okay";
+
+	pitouchscreen: panel@0 {
+		compatible = "raspberrypi,touchscreen";
+		reg = <0>;
+		raspberrypi,touchscreen-bridge = <&pitouchscreen_bridge>;
+	};
 };
diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
index 1d09f66..6f19c64 100644
--- a/arch/arm/boot/dts/bcm270x.dtsi
+++ b/arch/arm/boot/dts/bcm270x.dtsi
@@ -162,15 +162,14 @@
 			#size-cells = <0>;
 			status = "disabled";
 
-			lcd@45 {
-				compatible = "raspberrypi,7inch-touchscreen-panel";
+			pitouchscreen_bridge: bridge@45 {
+				compatible = "raspberrypi,touchscreen-bridge-i2c";
 				reg = <0x45>;
+			};
 
-				port {
-					panel_dsi_port: endpoint {
-						remote-endpoint = <&dsi_out_port>;
-					};
-				};
+			pitouchscreen_touch: bridge@38 {
+				compatible = "raspberrypi,touchscreen-ts-i2c";
+				reg = <0x38>;
 			};
 		};
 
@@ -206,10 +205,4 @@
 
 &dsi1 {
 	power-domains = <&power RPI_POWER_DOMAIN_DSI1>;
-
-	port {
-		dsi_out_port: endpoint {
-			remote-endpoint = <&panel_dsi_port>;
-		};
-	};
 };
diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
index 6787a00..f024be1 100644
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
@@ -346,4 +346,10 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	status = "okay";
+
+	pitouchscreen: panel@0 {
+		compatible = "raspberrypi,touchscreen";
+		reg = <0>;
+		raspberrypi,touchscreen-bridge = <&pitouchscreen_bridge>;
+	};
 };
diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
index 10a2a49..62327354 100644
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -357,4 +357,10 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	status = "okay";
+
+	pitouchscreen: panel@0 {
+		compatible = "raspberrypi,touchscreen";
+		reg = <0>;
+		raspberrypi,touchscreen-bridge = <&pitouchscreen_bridge>;
+	};
 };
diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
index ec376ee..cb2e16d 100644
--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
@@ -140,6 +140,12 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "okay";
+
+			pitouchscreen: panel@0 {
+				compatible = "raspberrypi,touchscreen";
+				reg = <0>;
+				raspberrypi,touchscreen-bridge = <&pitouchscreen_bridge>;
+			};
 		};
 	};