From 492529611438851a16f4403c1dfaf32dbfeeb2ab Mon Sep 17 00:00:00 2001 From: Hoegeun Kwon Date: Wed, 3 Jul 2019 19:22:11 +0900 Subject: [PATCH] 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 --- 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, 30 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts index 25d66a7..6e54589 100644 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts @@ -181,4 +181,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 02fa807..aae30e8 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>; }; }; @@ -190,10 +189,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 f21ec97..0d388c4 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -347,4 +347,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 9a78b5a..2e164ef 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -358,4 +358,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 cfd1970..b872c46 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts @@ -147,6 +147,12 @@ #address-cells = <1>; #size-cells = <0>; status = "okay"; + + pitouchscreen: panel@0 { + compatible = "raspberrypi,touchscreen"; + reg = <0>; + raspberrypi,touchscreen-bridge = <&pitouchscreen_bridge>; + }; }; }; -- 2.7.4