changes

msm89xx/image/msm8916.mk

@@ -44,7 +44,6 @@ define Device/generic-sp970
   DEVICE_VENDOR := Generic
   DEVICE_MODEL := SP970
   FILESYSTEMS := squashfs
-  DEVICE_DTS_DIR:=../dts
   DEVICE_PACKAGES := uz801-tweaks wpad-basic-wolfssl rmtfs uci-usb-gadget \
                      block-mount f2fs-tools prepare-rootfs-data \
                      msm8916-sp970-wcnss-firmware msm8916-sp970-wcnss-nv msm8916-sp970-modem-firmware

msm89xx/patches-6.12/801-add-sp970-dts.patch

@@ -1,9 +1,9 @@
 diff --git a/arch/arm64/boot/dts/qcom/msm8916-generic-sp970.dts b/arch/arm64/boot/dts/qcom/msm8916-generic-sp970.dts
 new file mode 100644
-index 000000000000..111111111111
+index 000000000000..222222222222
 --- /dev/null
 +++ b/arch/arm64/boot/dts/qcom/msm8916-generic-sp970.dts
-@@ -0,0 +49 @@
+@@ -0,0 +1,50 @@
 +// SPDX-License-Identifier: GPL-2.0-only
 +
 +/dts-v1/;
@@ -21,9 +21,17 @@ index 000000000000..111111111111
 +};
 +
 +/* RGB LEDs */
-+&led_b { gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>; };
-+&led_g { gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>; };
-+&led_r { gpios = <&tlmm  9 GPIO_ACTIVE_HIGH>; };
++&led_r {
++	gpios = <&tlmm 9 GPIO_ACTIVE_HIGH>;
++};
++
++&led_g {
++	gpios = <&tlmm 10 GPIO_ACTIVE_HIGH>;
++};
++
++&led_b {
++	gpios = <&tlmm 28 GPIO_ACTIVE_HIGH>;
++};
 +
 +/* Pinctrl for button and LEDs */
 +&button_default {
@@ -32,7 +40,7 @@ index 000000000000..111111111111
 +};
 +
 +&gpio_leds_default {
-+	pins = "gpio28", "gpio10", "gpio9";
++	pins = "gpio9", "gpio10", "gpio28";
 +};
 +
 +/* Sleep clock aligned to the typical 32.768 kHz crystal */
@@ -40,16 +48,9 @@ index 000000000000..111111111111
 +	clock-frequency = <32768>;
 +};
 +
-+/* WCNSS (pronto): RF chip and rails */
-+&wcnss {
-+	status = "okay";
-+	iris {
-+		compatible = "qcom,wcn3660b";
-+		/* PM8916 rails (labels provided by msm8916-ufi.dtsi) */
-+		vddxo-supply  = <&pm8916_l7>;
-+		vddrfa-supply = <&pm8916_s3>;
-+		vddpa-supply  = <&pm8916_l9>;
-+		vdddig-supply = <&pm8916_l5>;
-+	};
++/* WCN3660B WiFi/BT - Add critical XO clock */
++&wcnss_iris {
++	compatible = "qcom,wcn3660b";
++	clocks = <&rpmcc RPM_SMD_RF_CLK2>;
++	clock-names = "xo";
 +};
-+