diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index f8f350ff5e900..50745da5016f2 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -5595,6 +5595,7 @@ Params: sizex Touchscreen size x (default 720) invy Touchscreen inverted y axis swapxy Touchscreen swapped x y axis disable_touch Disables the touch screen overlay driver + rotation Display rotation {0,90,180,270} (default 0) dsi0 Use DSI0 and i2c_csi_dsi0 (rather than the default DSI1 and i2c_csi_dsi). diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-ili9881-5inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-ili9881-5inch-overlay.dts index 1985766c0e679..830e28703e57c 100644 --- a/arch/arm/boot/dts/overlays/vc4-kms-dsi-ili9881-5inch-overlay.dts +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-ili9881-5inch-overlay.dts @@ -2,121 +2,13 @@ * vc4-kms-dsi-ili9881-5inch-overlay.dts */ -/dts-v1/; -/plugin/; +#include "vc4-kms-dsi-ili9881-7inch-overlay.dts" -#include - -/ { - compatible = "brcm,bcm2835"; - - i2c_frag: fragment@0 { - target = <&i2c_csi_dsi>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - display_mcu: display_mcu@45 - { - compatible = "raspberrypi,v2-touchscreen-panel-regulator"; - reg = <0x45>; - gpio-controller; - #gpio-cells = <2>; - }; - - gt911: gt911@5d { - compatible = "goodix,gt911"; - reg = <0x5d>; - AVDD28-supply = <&touch_reg>; - touchscreen-size-x = <720>; - touchscreen-size-y = <1280>; - touchscreen-x-mm = <62>; - touchscreen-y-mm = <110>; - }; - }; - }; - - dsi_frag: fragment@1 { - target = <&dsi1>; - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - port { - dsi_out: endpoint { - remote-endpoint = <&panel_in>; - }; - }; - - dsi_panel: dsi_panel@0 { - reg = <0>; - compatible = "raspberrypi,dsi-5inch"; - reset-gpio = <&display_mcu 0 GPIO_ACTIVE_LOW>; - backlight = <&display_mcu>; - - port { - panel_in: endpoint { - remote-endpoint = <&dsi_out>; - }; - }; - }; - }; - }; - - fragment@2 { - target = <&i2c0if>; - __overlay__ { - status = "okay"; - }; - }; - - fragment@3 { - target = <&i2c0mux>; - __overlay__ { - status = "okay"; - }; - }; - - fragment@4 { - target-path = "/"; - __overlay__ { - touch_reg: touch_reg@1 { - reg = <1>; - compatible = "regulator-fixed"; - regulator-name = "touch_reg_1"; - gpio = <&display_mcu 1 GPIO_ACTIVE_HIGH>; - startup-delay-us = <50000>; - enable-active-high; - }; - }; - }; - - fragment@10 { - target = <>911>; - __dormant__ { - touchscreen-inverted-x; - }; - }; - - fragment@11 { - target = <>911>; - __dormant__ { - touchscreen-inverted-y; - }; - }; +>911 { + touchscreen-x-mm = <62>; + touchscreen-y-mm = <110>; +}; - __overrides__ { - dsi0 = <&dsi_frag>, "target:0=",<&dsi0>, - <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>, - <&touch_reg>, "reg:0=0", - <&touch_reg>, "regulator-name=touch_reg_0"; - sizex = <>911>,"touchscreen-size-x:0"; - sizey = <>911>,"touchscreen-size-y:0"; - invx = <0>, "+10"; - invy = <0>, "+11"; - swapxy = <>911>,"touchscreen-swapped-x-y?"; - disable_touch = <>911>, "status=disabled"; - }; +&dsi_panel { + compatible = "raspberrypi,dsi-5inch"; };