Merge tag 'qcom-dts-for-6.7-2' into arm32-for-6.8

Below pull request for ARM32 DeviceTree updates for v6.7 was posted to
late to make it into v6.7, merge it into the branch for v6.8.

More Qualcomm Arm32 DeviceTree updates for v6.7

This introduces new DeviceTree source for Microsoft Lumia 640, Microsoft
Lumia 640 XL, Nokia Lumia 735, and Nokia Lumia 830, built on MSM8226 and
MSM8926.

A few stylistic issues are corrected on MSM8974.

diff --cc arch/arm/boot/dts/qcom/Makefile
index c13dddd3c6837ba73a23fc1132a09667d9a6ad6e,a3d293e4082068ce6feacf2c74d54c868141213d..0cb272f4fa45ce8643ccefef19eb2e16037391a6
--- 1/arch/arm/boot/dts/qcom/Makefile
--- 2/arch/arm/boot/dts/qcom/Makefile
+++ b/arch/arm/boot/dts/qcom/Makefile
@@@ -29,7 -32,8 +32,9 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
        qcom-msm8916-samsung-e7.dtb \
        qcom-msm8916-samsung-grandmax.dtb \
        qcom-msm8916-samsung-serranove.dtb \
 +      qcom-msm8926-htc-memul.dtb \
+       qcom-msm8926-microsoft-superman-lte.dtb \
+       qcom-msm8926-microsoft-tesla.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-msm8960-samsung-expressatt.dtb \
        qcom-msm8974-lge-nexus5-hammerhead.dtb \

diff --cc arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi
index 0000000000000000000000000000000000000000,a6fd3acf0bae37fe01d223f99b1290173599c782..525d8c608b06fbc14170e71f5f1bc57dea942517
mode 000000,100644..100644
--- /dev/null
--- 2/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi
@@@ -1,0 -1,327 +1,327 @@@
 -#include "qcom-pm8226.dtsi"
+ // SPDX-License-Identifier: BSD-3-Clause
+ /*
+  * Common Board Device Tree for Microsoft MSM8x26-based Lumias
+  *
+  * Copyright (c) 2023, Jack Matthews <jm5112356@gmail.com>
+  * Copyright (c) 2023, Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
+  * Copyright (c) 2023, Dominik Kobinski <dominikkobinski314@gmail.com>
+  * Copyright (c) 2023, Rayyan Ansari <rayyan@ansari.sh>
+  */
+ 
+ #include "qcom-msm8226.dtsi"
++#include "pm8226.dtsi"
+ #include <dt-bindings/input/input.h>
+ 
+ /*
+  * Delete all generic (msm8226.dtsi) reserved
+  * memory mappings which are different on these devices.
+  */
+ /delete-node/ &smem_region;
+ 
+ / {
+       aliases {
+               mmc0 = &sdhc_1; /* eMMC */
+               mmc1 = &sdhc_2; /* microSD */
+               display0 = &framebuffer;
+       };
+ 
+       chosen {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+ 
+               stdout-path = "display0";
+ 
+               framebuffer: framebuffer@3200000 {
+                       compatible = "simple-framebuffer";
+                       reg = <0x3200000 0x800000>;
+                       format = "a8r8g8b8";
+                       width = <720>;
+                       height = <1280>;
+                       stride = <(720 * 4)>;
+ 
+                       clocks = <&mmcc MDSS_AHB_CLK>,
+                                <&mmcc MDSS_AXI_CLK>,
+                                <&mmcc MDSS_BYTE0_CLK>,
+                                <&mmcc MDSS_MDP_CLK>,
+                                <&mmcc MDSS_PCLK0_CLK>,
+                                <&mmcc MDSS_VSYNC_CLK>;
+                       power-domains = <&mmcc MDSS_GDSC>;
+               };
+       };
+ 
+       gpio_keys: gpio-keys {
+               compatible = "gpio-keys";
+ 
+               pinctrl-0 = <&gpio_keys_default>;
+               pinctrl-names = "default";
+ 
+               label = "GPIO Buttons";
+ 
+               key-volume-up {
+                       label = "Volume Up";
+                       gpios = <&tlmm 106 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_VOLUMEUP>;
+               };
+       };
+ 
+       /*
+        * This device being a WP platform has a different
+        * memory layout than other Android based devices.
+        * This smem memory region is directly copied from
+        * the original UEFI firmware.
+        */
+       reserved-memory {
+               display_reserved: framebuffer@3200000 {
+                       reg = <0x03200000 0x800000>;
+                       no-map;
+               };
+ 
+               smem_region: smem@fa00000 {
+                       reg = <0x0fa00000 0x100000>;
+                       no-map;
+               };
+       };
+ };
+ 
+ &blsp1_i2c5 {
+       status = "okay";
+ 
+       touchscreen: touchscreen@4b {
+               compatible = "syna,rmi4-i2c";
+               reg = <0x4b>;
+ 
+               interrupts-extended = <&tlmm 17 IRQ_TYPE_EDGE_FALLING>;
+               vdd-supply = <&pm8226_l15>;
+               vio-supply = <&pm8226_l6>;
+ 
+               pinctrl-0 = <&touchscreen_default>;
+               pinctrl-names = "default";
+ 
+               #address-cells = <1>;
+               #size-cells = <0>;
+ 
+               rmi4-f01@1 {
+                       reg = <0x01>;
+                       syna,nosleep-mode = <1>;
+               };
+ 
+               rmi4-f11@11 {
+                       reg = <0x11>;
+                       syna,sensor-type = <1>;
+               };
+       };
+ };
+ 
+ &blsp1_uart3 {
+       status = "okay";
+ };
+ 
+ &pm8226_resin {
+       linux,code = <KEY_VOLUMEDOWN>;
+       status = "okay";
+ };
+ 
+ &pm8226_vib {
+       status = "okay";
+ };
+ 
+ &rpm_requests {
+       regulators {
+               compatible = "qcom,rpm-pm8226-regulators";
+ 
+               /* These values were taken from the original firmware DSDT */
+               pm8226_s1: s1 {
+                       regulator-min-microvolt = <1050000>;
+                       regulator-max-microvolt = <1050000>;
+               };
+ 
+               pm8226_s3: s3 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+               };
+ 
+               pm8226_s4: s4 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2100000>;
+               };
+ 
+               pm8226_s5: s5 {
+                       regulator-min-microvolt = <1150000>;
+                       regulator-max-microvolt = <1150000>;
+               };
+ 
+               pm8226_l3: l3 {
+                       regulator-min-microvolt = <750000>;
+                       regulator-max-microvolt = <1150000>;
+               };
+ 
+               pm8226_l4: l4 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+               };
+ 
+               pm8226_l5: l5 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+               };
+ 
+               pm8226_l6: l6 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+ 
+               pm8226_l7: l7 {
+                       regulator-min-microvolt = <1850000>;
+                       regulator-max-microvolt = <1850000>;
+               };
+ 
+               pm8226_l8: l8 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-always-on;
+               };
+ 
+               pm8226_l9: l9 {
+                       regulator-min-microvolt = <2050000>;
+                       regulator-max-microvolt = <2050000>;
+               };
+ 
+               pm8226_l10: l10 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+ 
+               pm8226_l12: l12 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+ 
+               pm8226_l14: l14 {
+                       regulator-min-microvolt = <2750000>;
+                       regulator-max-microvolt = <2750000>;
+               };
+ 
+               pm8226_l15: l15 {
+                       regulator-min-microvolt = <2850000>;
+                       regulator-max-microvolt = <2850000>;
+               };
+ 
+               pm8226_l16: l16 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+               };
+ 
+               pm8226_l17: l17 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-system-load = <200000>;
+                       regulator-allow-set-load;
+               };
+ 
+               pm8226_l18: l18 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-system-load = <200000>;
+                       regulator-allow-set-load;
+               };
+ 
+               pm8226_l19: l19 {
+                       regulator-min-microvolt = <2850000>;
+                       regulator-max-microvolt = <2850000>;
+               };
+ 
+               pm8226_l20: l20 {
+                       regulator-min-microvolt = <3075000>;
+                       regulator-max-microvolt = <3075000>;
+               };
+ 
+               pm8226_l21: l21 {
+                       regulator-min-microvolt = <1850000>;
+                       regulator-max-microvolt = <2950000>;
+               };
+ 
+               pm8226_l22: l22 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+ 
+               pm8226_l23: l23 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+ 
+               pm8226_l24: l24 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+               };
+ 
+               pm8226_l25: l25 {
+                       regulator-min-microvolt = <1775000>;
+                       regulator-max-microvolt = <2075000>;
+               };
+ 
+               pm8226_l27: l27 {
+                       regulator-min-microvolt = <2050000>;
+                       regulator-max-microvolt = <2050000>;
+               };
+ 
+               pm8226_l28: l28 {
+                       regulator-min-microvolt = <2000000>;
+                       regulator-max-microvolt = <3000000>;
+               };
+       };
+ };
+ 
+ &sdhc_1 {
+       vmmc-supply = <&pm8226_l17>;
+       vqmmc-supply = <&pm8226_l6>;
+ 
+       status = "okay";
+ };
+ 
+ &sdhc_2 {
+       vmmc-supply = <&pm8226_l18>;
+       vqmmc-supply = <&pm8226_l21>;
+ 
+       status = "okay";
+ };
+ 
+ &usb {
+       extcon = <&smbb>;
+       dr_mode = "peripheral";
+ 
+       status = "okay";
+ };
+ 
+ &usb_hs_phy {
+       extcon = <&smbb>;
+       v1p8-supply = <&pm8226_l10>;
+       v3p3-supply = <&pm8226_l20>;
+ };
+ 
+ &tlmm {
+       gpio_keys_default: gpio-keys-default-state {
+               pins = "gpio106", "gpio107", "gpio108";
+               function = "gpio";
+               drive-strength = <2>;
+               bias-pull-up;
+       };
+ 
+       touchscreen_default: touchscreen-default-state {
+               irq-pins {
+                       pins = "gpio17";
+                       function = "gpio";
+                       drive-strength = <8>;
+                       bias-pull-up;
+               };
+ 
+               reset-pins {
+                       pins = "gpio16";
+                       function = "gpio";
+                       drive-strength = <8>;
+                       bias-disable;
+                       output-high;
+               };
+       };
+ };

diff --cc arch/arm/boot/dts/qcom/qcom-msm8226.dtsi
Simple merge

diff --cc arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
index f7d7e5d70f30f61fe942fd9e07cebb19a43fdc3c,76006c3c4af23c14cc98102c370116397e250226..ee202f3f161eaedf545d8f812cec44c2c9ea21cc
--- 1/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
--- 2/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom/qcom-msm8974.dtsi
@@@ -346,14 -346,12 +346,20 @@@
                        reg = <0xf9011000 0x1000>;
                };
  
+               saw_l2: power-controller@f9012000 {
+                       compatible = "qcom,saw2";
+                       reg = <0xf9012000 0x1000>;
+                       regulator;
+               };
+ 
 +              watchdog@f9017000 {
 +                      compatible = "qcom,apss-wdt-msm8974", "qcom,kpss-wdt";
 +                      reg = <0xf9017000 0x1000>;
 +                      interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>,
 +                                   <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
 +                      clocks = <&sleep_clk>;
 +              };
 +
                timer@f9020000 {
                        #address-cells = <1>;
                        #size-cells = <1>;