summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoegeun Kwon <hoegeun.kwon@samsung.com>2019-07-02 11:08:59 +0900
committerHoegeun Kwon <hoegeun.kwon@samsung.com>2019-07-02 11:18:33 +0900
commitb2f6ad21a0bab8e59926666f717a4f6c53066a2d (patch)
treecba47310b15d54a4a710cd97deeeeec48704cf8d
parentbde01c80dd511923f0b4d0149fb557e5ad193da0 (diff)
downloadlinux-rpi3-b2f6ad21a0bab8e59926666f717a4f6c53066a2d.tar.gz
linux-rpi3-b2f6ad21a0bab8e59926666f717a4f6c53066a2d.tar.bz2
linux-rpi3-b2f6ad21a0bab8e59926666f717a4f6c53066a2d.zip
ARM: dts: bcm27xx: Fix to of_graph from bridge node for panelsubmit/tizen/20190702.072015accepted/tizen/unified/20190702.114802
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: Ibf131aebd964360874ebe2f3792f0912f6e8988d Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
-rw-r--r--arch/arm/boot/dts/bcm2709-rpi-2-b.dts6
-rw-r--r--arch/arm/boot/dts/bcm270x.dtsi19
-rw-r--r--arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts6
-rw-r--r--arch/arm/boot/dts/bcm2710-rpi-3-b.dts6
-rw-r--r--arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts6
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 976ad46d3153..89bbd53df3a0 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 6f19c64938d8..1d09f66e26b9 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 f024be1431e5..6787a00d442d 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 62327354f0da..10a2a4949f4c 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 cb2e16d5ef20..ec376ee01ded 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>;
- };
};
};