From: Hoegeun Kwon <hoegeun.kwon@samsung.com>
Date: Thu, 4 Jul 2019 08:42:52 +0000 (+0900)
Subject: ARM: dts: bcm27xx: Fix to of_graph from bridge node for touchscreen
X-Git-Tag: accepted/tizen/unified/20190708.114147^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=826012a68960a7920ebe7bbbebb4481e4c9b4e69;p=platform%2Fkernel%2Flinux-rpi3.git

ARM: dts: bcm27xx: Fix to of_graph from bridge node for touchscreen

Beginning with kernel v4.15, the i2c management of the touchscreen
panel driver has been changed to use of_graph from brdge node. So
change to of_graph and remove the unnecessary nodes.

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