From 4b237be52c1b664f474fcd592b80d80ca40018aa Mon Sep 17 00:00:00 2001
From: DanyLE <xsang.le@gmail.com>
Date: Sun, 9 Jul 2023 22:00:04 +0200
Subject: [PATCH] update DPI LCD overlay setting

---
 conf/layer.conf                                    | 9 +++++++--
 recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb | 6 +++---
 recipes-core/images/core-image-minimal.bbappend    | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 59ffcf2..2d86cd0 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -49,7 +49,12 @@ KERNEL_DEVICETREE:append = " overlays/vc4-kms-dpi-generic.dtbo overlays/dpi24.dt
 
 
 RPI_EXTRA_CONFIG += "${@['','\n\
-dtoverlay=vc4-kms-DPI-28inch \n\
+dtoverlay=vc4-kms-dpi-generic \n\
+dtparam=hactive=480,hfp=26,hsync=16,hbp=10 \n\
+dtparam=vactive=640,vfp=25,vsync=10,vbp=15 \n\
+dtparam=clock-frequency=32000000 \n\
+dtparam=hsync-invert,vsync-invert,pixclk-invert \n\
+dtparam=rgb666-padhi,rotate=270 \n\
 dtoverlay=waveshare-28dpi-3b-4b \n\
 dtoverlay=waveshare-28dpi-3b \n\
 dtoverlay=waveshare-28dpi-4b \n']['${RPI_USE_wS_28_DPI_LCD}' == '1']}"
@@ -63,6 +68,6 @@ dtoverlay=ads1115-i2c-gpio,cha_enable,cha_cfg=4,cha_datarate=7,cha_gain=1 \n\
 '
 
 # extra kernel CMDLINE_RNDIS option
-CMDLINE_RNDIS += " video=DPI-1:480x640,rotate=90 "
+# CMDLINE_RNDIS += " video=DPI-1:480x640,rotate=90 "
 # accept license for wifi and bluetooth firmware
 LICENSE_FLAGS_ACCEPTED = "synaptics-killswitch"
\ No newline at end of file
diff --git a/recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb b/recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb
index fb66cc5..5bd6475 100644
--- a/recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb
+++ b/recipes-bsp/waveshare-2.8-lcd/waveshare-2.8-lcd.bb
@@ -5,16 +5,16 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 inherit devicetree
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI = " file://dts/ads1115-i2c-gpio.dts file://dts/vc4-kms-waveshare-28dpi.dts "
+SRC_URI = " file://dts/ads1115-i2c-gpio.dts "
 
 S = "${WORKDIR}/dts"
-DT_FILES = "ads1115-i2c-gpio.dtbo vc4-kms-waveshare-28dpi.dtbo"
+DT_FILES = "ads1115-i2c-gpio.dtbo"
 
 COMPATIBLE_MACHINE = "raspberrypi.*"
 
 do_deploy:append () {
     install -d ${DEPLOY_DIR_IMAGE}
-    install -m 0755 ${B}/vc4-kms-waveshare-28dpi.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-waveshare-28dpi.dtbo
+    # install -m 0755 ${B}/vc4-kms-waveshare-28dpi.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-waveshare-28dpi.dtbo
     install -m 0755 ${B}/ads1115-i2c-gpio.dtbo ${DEPLOY_DIR_IMAGE}/ads1115-i2c-gpio.dtbo
     install -m 0755 ${THISDIR}/files/vc4-kms-DPI-28inch.dtbo ${DEPLOY_DIR_IMAGE}/vc4-kms-DPI-28inch.dtbo
     install -m 0755 ${THISDIR}/files/waveshare-28dpi-3b-4b.dtbo ${DEPLOY_DIR_IMAGE}/waveshare-28dpi-3b-4b.dtbo
diff --git a/recipes-core/images/core-image-minimal.bbappend b/recipes-core/images/core-image-minimal.bbappend
index a84e67d..f59aa24 100644
--- a/recipes-core/images/core-image-minimal.bbappend
+++ b/recipes-core/images/core-image-minimal.bbappend
@@ -1,6 +1,6 @@
 inherit extrausers
 
-KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/vc4-kms-waveshare-28dpi.dtbo overlays/dpi24.dtbo overlays/vc4-kms-dpi-generic.dtbo overlays/ads1115-i2c-gpio.dtbo overlays/ads1115-i2c-gpio.dtbo overlays/vc4-kms-DPI-28inch.dtbo overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}"
+KERNEL_DEVICETREE:append = "${@bb.utils.contains('RPI_USE_wS_28_DPI_LCD', '1', ' overlays/dpi24.dtbo overlays/vc4-kms-dpi-generic.dtbo overlays/ads1115-i2c-gpio.dtbo overlays/ads1115-i2c-gpio.dtbo overlays/vc4-kms-DPI-28inch.dtbo overlays/waveshare-28dpi-3b-4b.dtbo overlays/waveshare-28dpi-3b.dtbo overlays/waveshare-28dpi-4b.dtbo ', ' ', d)}"
 
 
 EXTRA_USERS_PARAMS = "usermod -p BJpK8ADNDLsGg root; \