From 58fa3a6a2ab81903b1b46631dd43658e01de2ed4 Mon Sep 17 00:00:00 2001 From: Hoegeun Kwon Date: Thu, 4 Jul 2019 17:42:52 +0900 Subject: [PATCH] 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 --- arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 6 ------ arch/arm/boot/dts/bcm270x.dtsi | 19 +++++++++++++------ arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 6 ------ arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 6 ------ arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts | 6 ------ 5 files changed, 13 insertions(+), 30 deletions(-) diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts index cc4bee3..65953d3 100644 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts @@ -187,10 +187,4 @@ cam0_reg: &cam_dummy_reg { #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 505e325..d9d4281 100644 --- a/arch/arm/boot/dts/bcm270x.dtsi +++ b/arch/arm/boot/dts/bcm270x.dtsi @@ -163,14 +163,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>; + }; + }; }; }; @@ -296,4 +297,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 281968f..d87734b 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -308,10 +308,4 @@ cam0_reg: &cam_dummy_reg { #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 94cc7a4..cc3a1b2 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -310,10 +310,4 @@ cam0_reg: &cam_dummy_reg { #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 9b9dd90..d30ee4e 100644 --- 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>; - }; }; }; -- 2.7.4