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 76bb3e1..da5694c 100644 (file)
--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
@@ -127,3 +127,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 5d4b738..5333ff7 100644 (file)
--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
@@ -117,3 +117,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 b0ccd8c..009c5ca 100644 (file)
--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -127,3 +127,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 12c7b0b..c3742d2 100644 (file)
--- a/arch/arm/boot/dts/bcm270x.dtsi
+++ b/arch/arm/boot/dts/bcm270x.dtsi
@@ -151,6 +151,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>;
+                       };
+               };
+
        };
 
        __overrides__ {
@@ -201,3 +224,7 @@
        dmas = <&dma 6>, <&dma 7>;
        dma-names = "tx", "rx";
 };
+
+&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 fb28b03..d706451 100644 (file)
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -237,3 +237,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 5a4efde..2c95b2c 100644 (file)
--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
@@ -115,6 +115,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__ {
                audio   = <0>,"!13", <0>,"=14";
                noaudio = <0>,"=13", <0>,"!14";