BCM270X: Enable the DSI panel node in the VC4 overlay.

Change-Id: I46fdcdb53b79bd4f0db5022a415f6d1b9faf28e9
Signed-off-by: Eric Anholt <eric@anholt.net>

diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
index ef0beea3a3a3862de2a3fb7dc7c90a31eb73cbe2..83b95b9a6ec3243ed0d91326493a151d09291850 100644 (file)
--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
@@ -121,3 +121,8 @@
                pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
        };
 };
+
+&i2c_dsi {
+       gpios = <&gpio 28 0
+                &gpio 29 0>;
+};

diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
index dea70fae90e64f8c2c3bd68a4fcb907d0d8e91df..1ddab83f76730e9cb1b72edfe7b42ad5e05a70f3 100644 (file)
--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
@@ -111,3 +111,8 @@
                act_led_trigger = <&act_led>,"linux,default-trigger";
        };
 };
+
+&i2c_dsi {
+       gpios = <&gpio 2 0
+                &gpio 3 0>;
+};

diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
index 34659505055aa409eacc3b04d91e43238d852b5c..c23f793957917f209f6cbaa5c25c081cbac27691 100644 (file)
--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -122,3 +122,8 @@
                pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
        };
 };
+
+&i2c_dsi {
+       gpios = <&gpio 28 0
+                &gpio 29 0>;
+};

diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
index 05828277ff8929af8d71d2143bf64236f2321591..0baac1d86d2d1e0b993fff0e5fadccce3201827d 100644 (file)
--- a/arch/arm/boot/dts/bcm270x.dtsi
+++ b/arch/arm/boot/dts/bcm270x.dtsi
@@ -135,6 +135,29 @@
                        firmware = <&firmware>;
                        status = "disabled";
                };
+
+               i2c_dsi: i2cdsi {
+                       /* We have to use i2c-gpio because the
+                        * firmware is also polling another device
+                        * using the only hardware I2C bus that could
+                        * connect to these pins.
+                        */
+                       compatible = "i2c-gpio";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+
+                       pitouchscreen_bridge: bridge@45 {
+                               compatible = "raspberrypi,touchscreen-bridge-i2c";
+                               reg = <0x45>;
+                       };
+
+                       pitouchscreen_touch: bridge@38 {
+                               compatible = "raspberrypi,touchscreen-ts-i2c";
+                               reg = <0x38>;
+                       };
+               };
+
        };
 
        vdd_5v0_reg: fixedregulator_5v0 {
@@ -180,3 +203,7 @@
 &vc4 {
        status = "disabled";
 };
+
+&dsi1 {
+       power-domains = <&power RPI_POWER_DOMAIN_DSI1>;
+};

diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
index 00fbdf51d59de08e79fbfdba85832492f57c2d86..acd7648a82f51f0a0a7fa1828ecd046958906376 100644 (file)
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -226,3 +226,8 @@
                pwr_led_trigger = <&pwr_led>,"linux,default-trigger";
        };
 };
+
+&i2c_dsi {
+       gpios = <&gpio 44 0
+                &gpio 45 0>;
+};

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 489679637306254ff0dedf37d01e5e312c0c38d2..fc24fa832e60fd08bc4b731c33878c1e6bd810a0 100644 (file)
--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
@@ -141,6 +141,28 @@
                };
        };
 
+       fragment@18 {
+               target = <&dsi1>;
+               __overlay__  {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "okay";
+
+                       pitouchscreen: panel@0 {
+                               compatible = "raspberrypi,touchscreen";
+                               reg = <0>;
+                               raspberrypi,touchscreen-bridge = <&pitouchscreen_bridge>;
+                       };
+               };
+       };
+
+       fragment@19 {
+               target = <&i2c_dsi>;
+               __overlay__  {
+                       status = "okay";
+               };
+       };
+
        __overrides__ {
                cma-256 = <0>,"+0-1-2-3-4";
                cma-192 = <0>,"-0+1-2-3-4";