ARM: dts: bcm2711-rpi-4-b: Add vc4-kms-dsi-7inch overlay

Add vc4-kms-dsi-7inch overlay as built-in DT.

Change-Id: I15ec96afbababd31185c287ecdf6ab52463dcec6
Signed-off-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>

diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
index d9d4281..e57ce5e 100644 (file)
--- a/arch/arm/boot/dts/bcm270x.dtsi
+++ b/arch/arm/boot/dts/bcm270x.dtsi
@@ -162,17 +162,6 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
-
-                       lcd@45 {
-                               compatible = "raspberrypi,7inch-touchscreen-panel";
-                               reg = <0x45>;
-
-                               port {
-                                       panel_dsi_port: endpoint {
-                                               remote-endpoint = <&dsi_out_port>;
-                                       };
-                               };
-                       };
                };
 
        };
@@ -297,10 +286,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/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index 95860b6..b314360 100644 (file)
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -28,18 +28,6 @@
                blconfig = &blconfig;
        };
 
-       rpi_backlight: rpi_backlight {
-               compatible = "raspberrypi,rpi-backlight";
-               firmware = <&firmware>;
-               status = "okay";
-       };
-
-       rpi_ft5406: rpi_ft5406 {
-               compatible = "rpi,rpi-ft5406";
-               firmware = <&firmware>;
-               status = "okay";
-       };
-
        gpio-keys {
                compatible = "gpio-keys";
 
@@ -115,6 +103,26 @@
                enable-active-high;
                gpio = <&expgpio 6 GPIO_ACTIVE_HIGH>;
        };
+
+       panel_disp1: panel_disp1@0 {
+               compatible = "raspberrypi,7inch-dsi", "simple-panel";
+               backlight = <&reg_display>;
+               power-supply = <&reg_display>;
+
+               port {
+                       panel_in: endpoint {
+                               remote-endpoint = <&bridge_out>;
+                       };
+               };
+       };
+
+       reg_bridge: reg_bridge@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "bridge_reg";
+               gpio = <&reg_display 0 0>;
+               vin-supply = <&reg_display>;
+               enable-active-high;
+       };
 };
 
 &ddc0 {
@@ -642,6 +650,7 @@
 
 &i2c0if {
        clock-frequency = <100000>;
+       status = "okay";
 };
 
 &i2c1 {
@@ -828,6 +837,73 @@ cam0_reg: &cam_dummy_reg {
        status = "okay";
 };
 
+&i2c0mux {
+       status = "okay";
+};
+
+&dsi1 {
+       interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+       compatible = "brcm,bcm2711-dsi1";
+       #address-cells = <1>;
+       #size-cells = <0>;
+       status = "okay";
+       port {
+               dsi_out: endpoint {
+                       remote-endpoint = <&bridge_in>;
+               };
+       };
+       bridge@0 {
+               reg = <0>;
+               compatible = "toshiba,tc358762";
+               vddc-supply = <&reg_bridge>;
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               bridge_in: endpoint {
+                                       remote-endpoint = <&dsi_out>;
+                               };
+                       };
+
+                       port@1 {
+                               reg = <1>;
+                               bridge_out: endpoint {
+                                       remote-endpoint = <&panel_in>;
+                               };
+                       };
+               };
+       };
+};
+
+&i2c_csi_dsi {
+       #address-cells = <1>;
+       #size-cells = <0>;
+       status = "okay";
+
+       ft5406: ts@38 {
+               touchscreen-inverted-x;
+               touchscreen-inverted-y;
+
+               compatible = "edt,edt-ft5506";
+               reg = <0x38>;
+
+               touchscreen-size-x = < 800 >;
+               touchscreen-size-y = < 480 >;
+
+               vcc-supply = <&reg_display>;
+               reset-gpio = <&reg_display 1 1>;
+       };
+
+       reg_display: reg_display@45 {
+               compatible = "raspberrypi,7inch-touchscreen-panel-regulator";
+               reg = <0x45>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+};
+
 / {
        __overrides__ {
                act_led_gpio = <&act_led>,"gpios:4";
@@ -844,5 +920,13 @@ cam0_reg: &cam_dummy_reg {
                sd_poll_once = <&emmc2>, "non-removable?";
                spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
                           <&spi0>, "dmas:8=", <&dma40>;
+
+               sizex = <&ft5406>,"touchscreen-size-x:0";
+               sizey = <&ft5406>,"touchscreen-size-y:0";
+               invx = <0>, "-10";
+               invy = <0>, "-11";
+               swapxy = <&ft5406>,"touchscreen-swapped-x-y?";
+
+               disable_touch = <0>, "-10-11-12";
        };
 };