From df6a692c8fd449de65acd9b71e2caa5d4a4995c9 Mon Sep 17 00:00:00 2001
From: Alexey Minnekhanov <alexeymin@postmarketos.org>
Date: Sun, 7 Jan 2024 00:46:27 +0300
Subject: [PATCH] xiaomi-clover: add Mi Pad 4 Plus variation (MR 4702)

Similarly to how it was done for xiaomi-beyllium with varying
display panels, add kernel variant for clover-plus.
Mi Pad 4 Plus is very very similar to regular Mi Pad 4,
but it has different panel and different touchscreen.
Therefore it uses different device tree in kernel - and it
is the only changed line in deviceinfo file.

Signed-off-by: Alexey Minnekhanov <alexeymin@postmarketos.org>

[ci:skip-build]: Already built successfully in CI.
---
 device/testing/device-xiaomi-clover/APKBUILD  | 36 +++++++++++++++----
 .../testing/device-xiaomi-clover/deviceinfo   |  3 +-
 .../{modules-initfs => modules-initfs.clover} |  0
 .../modules-initfs.cloverplus                 |  1 +
 4 files changed, 33 insertions(+), 7 deletions(-)
 rename device/testing/device-xiaomi-clover/{modules-initfs => modules-initfs.clover} (100%)
 create mode 100644 device/testing/device-xiaomi-clover/modules-initfs.cloverplus

diff --git a/device/testing/device-xiaomi-clover/APKBUILD b/device/testing/device-xiaomi-clover/APKBUILD
index f49eaab8d..ffaf9f143 100644
--- a/device/testing/device-xiaomi-clover/APKBUILD
+++ b/device/testing/device-xiaomi-clover/APKBUILD
@@ -1,15 +1,26 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-clover
 pkgdesc="Xiaomi Mi Pad 4"
-pkgver=0.2
-pkgrel=3
+pkgver=0.3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-qcom-sdm660 mkbootimg"
+depends="
+	mkbootimg
+	postmarketos-base
+"
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+subpackages="
+	$pkgname-kernel-clover:kernel_clover
+	$pkgname-kernel-cloverplus:kernel_cloverplus
+"
+source="
+	deviceinfo
+	modules-initfs.clover
+	modules-initfs.cloverplus
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -19,7 +30,20 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_clover() {
+	pkgdesc="For regular Mi Pad 4"
+	depends="linux-postmarketos-qcom-sdm660"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_cloverplus() {
+	pkgdesc="For Mi Pad 4 Plus"
+	depends="linux-postmarketos-qcom-sdm660"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 sha512sums="
-08419372e39578e00965625cc5515ee75c6e092e0f88e9ba9e608bfed3e94baaa07a88aaa405ba4051525f69e8d7ad55c63acee056d53118732139c3d2f4441d  deviceinfo
-709e3b6b082189d3a84e56d624221a6d5e502cd3d2a61080979cabfc2f048dc90b45f2cf1dd79c095e74db726d5670d22772bdc1a3ab6c42f97cd6ac09c86946  modules-initfs
+d3d0ca6a2a8edc471bd1087afa72dbb69d869e597e58867d437be4aa34b0b1dbd637d81c6835a0ba3d9f264ca6d24e7a0d77b892b7d35b48355f02e9e11b6bc7  deviceinfo
+709e3b6b082189d3a84e56d624221a6d5e502cd3d2a61080979cabfc2f048dc90b45f2cf1dd79c095e74db726d5670d22772bdc1a3ab6c42f97cd6ac09c86946  modules-initfs.clover
+103ecf9d5005d44114fa644f61d059b5b22d5936ed71da460e55614ed9ec795595d4e9e2f2b79fb3511751edcf8e88ae134c5530ce037f86ae92c87768396e49  modules-initfs.cloverplus
 "
diff --git a/device/testing/device-xiaomi-clover/deviceinfo b/device/testing/device-xiaomi-clover/deviceinfo
index 97533dd08..7bf03e227 100644
--- a/device/testing/device-xiaomi-clover/deviceinfo
+++ b/device/testing/device-xiaomi-clover/deviceinfo
@@ -7,7 +7,8 @@ deviceinfo_name="Xiaomi Mi Pad 4"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-clover"
 deviceinfo_year="2018"
-deviceinfo_dtb="qcom/sdm660-xiaomi-clover"
+deviceinfo_dtb_clover="qcom/sdm660-xiaomi-clover"
+deviceinfo_dtb_cloverplus="qcom/sdm660-xiaomi-clover-plus"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
 
diff --git a/device/testing/device-xiaomi-clover/modules-initfs b/device/testing/device-xiaomi-clover/modules-initfs.clover
similarity index 100%
rename from device/testing/device-xiaomi-clover/modules-initfs
rename to device/testing/device-xiaomi-clover/modules-initfs.clover
diff --git a/device/testing/device-xiaomi-clover/modules-initfs.cloverplus b/device/testing/device-xiaomi-clover/modules-initfs.cloverplus
new file mode 100644
index 000000000..03ba279d4
--- /dev/null
+++ b/device/testing/device-xiaomi-clover/modules-initfs.cloverplus
@@ -0,0 +1 @@
+goodix_ts