Redmi Note 8T (willow) is very similar to Redmi Note 8 (ginkgo)
the only difference is willow have NFC.
Make a common base from ginkgo devicetree for both device.

Signed-off-by: Barnabás Czémán <[email protected]>
---
 arch/arm64/boot/dts/qcom/Makefile                  |   1 +
 .../boot/dts/qcom/sm6125-xiaomi-ginkgo-common.dtsi | 302 +++++++++++++++++++++
 arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo.dts  | 296 +-------------------
 arch/arm64/boot/dts/qcom/sm6125-xiaomi-willow.dts  |  13 +
 4 files changed, 318 insertions(+), 294 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/Makefile 
b/arch/arm64/boot/dts/qcom/Makefile
index 0ccd6ec16dfb..b28ad0e57276 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -281,6 +281,7 @@ dtb-$(CONFIG_ARCH_QCOM)     += sm6115p-lenovo-j606f.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sm6125-sony-xperia-seine-pdx201.dtb
 dtb-$(CONFIG_ARCH_QCOM) += sm6125-xiaomi-ginkgo.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sm6125-xiaomi-laurel-sprout.dtb
+dtb-$(CONFIG_ARCH_QCOM)        += sm6125-xiaomi-willow.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sm6350-sony-xperia-lena-pdx213.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sm6375-sony-xperia-murray-pdx225.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sm7125-xiaomi-curtana.dtb
diff --git a/arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo-common.dtsi 
b/arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo-common.dtsi
new file mode 100644
index 000000000000..efe292215f7d
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo-common.dtsi
@@ -0,0 +1,302 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025, Gabriel Gonzales <[email protected]>
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/arm/qcom,ids.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/input/gpio-keys.h>
+#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+#include "sm6125.dtsi"
+#include "pm6125.dtsi"
+
+/delete-node/ &adsp_pil_mem;
+/delete-node/ &cont_splash_mem;
+/delete-node/ &gpu_mem;
+/delete-node/ &ipa_fw_mem;
+/delete-node/ &ipa_gsi_mem;
+
+/ {
+       chassis-type = "handset";
+
+       qcom,msm-id = <QCOM_ID_SM6125 0x10000>;
+
+       chosen {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               framebuffer0: framebuffer@5c000000 {
+                       compatible = "simple-framebuffer";
+                       reg = <0 0x5c000000 0 (2340 * 1080 * 4)>;
+                       width = <1080>;
+                       height = <2340>;
+                       stride = <(1080 * 4)>;
+                       format = "a8r8g8b8";
+               };
+       };
+
+       reserved-memory {
+               adsp_pil_mem: adsp_pil_mem@55300000 {
+                       reg = <0x0 0x55300000 0x0 0x2200000>;
+                       no-map;
+               };
+
+               ipa_fw_mem: ipa_fw_mem@57500000 {
+                       reg = <0x0 0x57500000 0x0 0x10000>;
+                       no-map;
+               };
+
+               ipa_gsi_mem: ipa_gsi_mem@57510000 {
+                       reg = <0x0 0x57510000 0x0 0x5000>;
+                       no-map;
+               };
+
+               gpu_mem: gpu_mem@57515000 {
+                       reg = <0x0 0x57515000 0x0 0x2000>;
+                       no-map;
+               };
+
+               framebuffer@5c000000 {
+                       reg = <0x0 0x5c000000 0x0 (2340 * 1080 * 4)>;
+                       no-map;
+               };
+
+               /*
+                * Matching with recovery values
+                * to be able to get the results.
+                */
+               ramoops@61600000 {
+                       compatible = "ramoops";
+                       reg = <0x0 0x61600000 0x0 0x400000>;
+                       record-size = <0x80000>;
+                       pmsg-size = <0x200000>;
+                       console-size = <0x100000>;
+               };
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+
+               pinctrl-0 = <&vol_up_n>;
+               pinctrl-names = "default";
+
+               key-volume-up {
+                       label = "Volume Up";
+                       gpios = <&pm6125_gpios 6 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_VOLUMEUP>;
+                       debounce-interval = <15>;
+                       linux,can-disable;
+                       wakeup-source;
+               };
+       };
+};
+
+&pm6125_gpios {
+       vol_up_n: vol-up-n-state {
+               pins = "gpio6";
+               function = "normal";
+               power-source = <1>;
+               bias-pull-up;
+               input-enable;
+       };
+};
+
+&hsusb_phy1 {
+       vdd-supply = <&vreg_l7a>;
+       vdda-pll-supply = <&vreg_l10a>;
+       vdda-phy-dpdm-supply = <&vreg_l15a>;
+       status = "okay";
+};
+
+&pon_pwrkey {
+       status = "okay";
+};
+
+&pon_resin {
+       linux,code = <KEY_VOLUMEDOWN>;
+       status = "okay";
+};
+
+&rpm_requests {
+       regulators-0 {
+               compatible = "qcom,rpm-pm6125-regulators";
+
+               vreg_s6a: s6 {
+                       regulator-min-microvolt = <936000>;
+                       regulator-max-microvolt = <1422000>;
+               };
+
+               vreg_l1a: l1 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1256000>;
+               };
+
+               vreg_l2a: l2 {
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1056000>;
+               };
+
+               vreg_l3a: l3 {
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1064000>;
+               };
+
+               vreg_l4a: l4 {
+                       regulator-min-microvolt = <872000>;
+                       regulator-max-microvolt = <976000>;
+                       regulator-allow-set-load;
+               };
+
+               vreg_l5a: l5 {
+                       regulator-min-microvolt = <1648000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-allow-set-load;
+               };
+
+               vreg_l6a: l6 {
+                       regulator-min-microvolt = <576000>;
+                       regulator-max-microvolt = <656000>;
+               };
+
+               vreg_l7a: l7 {
+                       regulator-min-microvolt = <872000>;
+                       regulator-max-microvolt = <976000>;
+               };
+
+               vreg_l8a: l8 {
+                       regulator-min-microvolt = <400000>;
+                       regulator-max-microvolt = <728000>;
+               };
+
+               vreg_l9a: l9 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1896000>;
+               };
+
+               vreg_l10a: l10 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1896000>;
+                       regulator-allow-set-load;
+               };
+
+               vreg_l11a: l11 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1952000>;
+                       regulator-allow-set-load;
+               };
+
+               vreg_l12a: l12 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1996000>;
+               };
+
+               vreg_l13a: l13 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1832000>;
+               };
+
+               vreg_l14a: l14 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1904000>;
+               };
+
+               vreg_l15a: l15 {
+                       regulator-min-microvolt = <3104000>;
+                       regulator-max-microvolt = <3232000>;
+               };
+
+               vreg_l16a: l16 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1904000>;
+               };
+
+               vreg_l17a: l17 {
+                       regulator-min-microvolt = <1248000>;
+                       regulator-max-microvolt = <1304000>;
+               };
+
+               vreg_l18a: l18 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1264000>;
+                       regulator-allow-set-load;
+               };
+
+               vreg_l19a: l19 {
+                       regulator-min-microvolt = <1648000>;
+                       regulator-max-microvolt = <2952000>;
+               };
+
+               vreg_l20a: l20 {
+                       regulator-min-microvolt = <1648000>;
+                       regulator-max-microvolt = <2952000>;
+               };
+
+               vreg_l21a: l21 {
+                       regulator-min-microvolt = <2600000>;
+                       regulator-max-microvolt = <2856000>;
+               };
+
+               vreg_l22a: l22 {
+                       regulator-min-microvolt = <2944000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-allow-set-load;
+               };
+
+               vreg_l23a: l23 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3400000>;
+               };
+
+               vreg_l24a: l24 {
+                       regulator-min-microvolt = <2944000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-allow-set-load;
+               };
+
+       };
+};
+
+&sdc2_off_state {
+       sd-cd-pins {
+               pins = "gpio98";
+               function = "gpio";
+               drive-strength = <2>;
+               bias-disable;
+       };
+};
+
+&sdc2_on_state {
+       sd-cd-pins {
+               pins = "gpio98";
+               function = "gpio";
+               drive-strength = <2>;
+               bias-pull-up;
+       };
+};
+
+&sdhc_1 {
+       vmmc-supply = <&vreg_l24a>;
+       vqmmc-supply = <&vreg_l11a>;
+       status = "okay";
+};
+
+&sdhc_2 {
+       cd-gpios = <&tlmm 98 GPIO_ACTIVE_HIGH>;
+       vmmc-supply = <&vreg_l22a>;
+       vqmmc-supply = <&vreg_l5a>;
+       no-sdio;
+       no-mmc;
+       status = "okay";
+};
+
+&tlmm {
+       gpio-reserved-ranges = <0 4>, <30 4>;
+};
+
+&usb3 {
+       status = "okay";
+};
diff --git a/arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo.dts 
b/arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo.dts
index 163ecdc7fd6c..70be19357d11 100644
--- a/arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo.dts
+++ b/arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo.dts
@@ -1,304 +1,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /*
- * Copyright (c) 2025, Gabriel Gonzales <[email protected]>
+ * Copyright (c) 2026, Barnabas Czeman
  */
-
 /dts-v1/;
 
-#include <dt-bindings/arm/qcom,ids.h>
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/input/gpio-keys.h>
-#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
-#include "sm6125.dtsi"
-#include "pm6125.dtsi"
-
-/delete-node/ &adsp_pil_mem;
-/delete-node/ &cont_splash_mem;
-/delete-node/ &gpu_mem;
-/delete-node/ &ipa_fw_mem;
-/delete-node/ &ipa_gsi_mem;
+#include "sm6125-xiaomi-ginkgo-common.dtsi"
 
 / {
        model = "Xiaomi Redmi Note 8";
        compatible = "xiaomi,ginkgo", "qcom,sm6125";
-       chassis-type = "handset";
-
-       qcom,msm-id = <QCOM_ID_SM6125 0x10000>;
-
-       chosen {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               ranges;
-
-               framebuffer0: framebuffer@5c000000 {
-                       compatible = "simple-framebuffer";
-                       reg = <0 0x5c000000 0 (2340 * 1080 * 4)>;
-                       width = <1080>;
-                       height = <2340>;
-                       stride = <(1080 * 4)>;
-                       format = "a8r8g8b8";
-               };
-       };
-
-       reserved-memory {
-               adsp_pil_mem: adsp_pil_mem@55300000 {
-                       reg = <0x0 0x55300000 0x0 0x2200000>;
-                       no-map;
-               };
-
-               ipa_fw_mem: ipa_fw_mem@57500000 {
-                       reg = <0x0 0x57500000 0x0 0x10000>;
-                       no-map;
-               };
-
-               ipa_gsi_mem: ipa_gsi_mem@57510000 {
-                       reg = <0x0 0x57510000 0x0 0x5000>;
-                       no-map;
-               };
-
-               gpu_mem: gpu_mem@57515000 {
-                       reg = <0x0 0x57515000 0x0 0x2000>;
-                       no-map;
-               };
-
-               framebuffer@5c000000 {
-                       reg = <0x0 0x5c000000 0x0 (2340 * 1080 * 4)>;
-                       no-map;
-               };
-
-               /*
-                * Matching with recovery values
-                * to be able to get the results.
-                */
-               ramoops@61600000 {
-                       compatible = "ramoops";
-                       reg = <0x0 0x61600000 0x0 0x400000>;
-                       record-size = <0x80000>;
-                       pmsg-size = <0x200000>;
-                       console-size = <0x100000>;
-               };
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-
-               pinctrl-0 = <&vol_up_n>;
-               pinctrl-names = "default";
-
-               key-volume-up {
-                       label = "Volume Up";
-                       gpios = <&pm6125_gpios 6 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_VOLUMEUP>;
-                       debounce-interval = <15>;
-                       linux,can-disable;
-                       wakeup-source;
-               };
-       };
-};
-
-&pm6125_gpios {
-       vol_up_n: vol-up-n-state {
-               pins = "gpio6";
-               function = "normal";
-               power-source = <1>;
-               bias-pull-up;
-               input-enable;
-       };
-};
-
-&hsusb_phy1 {
-       vdd-supply = <&vreg_l7a>;
-       vdda-pll-supply = <&vreg_l10a>;
-       vdda-phy-dpdm-supply = <&vreg_l15a>;
-       status = "okay";
-};
-
-&pon_pwrkey {
-       status = "okay";
-};
-
-&pon_resin {
-       linux,code = <KEY_VOLUMEDOWN>;
-       status = "okay";
-};
-
-&rpm_requests {
-       regulators-0 {
-               compatible = "qcom,rpm-pm6125-regulators";
-
-               vreg_s6a: s6 {
-                       regulator-min-microvolt = <936000>;
-                       regulator-max-microvolt = <1422000>;
-               };
-
-               vreg_l1a: l1 {
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1256000>;
-               };
-
-               vreg_l2a: l2 {
-                       regulator-min-microvolt = <1000000>;
-                       regulator-max-microvolt = <1056000>;
-               };
-
-               vreg_l3a: l3 {
-                       regulator-min-microvolt = <1000000>;
-                       regulator-max-microvolt = <1064000>;
-               };
-
-               vreg_l4a: l4 {
-                       regulator-min-microvolt = <872000>;
-                       regulator-max-microvolt = <976000>;
-                       regulator-allow-set-load;
-               };
-
-               vreg_l5a: l5 {
-                       regulator-min-microvolt = <1648000>;
-                       regulator-max-microvolt = <2950000>;
-                       regulator-allow-set-load;
-               };
-
-               vreg_l6a: l6 {
-                       regulator-min-microvolt = <576000>;
-                       regulator-max-microvolt = <656000>;
-               };
-
-               vreg_l7a: l7 {
-                       regulator-min-microvolt = <872000>;
-                       regulator-max-microvolt = <976000>;
-               };
-
-               vreg_l8a: l8 {
-                       regulator-min-microvolt = <400000>;
-                       regulator-max-microvolt = <728000>;
-               };
-
-               vreg_l9a: l9 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1896000>;
-               };
-
-               vreg_l10a: l10 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1896000>;
-                       regulator-allow-set-load;
-               };
-
-               vreg_l11a: l11 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1952000>;
-                       regulator-allow-set-load;
-               };
-
-               vreg_l12a: l12 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1996000>;
-               };
-
-               vreg_l13a: l13 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1832000>;
-               };
-
-               vreg_l14a: l14 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1904000>;
-               };
-
-               vreg_l15a: l15 {
-                       regulator-min-microvolt = <3104000>;
-                       regulator-max-microvolt = <3232000>;
-               };
-
-               vreg_l16a: l16 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1904000>;
-               };
-
-               vreg_l17a: l17 {
-                       regulator-min-microvolt = <1248000>;
-                       regulator-max-microvolt = <1304000>;
-               };
-
-               vreg_l18a: l18 {
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1264000>;
-                       regulator-allow-set-load;
-               };
-
-               vreg_l19a: l19 {
-                       regulator-min-microvolt = <1648000>;
-                       regulator-max-microvolt = <2952000>;
-               };
-
-               vreg_l20a: l20 {
-                       regulator-min-microvolt = <1648000>;
-                       regulator-max-microvolt = <2952000>;
-               };
-
-               vreg_l21a: l21 {
-                       regulator-min-microvolt = <2600000>;
-                       regulator-max-microvolt = <2856000>;
-               };
-
-               vreg_l22a: l22 {
-                       regulator-min-microvolt = <2944000>;
-                       regulator-max-microvolt = <2950000>;
-                       regulator-allow-set-load;
-               };
-
-               vreg_l23a: l23 {
-                       regulator-min-microvolt = <3000000>;
-                       regulator-max-microvolt = <3400000>;
-               };
-
-               vreg_l24a: l24 {
-                       regulator-min-microvolt = <2944000>;
-                       regulator-max-microvolt = <2950000>;
-                       regulator-allow-set-load;
-               };
-
-       };
-};
-
-&sdc2_off_state {
-       sd-cd-pins {
-               pins = "gpio98";
-               function = "gpio";
-               drive-strength = <2>;
-               bias-disable;
-       };
-};
-
-&sdc2_on_state {
-       sd-cd-pins {
-               pins = "gpio98";
-               function = "gpio";
-               drive-strength = <2>;
-               bias-pull-up;
-       };
-};
-
-&sdhc_1 {
-       vmmc-supply = <&vreg_l24a>;
-       vqmmc-supply = <&vreg_l11a>;
-       status = "okay";
-};
-
-&sdhc_2 {
-       cd-gpios = <&tlmm 98 GPIO_ACTIVE_HIGH>;
-       vmmc-supply = <&vreg_l22a>;
-       vqmmc-supply = <&vreg_l5a>;
-       no-sdio;
-       no-mmc;
-       status = "okay";
-};
-
-&tlmm {
-       gpio-reserved-ranges = <0 4>, <30 4>;
-};
-
-&usb3 {
-       status = "okay";
 };
diff --git a/arch/arm64/boot/dts/qcom/sm6125-xiaomi-willow.dts 
b/arch/arm64/boot/dts/qcom/sm6125-xiaomi-willow.dts
new file mode 100644
index 000000000000..9e3aeb5a9e74
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm6125-xiaomi-willow.dts
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2026, Barnabas Czeman
+ */
+/dts-v1/;
+
+#include "sm6125-xiaomi-ginkgo-common.dtsi"
+
+/ {
+       model = "Xiaomi Redmi Note 8T";
+       compatible = "xiaomi,willow", "qcom,sm6125";
+
+};

-- 
2.52.0


Reply via email to