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 0ae4537..a083528 100644 (file)
--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -184,10 +184,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 419df50..7fad5fb 100644 (file)
--- a/arch/arm/boot/dts/bcm270x.dtsi
+++ b/arch/arm/boot/dts/bcm270x.dtsi
@@ -155,14 +155,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>;
+                                       };
+                               };
                        };
                };
 
@@ -213,4 +214,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 c85a80b..ec531fc 100644 (file)
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
@@ -364,10 +364,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 a46a8d4..4a8d896 100644 (file)
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -362,10 +362,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 c7c3a8d..345a89c 100644 (file)
--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
@@ -121,12 +121,6 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "okay";
-
-                       pitouchscreen: panel@0 {
-                               compatible = "raspberrypi,touchscreen";
-                               reg = <0>;
-                               raspberrypi,touchscreen-bridge = <&pitouchscreen_bridge>;
-                       };
                };
        };