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

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
index 0b66ac9f25a5f7ae51f3d0666cfcb908f85e1d24..08bf838fab551638e898930fba7ba49b3aeefbb3 100644 (file)
--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
@@ -155,3 +155,8 @@
                sd_debug     = <&sdhost>,"brcm,debug";
        };
 };
+
+&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 e99e9d999e4142060c41eb47b93c8ac70a30f384..4e6b4dd6a8d9c4f13bc865bb8ced68264162cb6c 100644 (file)
--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
@@ -145,3 +145,8 @@
                sd_debug     = <&sdhost>,"brcm,debug";
        };
 };
+
+&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 20674f250af922e9f9a43e3e8b13aee42e3930be..2dc0e1204e6374bbc6924e26dc4a04b68718559a 100644 (file)
--- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -155,3 +155,8 @@
                sd_debug     = <&sdhost>,"brcm,debug";
        };
 };
+
+&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 36d853715f2379e1952ce3d3be58dd670e305159..caa66393518603529d284f360b2000b0ed4852ef 100644 (file)
--- a/arch/arm/boot/dts/bcm270x.dtsi
+++ b/arch/arm/boot/dts/bcm270x.dtsi
@@ -137,6 +137,29 @@
                        /* Add alias */
                        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 {
@@ -155,3 +178,7 @@
                regulator-always-on;
        };
 };
+
+&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 616cfd5c7094596b497101e8feca25e25e77c3e8..173103aaca503833b5e29530ed94e14c7cab0444 100644 (file)
--- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -224,3 +224,8 @@
                sd_debug     = <&sdhost>,"brcm,debug";
        };
 };
+
+&i2c_dsi {
+       gpios = <&gpio 44 0
+                &gpio 45 0>;
+};

diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
index 3e134a1208610b90e2d0fc22f03c6e9f372bfcd7..3fabac6a93e846f678d846637c4f9a5f5b8e7922 100644 (file)
--- a/arch/arm/boot/dts/bcm2710.dtsi
+++ b/arch/arm/boot/dts/bcm2710.dtsi
@@ -145,4 +145,3 @@
        interrupt-parent = <&local_intc>;
        interrupts = <8>;
 };
-

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 fb45c6456b181b047d6cff8784f7696eb75da3c7..05faf1bfa1b7c73fd60b1efb813b969e10bbfefa 100644 (file)
--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
@@ -128,8 +128,29 @@
                };
        };
 
-
        fragment@16 {
+               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@17 {
+               target = <&i2c_dsi>;
+               __overlay__  {
+                       status = "okay";
+               };
+       };
+
+       fragment@18 {
                target = <&clocks>;
                __overlay__  {
                        claim-clocks = <