diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile index e32dd9dc89f19a..e92d25ee076c55 100644 --- a/arch/arm/boot/dts/overlays/Makefile +++ b/arch/arm/boot/dts/overlays/Makefile @@ -343,6 +343,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \ vc4-kms-dsi-ili9881-7inch.dtbo \ vc4-kms-dsi-lt070me05000.dtbo \ vc4-kms-dsi-lt070me05000-v2.dtbo \ + vc4-kms-dsi-tdo-panel.dtbo \ vc4-kms-dsi-waveshare-800x480.dtbo \ vc4-kms-dsi-waveshare-panel.dtbo \ vc4-kms-dsi-waveshare-panel-v2.dtbo \ diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README index 28451981d0bd99..4cfeeb7c97476e 100644 --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -5865,6 +5865,18 @@ Load: dtoverlay=vc4-kms-dsi-lt070me05000-v2 Params: +Name: vc4-kms-dsi-tdo-panel +Info: Enable the Tdo DSI screen,keep adding. + Requires vc4-kms-v3d to be loaded. +Load: dtoverlay=vc4-kms-dsi-tdo-panel,= +Params: tl034wvs03 4.0" 480x480 2lane + tl040wvs17 4.0" 480x480 2lane + tl040hds31 4.0" 720x720 2lane + rotate Display rotation {0,90,180,270} + dsi0 Use DSI0 and i2c_csi_dsi0 (rather than + the default DSI1 and i2c_csi_dsi). + + Name: vc4-kms-dsi-waveshare-800x480 Info: Enable the Waveshare 4.3" 800x480 DSI screen. It tries to look like the Pi 7" display, but won't accept some of the diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-tdo-panel-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-tdo-panel-overlay.dts new file mode 100644 index 00000000000000..0a55494c1185c5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-tdo-panel-overlay.dts @@ -0,0 +1,69 @@ +/* + * Device Tree overlay for Waveshare DSI Touchscreens + * + */ + +/dts-v1/; +/plugin/; + +/ { + compatible = "brcm,bcm2835"; + + dsi_frag: fragment@0 { + target = <&dsi1>; + __overlay__ { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + port { + dsi_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + + panel: panel_dsi1@0 { + compatible = "tdo,4.0-dsi-tl040wvs17"; + status = "okay"; + reg = <0>; + reset-gpios = <&gpio 47 1>; // Dummy GPIO , Unused or change + port { + panel_in: endpoint { + remote-endpoint = <&dsi_out>; + }; + }; + }; + }; + }; + + i2c_frag: fragment@1 { + target = <&i2c_csi_dsi>; + i2cbus: __overlay__ { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + }; + }; + + fragment@2 { + target = <&i2c0if>; + __overlay__ { + status = "okay"; + }; + }; + + fragment@3 { + target = <&i2c0mux>; + __overlay__ { + status = "okay"; + }; + }; + + __overrides__ { + tl034wvs03 = <&panel>, "compatible=tdo,4.0-dsi-tl034wvs03"; + tl040wvs17 = <&panel>, "compatible=tdo,4.0-dsi-tl040wvs17"; + tl040hds31 = <&panel>, "compatible=tdo,4.0-dsi-tl040hds31"; + rotation = <&panel>, "rotation:0"; + dsi0 = <&dsi_frag>, "target:0=",<&dsi0>, + <&i2c_frag>, "target:0=",<&i2c_csi_dsi0>; + }; +}; diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index ddbc08e8edc00e..881282c755bc65 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1086,6 +1086,7 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m CONFIG_DRM_PANEL_SITRONIX_ST7701=m CONFIG_DRM_PANEL_SIMPLE=m CONFIG_DRM_PANEL_TPO_Y17P=m +CONFIG_DRM_PANEL_TDO_DSI_V1=m CONFIG_DRM_PANEL_WAVESHARE_TOUCHSCREEN=m CONFIG_DRM_PANEL_WAVESHARE_TOUCHSCREEN_V2=m CONFIG_DRM_DISPLAY_CONNECTOR=m diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index c093242c26a77a..9e24a8f24a52cd 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -940,6 +940,20 @@ config DRM_PANEL_TPO_Y17P Say Y if you want to enable support for panels based on the TDO Y17P controller. +config DRM_PANEL_TDO_DSI_V1 + tristate "TDO touchscreen panels V1" + depends on DRM_MIPI_DSI + depends on I2C + depends on BACKLIGHT_CLASS_DEVICE + help + Say Y here if you want to enable support for TDO DSI + touchscreen panels, e.g. tl034wvs03, tl040hds31, etc. + This driver provides MIPI DSI display interface. + It also handles backlight control via the backlight + class device. + To compile this driver as a module, choose M here; the + module will be called panel-tdo-dsi-v1. + config DRM_PANEL_TPO_TD028TTEC1 tristate "Toppoly (TPO) TD028TTEC1 panel driver" depends on OF && SPI diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile index 5760902b7a5581..5d12e53fd57f37 100644 --- a/drivers/gpu/drm/panel/Makefile +++ b/drivers/gpu/drm/panel/Makefile @@ -94,6 +94,7 @@ obj-$(CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521) += panel-sony-tulip-truly-nt355 obj-$(CONFIG_DRM_PANEL_STARTEK_KD070FHFID015) += panel-startek-kd070fhfid015.o obj-$(CONFIG_DRM_PANEL_TDO_TL070WSH30) += panel-tdo-tl070wsh30.o obj-$(CONFIG_DRM_PANEL_TPO_Y17P) += panel-tdo-y17p.o +obj-$(CONFIG_DRM_PANEL_TDO_DSI_V1) += panel-tdo-dsi-v1.o obj-$(CONFIG_DRM_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o obj-$(CONFIG_DRM_PANEL_TPO_TPG110) += panel-tpo-tpg110.o diff --git a/drivers/gpu/drm/panel/panel-tdo-dsi-v1.c b/drivers/gpu/drm/panel/panel-tdo-dsi-v1.c new file mode 100644 index 00000000000000..fb40d7dedd2bc4 --- /dev/null +++ b/drivers/gpu/drm/panel/panel-tdo-dsi-v1.c @@ -0,0 +1,491 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2024 Waveshare International Limited + * + * Based on panel-raspberrypi-touchscreen by Broadcom + */ + + +#include +#include +#include +#include +#include + +#include