diff options
| author | Hoegeun Kwon <hoegeun.kwon@samsung.com> | 2019-07-03 19:22:11 +0900 |
|---|---|---|
| committer | Hoegeun Kwon <hoegeun.kwon@samsung.com> | 2019-07-03 19:30:16 +0900 |
| commit | aa7ccee8cb9def4d3866ff7a9cdcca60b5ec2f60 (patch) | |
| tree | f7c2dfee1dfa2eb96d0800c9581afaf6108af91c | |
| parent | b2f6ad21a0bab8e59926666f717a4f6c53066a2d (diff) | |
| download | linux-rpi3-aa7ccee8cb9def4d3866ff7a9cdcca60b5ec2f60.tar.gz linux-rpi3-aa7ccee8cb9def4d3866ff7a9cdcca60b5ec2f60.tar.bz2 linux-rpi3-aa7ccee8cb9def4d3866ff7a9cdcca60b5ec2f60.zip | |
Revert "ARM: dts: bcm27xx: Fix to of_graph from bridge node for panel"submit/tizen/20190703.103920accepted/tizen/unified/20190704.040506
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>
| -rw-r--r-- | arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm270x.dtsi | 19 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 6 | ||||
| -rw-r--r-- | 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 89bbd53df3a0..976ad46d3153 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 1d09f66e26b9..6f19c64938d8 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 6787a00d442d..f024be1431e5 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 10a2a4949f4c..62327354f0da 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 ec376ee01ded..cb2e16d5ef20 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>; + }; }; }; |