Devicetree
 help / color / mirror / Atom feed
* [PATCH 0/4] arm64: dts: qcom: ipq9650: add and enable various devices
@ 2026-11-20  8:59 Kathiravan Thirumoorthy
  2026-11-20  8:59 ` [PATCH 1/4] arm64: dts: qcom: ipq9650: fix the TCSR mutex address range Kathiravan Thirumoorthy
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Kathiravan Thirumoorthy @ 2026-11-20  8:59 UTC (permalink / raw)
  To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-arm-msm, devicetree, linux-kernel, Kathiravan Thirumoorthy,
	stable, Varadarajan Narayanan

This series adds device tree support for various IPQ9650 peripherals
and extends the RDP488 board support.

It adds QUPv3, download mode, QSPI NAND, BAM, CPU idle states, USB,
DSU PMU, LLCC, SMMU, and eMMC ICE support. It also introduces a common
RDP488 DT file shared by the eMMC and NAND variants and adds the RDP488
NAND variant.

Additionally, fix the incorrect TCSR mutex address range.

Signed-off-by: Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>
---
Kathiravan Thirumoorthy (4):
      arm64: dts: qcom: ipq9650: fix the TCSR mutex address range
      arm64: dts: qcom: ipq9650: add RDP488 common DT file
      arm64: dts: qcom: ipq9650: add and enable various device nodes
      arm64: dts: qcom: ipq9650: Add RDP488 NAND variant

 arch/arm64/boot/dts/qcom/Makefile                  |   2 +-
 .../arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi | 376 +++++++++++++++++++
 arch/arm64/boot/dts/qcom/ipq9650-rdp488-nand.dts   |  17 +
 arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts        | 183 +--------
 arch/arm64/boot/dts/qcom/ipq9650.dtsi              | 411 ++++++++++++++++++++-
 5 files changed, 806 insertions(+), 183 deletions(-)
---
base-commit: adcad7f4e6332cff3d6d7165f41584899f598534
change-id: 20261012-ipq9650_various_devices-fcd1e358cd1e
prerequisite-change-id: 20260820-ctrl-6015e1503b24:v2
prerequisite-patch-id: 648145477ef49e49ea4eac0423acb592882281ce

Best regards,
--  
Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/4] arm64: dts: qcom: ipq9650: fix the TCSR mutex address range
  2026-11-20  8:59 [PATCH 0/4] arm64: dts: qcom: ipq9650: add and enable various devices Kathiravan Thirumoorthy
@ 2026-11-20  8:59 ` Kathiravan Thirumoorthy
  2026-11-20  8:59 ` [PATCH 2/4] arm64: dts: qcom: ipq9650: add RDP488 common DT file Kathiravan Thirumoorthy
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Kathiravan Thirumoorthy @ 2026-11-20  8:59 UTC (permalink / raw)
  To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-arm-msm, devicetree, linux-kernel, Kathiravan Thirumoorthy,
	stable

TCSR mutex region is 0x20000 but it is mistakenly mentioned as 0x57000.
Fix the same.

Cc: stable@vger.kernel.org
Fixes: 8cef25a0044d ("arm64: dts: qcom: add IPQ9650 SoC and rdp488 board support")
Signed-off-by: Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/ipq9650.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/ipq9650.dtsi b/arch/arm64/boot/dts/qcom/ipq9650.dtsi
index 9ace638e43e2..94269c9c8d6f 100644
--- a/arch/arm64/boot/dts/qcom/ipq9650.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9650.dtsi
@@ -385,7 +385,7 @@ gcc: clock-controller@1800000 {
 
 		tcsr_mutex: hwlock@1917000 {
 			compatible = "qcom,tcsr-mutex";
-			reg = <0x0 0x01917000 0x0 0x57000>;
+			reg = <0x0 0x01917000 0x0 0x20000>;
 			#hwlock-cells = <1>;
 		};
 

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/4] arm64: dts: qcom: ipq9650: add RDP488 common DT file
  2026-11-20  8:59 [PATCH 0/4] arm64: dts: qcom: ipq9650: add and enable various devices Kathiravan Thirumoorthy
  2026-11-20  8:59 ` [PATCH 1/4] arm64: dts: qcom: ipq9650: fix the TCSR mutex address range Kathiravan Thirumoorthy
@ 2026-11-20  8:59 ` Kathiravan Thirumoorthy
  2026-11-20  8:59 ` [PATCH 3/4] arm64: dts: qcom: ipq9650: add and enable various device nodes Kathiravan Thirumoorthy
  2026-11-20  8:59 ` [PATCH 4/4] arm64: dts: qcom: ipq9650: Add RDP488 NAND variant Kathiravan Thirumoorthy
  3 siblings, 0 replies; 7+ messages in thread
From: Kathiravan Thirumoorthy @ 2026-11-20  8:59 UTC (permalink / raw)
  To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-arm-msm, devicetree, linux-kernel, Kathiravan Thirumoorthy

Add a common DT file for RDP488 to share the common definitions
between the eMMC and NAND boards.

Signed-off-by: Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>
---
 .../arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi | 190 +++++++++++++++++++++
 arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts        | 185 +-------------------
 2 files changed, 192 insertions(+), 183 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi b/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi
new file mode 100644
index 000000000000..e51d75bb9576
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi
@@ -0,0 +1,190 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include "ipq9650.dtsi"
+
+/ {
+	aliases {
+		serial0 = &uart1;
+	};
+
+	chosen {
+		stdout-path = "serial0";
+	};
+};
+
+&pcie1 {
+	pinctrl-0 = <&pcie1_default_state>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
+&pcie1_phy {
+	status = "okay";
+};
+
+&pcie1_port0 {
+	reset-gpios = <&tlmm 28 GPIO_ACTIVE_LOW>;
+	wake-gpios = <&tlmm 29 GPIO_ACTIVE_LOW>;
+};
+
+&pcie2 {
+	pinctrl-0 = <&pcie2_default_state>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
+&pcie2_phy {
+	status = "okay";
+};
+
+&pcie2_port0 {
+	reset-gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
+	wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;
+};
+
+&pcie3 {
+	pinctrl-0 = <&pcie3_default_state>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
+&pcie3_phy {
+	status = "okay";
+};
+
+&pcie3_port0 {
+	reset-gpios = <&tlmm 41 GPIO_ACTIVE_LOW>;
+	wake-gpios = <&tlmm 42 GPIO_ACTIVE_LOW>;
+};
+
+&sdhc {
+	max-frequency = <192000000>;
+	bus-width = <4>;
+	mmc-ddr-1_8v;
+	mmc-hs200-1_8v;
+	pinctrl-0 = <&sdhc_default_state>;
+	pinctrl-names = "default";
+};
+
+&sleep_clk {
+	clock-frequency = <32000>;
+};
+
+&tlmm {
+	pcie1_default_state: pcie1-default-state {
+		clkreq-n-pins {
+			pins = "gpio27";
+			function = "pcie1_clk_req_n";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		perst-n-pins {
+			pins = "gpio28";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		wake-n-pins {
+			pins = "gpio29";
+			function = "pcie1_wake";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+
+	pcie2_default_state: pcie2-default-state {
+		clkreq-n-pins {
+			pins = "gpio51";
+			function = "pcie2_clk_req_n";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		perst-n-pins {
+			pins = "gpio52";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		wake-n-pins {
+			pins = "gpio53";
+			function = "pcie2_wake";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+
+	pcie3_default_state: pcie3-default-state {
+		clkreq-n-pins {
+			pins = "gpio40";
+			function = "pcie3_clk_req_n";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		perst-n-pins {
+			pins = "gpio41";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		wake-n-pins {
+			pins = "gpio42";
+			function = "pcie3_wake";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+
+	qup_uart1_default_state: qup-uart1-default-state {
+		pins = "gpio43", "gpio44";
+		function = "qup_se6";
+		drive-strength = <8>;
+		bias-pull-down;
+	};
+
+	sdhc_default_state: sdhc-default-state {
+		clk-pins {
+			pins = "gpio5";
+			function = "sdc_clk";
+			drive-strength = <8>;
+			bias-disable;
+		};
+
+		cmd-pins {
+			pins = "gpio4";
+			function = "sdc_cmd";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		data-pins {
+			pins = "gpio0", "gpio1", "gpio2", "gpio3";
+			function = "sdc_data";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+};
+
+&uart1 {
+	pinctrl-0 = <&qup_uart1_default_state>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
+&xo_board {
+	clock-frequency = <24000000>;
+};
diff --git a/arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts b/arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts
index f6411a55c81e..1ec4c5b91780 100644
--- a/arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts
+++ b/arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts
@@ -5,194 +5,13 @@
 
 /dts-v1/;
 
-#include <dt-bindings/gpio/gpio.h>
-
-#include "ipq9650.dtsi"
+#include "ipq9650-rdp488-common.dtsi"
 
 / {
-	model = "Qualcomm Technologies, Inc. IPQ9650 RDP488";
+	model = "Qualcomm Technologies, Inc. IPQ9650 RDP488 (eMMC)";
 	compatible = "qcom,ipq9650-rdp488", "qcom,ipq9650";
-
-	aliases {
-		serial0 = &uart1;
-	};
-
-	chosen {
-		stdout-path = "serial0";
-	};
-};
-
-&pcie1 {
-	pinctrl-0 = <&pcie1_default_state>;
-	pinctrl-names = "default";
-
-	status = "okay";
-};
-
-&pcie1_phy {
-	status = "okay";
-};
-
-&pcie1_port0 {
-	reset-gpios = <&tlmm 28 GPIO_ACTIVE_LOW>;
-	wake-gpios = <&tlmm 29 GPIO_ACTIVE_LOW>;
-};
-
-&pcie2 {
-	pinctrl-0 = <&pcie2_default_state>;
-	pinctrl-names = "default";
-
-	status = "okay";
-};
-
-&pcie2_phy {
-	status = "okay";
-};
-
-&pcie2_port0 {
-	reset-gpios = <&tlmm 52 GPIO_ACTIVE_LOW>;
-	wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;
-};
-
-&pcie3 {
-	pinctrl-0 = <&pcie3_default_state>;
-	pinctrl-names = "default";
-
-	status = "okay";
-};
-
-&pcie3_phy {
-	status = "okay";
-};
-
-&pcie3_port0 {
-	reset-gpios = <&tlmm 41 GPIO_ACTIVE_LOW>;
-	wake-gpios = <&tlmm 42 GPIO_ACTIVE_LOW>;
 };
 
 &sdhc {
-	max-frequency = <192000000>;
-	bus-width = <4>;
-	mmc-ddr-1_8v;
-	mmc-hs200-1_8v;
-	pinctrl-0 = <&sdhc_default_state>;
-	pinctrl-names = "default";
-
-	status = "okay";
-};
-
-&sleep_clk {
-	clock-frequency = <32000>;
-};
-
-&tlmm {
-	pcie1_default_state: pcie1-default-state {
-		clkreq-n-pins {
-			pins = "gpio27";
-			function = "pcie1_clk_req_n";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		perst-n-pins {
-			pins = "gpio28";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-
-		wake-n-pins {
-			pins = "gpio29";
-			function = "pcie1_wake";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-
-	pcie2_default_state: pcie2-default-state {
-		clkreq-n-pins {
-			pins = "gpio51";
-			function = "pcie2_clk_req_n";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		perst-n-pins {
-			pins = "gpio52";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-
-		wake-n-pins {
-			pins = "gpio53";
-			function = "pcie2_wake";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-
-	pcie3_default_state: pcie3-default-state {
-		clkreq-n-pins {
-			pins = "gpio40";
-			function = "pcie3_clk_req_n";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		perst-n-pins {
-			pins = "gpio41";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-
-		wake-n-pins {
-			pins = "gpio42";
-			function = "pcie3_wake";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-
-	qup_uart1_default_state: qup-uart1-default-state {
-		pins = "gpio43", "gpio44";
-		function = "qup_se6";
-		drive-strength = <8>;
-		bias-pull-down;
-	};
-
-	sdhc_default_state: sdhc-default-state {
-		clk-pins {
-			pins = "gpio5";
-			function = "sdc_clk";
-			drive-strength = <8>;
-			bias-disable;
-		};
-
-		cmd-pins {
-			pins = "gpio4";
-			function = "sdc_cmd";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		data-pins {
-			pins = "gpio0", "gpio1", "gpio2", "gpio3";
-			function = "sdc_data";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-};
-
-&uart1 {
-	pinctrl-0 = <&qup_uart1_default_state>;
-	pinctrl-names = "default";
-
 	status = "okay";
 };
-
-&xo_board {
-	clock-frequency = <24000000>;
-};

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/4] arm64: dts: qcom: ipq9650: add and enable various device nodes
  2026-11-20  8:59 [PATCH 0/4] arm64: dts: qcom: ipq9650: add and enable various devices Kathiravan Thirumoorthy
  2026-11-20  8:59 ` [PATCH 1/4] arm64: dts: qcom: ipq9650: fix the TCSR mutex address range Kathiravan Thirumoorthy
  2026-11-20  8:59 ` [PATCH 2/4] arm64: dts: qcom: ipq9650: add RDP488 common DT file Kathiravan Thirumoorthy
@ 2026-11-20  8:59 ` Kathiravan Thirumoorthy
  2026-11-20  9:32   ` sashiko-bot
  2026-11-20  8:59 ` [PATCH 4/4] arm64: dts: qcom: ipq9650: Add RDP488 NAND variant Kathiravan Thirumoorthy
  3 siblings, 1 reply; 7+ messages in thread
From: Kathiravan Thirumoorthy @ 2026-11-20  8:59 UTC (permalink / raw)
  To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-arm-msm, devicetree, linux-kernel, Kathiravan Thirumoorthy,
	Varadarajan Narayanan

 Add the device tree nodes required to support:
  - QUPv3 nodes for SPI and I2C
  - Download mode support
  - QSPI NAND and BAM
  - CPU Idle States
  - USB2 and USB3
  - DSU PMU
  - LLCC
  - SMMU
  - eMMC ICE

Enable SPI, WPS button, I2C, eMMC ICE USB2 and USB3 on the RDP488, and add
the required USB regulators.

Co-developed-by: Varadarajan Narayanan <varadarajan.narayanan@oss.qualcomm.com>
Signed-off-by: Varadarajan Narayanan <varadarajan.narayanan@oss.qualcomm.com>
Signed-off-by: Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>
---
 .../arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi | 186 ++++++++++
 arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts        |   4 +
 arch/arm64/boot/dts/qcom/ipq9650.dtsi              | 409 ++++++++++++++++++++-
 3 files changed, 598 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi b/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi
index e51d75bb9576..bc2caf42faf5 100644
--- a/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi
@@ -4,6 +4,7 @@
  */
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 #include "ipq9650.dtsi"
 
 / {
@@ -14,6 +15,69 @@ aliases {
 	chosen {
 		stdout-path = "serial0";
 	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		pinctrl-0 = <&gpio_keys_default_state>;
+		pinctrl-names = "default";
+
+		button-wps {
+			label = "wps";
+			linux,code = <KEY_WPS_BUTTON>;
+			gpios = <&tlmm 19 GPIO_ACTIVE_LOW>;
+			debounce-interval = <60>;
+		};
+	};
+
+	vreg_misc_3p3: regulator-usb-3p3 {
+		compatible = "regulator-fixed";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-name = "usb_hs_vdda_3p3";
+	};
+
+	vreg_misc_1p8: regulator-usb-1p8 {
+		compatible = "regulator-fixed";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-name = "vdda_1p8_usb";
+	};
+
+	vreg_misc_0p875: regulator-usb-0p875 {
+		compatible = "regulator-fixed";
+		regulator-min-microvolt = <875000>;
+		regulator-max-microvolt = <875000>;
+		regulator-boot-on;
+		regulator-always-on;
+		regulator-name = "vdd_core_usb";
+	};
+};
+
+&qusb_phy_0 {
+	vdda-pll-supply = <&vreg_misc_0p875>;
+	vdda18-supply = <&vreg_misc_1p8>;
+	vdda33-supply = <&vreg_misc_3p3>;
+
+	status = "okay";
+};
+
+&qusb_phy_1 {
+	vdda-pll-supply = <&vreg_misc_0p875>;
+	vdda18-supply = <&vreg_misc_1p8>;
+	vdda33-supply = <&vreg_misc_3p3>;
+
+	status = "okay";
+};
+
+&i2c2 {
+	pinctrl-0 = <&qup_i2c2_default_state>;
+	pinctrl-names = "default";
+
+	status = "okay";
 };
 
 &pcie1 {
@@ -64,6 +128,23 @@ &pcie3_port0 {
 	wake-gpios = <&tlmm 42 GPIO_ACTIVE_LOW>;
 };
 
+&qpic_nand {
+	pinctrl-0 = <&qpic_snand_default_state>;
+	pinctrl-names = "default";
+
+	flash@0 {
+		compatible = "spi-nand";
+		reg = <0>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		nand-ecc-engine = <&qpic_nand>;
+		nand-ecc-strength = <8>;
+		nand-ecc-step-size = <512>;
+		spi-rx-bus-width = <4>;
+		spi-tx-bus-width = <4>;
+	};
+};
+
 &sdhc {
 	max-frequency = <192000000>;
 	bus-width = <4>;
@@ -73,11 +154,44 @@ &sdhc {
 	pinctrl-names = "default";
 };
 
+&sdhc_ice {
+	status = "okay";
+};
+
+&spi0 {
+	pinctrl-0 = <&spi0_default_state>;
+	pinctrl-names = "default";
+
+	status = "okay";
+
+	flash@0 {
+		compatible = "micron,n25q128a11", "jedec,spi-nor";
+		reg = <0>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		spi-max-frequency = <50000000>;
+	};
+};
+
 &sleep_clk {
 	clock-frequency = <32000>;
 };
 
+&ssphy_0 {
+	vdda-pll-supply = <&vreg_misc_0p875>;
+	vdda-phy-supply = <&vreg_misc_0p875>;
+
+	status = "okay";
+};
+
 &tlmm {
+	gpio_keys_default_state: gpio-keys-default-state {
+		pins = "gpio19";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+
 	pcie1_default_state: pcie1-default-state {
 		clkreq-n-pins {
 			pins = "gpio27";
@@ -147,6 +261,36 @@ wake-n-pins {
 		};
 	};
 
+	qpic_snand_default_state: qpic-snand-default-state {
+		clk-pins {
+			pins = "gpio5";
+			function = "qspi_clk";
+			drive-strength = <8>;
+			bias-disable;
+		};
+
+		cs-pins {
+			pins = "gpio4";
+			function = "qspi_cs_n";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		data-pins {
+			pins = "gpio0", "gpio1", "gpio2", "gpio3";
+			function = "qspi_data";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+
+	qup_i2c2_default_state: qup-i2c2-default-state {
+		pins = "gpio16", "gpio17";
+		function = "qup_se3";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+
 	qup_uart1_default_state: qup-uart1-default-state {
 		pins = "gpio43", "gpio44";
 		function = "qup_se6";
@@ -176,6 +320,48 @@ data-pins {
 			bias-pull-up;
 		};
 	};
+
+	spi0_default_state: spi0-default-state {
+		clk-pins {
+			pins = "gpio6";
+			function = "qup_se0";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		cs-pins {
+			pins = "gpio7";
+			function = "qup_se0";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		miso-pins {
+			pins = "gpio8";
+			function = "qup_se0";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+
+		mosi-pins {
+			pins = "gpio9";
+			function = "qup_se0";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+};
+
+&usb2 {
+	dr_mode = "otg";
+
+	status = "okay";
+};
+
+&usb3 {
+	dr_mode = "otg";
+
+	status = "okay";
 };
 
 &uart1 {
diff --git a/arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts b/arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts
index 1ec4c5b91780..69ce4ccaa3f6 100644
--- a/arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts
+++ b/arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts
@@ -15,3 +15,7 @@ / {
 &sdhc {
 	status = "okay";
 };
+
+&sdhc_ice {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/qcom/ipq9650.dtsi b/arch/arm64/boot/dts/qcom/ipq9650.dtsi
index 94269c9c8d6f..a4091fd0c1ea 100644
--- a/arch/arm64/boot/dts/qcom/ipq9650.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9650.dtsi
@@ -35,6 +35,7 @@ cpu0: cpu@0 {
 			reg = <0x0>;
 			enable-method = "psci";
 			next-level-cache = <&l2_0>;
+			cpu-idle-states = <&little_cpu_sleep_0>;
 
 			l2_0: l2-cache {
 				compatible = "cache";
@@ -56,6 +57,7 @@ cpu1: cpu@100 {
 			reg = <0x100>;
 			enable-method = "psci";
 			next-level-cache = <&l2_100>;
+			cpu-idle-states = <&little_cpu_sleep_0>;
 
 			l2_100: l2-cache {
 				compatible = "cache";
@@ -70,6 +72,7 @@ cpu2: cpu@200 {
 			compatible = "arm,cortex-a55";
 			reg = <0x200>;
 			enable-method = "psci";
+			cpu-idle-states = <&little_cpu_sleep_0>;
 
 			l2_200: l2-cache {
 				compatible = "cache";
@@ -84,6 +87,7 @@ cpu3: cpu@300 {
 			compatible = "arm,cortex-a55";
 			reg = <0x300>;
 			enable-method = "psci";
+			cpu-idle-states = <&little_cpu_sleep_0>;
 
 			l2_300: l2-cache {
 				compatible = "cache";
@@ -99,6 +103,7 @@ cpu4: cpu@400 {
 			reg = <0x400>;
 			enable-method = "psci";
 			next-level-cache = <&l2_400>;
+			cpu-idle-states = <&big_cpu_sleep_0>;
 
 			l2_400: l2-cache {
 				compatible = "cache";
@@ -131,6 +136,30 @@ core4 {
 				};
 			};
 		};
+
+		idle-states {
+			entry-method = "psci";
+
+			little_cpu_sleep_0: cpu-sleep-0 {
+				compatible = "arm,idle-state";
+				idle-state-name = "little-power-down";
+				arm,psci-suspend-param = <0x40000003>;
+				entry-latency-us = <549>;
+				exit-latency-us = <901>;
+				min-residency-us = <1774>;
+				local-timer-stop;
+			};
+
+			big_cpu_sleep_0: cpu-sleep-1 {
+				compatible = "arm,idle-state";
+				idle-state-name = "big-power-down";
+				arm,psci-suspend-param = <0x40000003>;
+				entry-latency-us = <523>;
+				exit-latency-us = <1244>;
+				min-residency-us = <2207>;
+				local-timer-stop;
+			};
+		};
 	};
 
 	firmware {
@@ -141,6 +170,7 @@ optee {
 
 		scm {
 			compatible = "qcom,scm-ipq9650", "qcom,scm";
+			qcom,dload-mode = <&tcsr 0x24100>;
 		};
 	};
 
@@ -160,6 +190,12 @@ pmu-a78 {
 		interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_LOW &ppi_cluster1>;
 	};
 
+	pmu-dsu {
+		compatible = "arm,dsu-pmu";
+		interrupts = <GIC_SPI 50 IRQ_TYPE_EDGE_RISING 0>;
+		cpus = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>, <&cpu4>;
+	};
+
 	psci {
 		compatible = "arm,psci-1.0";
 		method = "smc";
@@ -194,6 +230,30 @@ optee@8a680000 {
 		};
 	};
 
+	i2c_opp_table_32mhz: opp-table-i2c32mhz {
+		compatible = "operating-points-v2";
+
+		opp-32000000 {
+			opp-hz = /bits/ 64 <32000000>;
+		};
+	};
+
+	sdhc_opp_table_300mhz: opp-table-300mhz {
+		compatible = "operating-points-v2";
+
+		opp-300000000 {
+			opp-hz = /bits/ 64 <300000000>;
+		};
+	};
+
+	spi_opp_table_50mhz: opp-table-spi50mhz {
+		compatible = "operating-points-v2";
+
+		opp-50000000 {
+			opp-hz = /bits/ 64 <50000000>;
+		};
+	};
+
 	soc@0 {
 		compatible = "simple-bus";
 		#address-cells = <2>;
@@ -210,6 +270,61 @@ refgen_pcie: regulator@6c000 {
 				      "hclk";
 		};
 
+		qusb_phy_1: phy@71000 {
+			compatible = "qcom,ipq9650-usb-hs-phy";
+			reg = <0x0 0x00071000 0x0 0x114>;
+			#phy-cells = <0>;
+
+			clocks = <&xo_board>;
+			clock-names = "ref";
+
+			qcom,pre-emphasis-amplitude-bp = <10000>;
+
+			resets = <&gcc GCC_QUSB2_1_PHY_BCR>;
+
+			status = "disabled";
+		};
+
+		qusb_phy_0: phy@7b000 {
+			compatible = "qcom,ipq9650-usb-hs-phy";
+			reg = <0x0 0x0007b000 0x0 0x114>;
+			#phy-cells = <0>;
+
+			clocks = <&xo_board>;
+			clock-names = "ref";
+
+			qcom,pre-emphasis-amplitude-bp = <10000>;
+
+			resets = <&gcc GCC_QUSB2_0_PHY_BCR>;
+
+			status = "disabled";
+		};
+
+		ssphy_0: phy@7d000 {
+			compatible = "qcom,ipq9650-qmp-usb3-phy";
+			reg = <0x0 0x0007d000 0x0 0xa00>;
+			#phy-cells = <0>;
+
+			clocks = <&gcc GCC_USB0_AUX_CLK>,
+				 <&xo_board>,
+				 <&gcc GCC_USB0_PHY_CFG_AHB_CLK>,
+				 <&gcc GCC_USB0_PIPE_CLK>;
+			clock-names = "aux",
+				      "ref",
+				      "cfg_ahb",
+				      "pipe";
+
+			resets = <&gcc GCC_USB0_PHY_BCR>,
+				 <&gcc GCC_USB3PHY_0_PHY_BCR>;
+			reset-names = "phy",
+				      "phy_phy";
+
+			#clock-cells = <0>;
+			clock-output-names = "usb0_pipe_clk";
+
+			status = "disabled";
+		};
+
 		pcie0_phy: phy@84000 {
 			compatible = "qcom,ipq9650-qmp-gen3x1-pcie-phy";
 			reg = <0x0 0x00084000 0x0 0x1000>;
@@ -376,7 +491,7 @@ gcc: clock-controller@1800000 {
 				 <&pcie2_phy>,
 				 <&pcie3_phy>,
 				 <&pcie4_phy>,
-				 <0>,
+				 <&ssphy_0>,
 				 <0>;
 			#clock-cells = <1>;
 			#reset-cells = <1>;
@@ -389,6 +504,11 @@ tcsr_mutex: hwlock@1917000 {
 			#hwlock-cells = <1>;
 		};
 
+		tcsr: syscon@1938000 {
+			compatible = "qcom,tcsr-ipq9650", "syscon";
+			reg = <0x0 0x01938000 0x0 0x36000>;
+		};
+
 		qupv3: geniqup@1ac0000 {
 			compatible = "qcom,geni-se-qup";
 			reg = <0x0 0x01ac0000 0x0 0x2000>;
@@ -399,6 +519,84 @@ qupv3: geniqup@1ac0000 {
 			#size-cells = <2>;
 			ranges;
 
+			spi0: spi@1a80000 {
+				compatible = "qcom,geni-spi";
+				reg = <0x0 0x01a80000 0x0 0x4000>;
+				clocks = <&gcc GCC_QUPV3_WRAP_SE0_CLK>;
+				clock-names = "se";
+				interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH 0>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				assigned-clocks = <&gcc GCC_QUPV3_WRAP_SE0_CLK>;
+				operating-points-v2 = <&spi_opp_table_50mhz>;
+
+				status = "disabled";
+			};
+
+			i2c0: i2c@1a84000 {
+				compatible = "qcom,geni-i2c";
+				reg = <0x0 0x01a84000 0x0 0x4000>;
+				clocks = <&gcc GCC_QUPV3_WRAP_SE1_CLK>;
+				clock-names = "se";
+				clock-frequency = <400000>;
+				interrupts = <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH 0>;
+				assigned-clocks = <&gcc GCC_QUPV3_WRAP_SE1_CLK>;
+				operating-points-v2 = <&i2c_opp_table_32mhz>;
+
+				status = "disabled";
+			};
+
+			i2c1: i2c@1a88000 {
+				compatible = "qcom,geni-i2c";
+				reg = <0x0 0x01a88000 0x0 0x4000>;
+				clocks = <&gcc GCC_QUPV3_WRAP_SE2_CLK>;
+				clock-names = "se";
+				clock-frequency = <400000>;
+				interrupts = <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH 0>;
+				assigned-clocks = <&gcc GCC_QUPV3_WRAP_SE2_CLK>;
+				operating-points-v2 = <&i2c_opp_table_32mhz>;
+
+				status = "disabled";
+			};
+
+			i2c2: i2c@1a8c000 {
+				compatible = "qcom,geni-i2c";
+				reg = <0x0 0x01a8c000 0x0 0x4000>;
+				clocks = <&gcc GCC_QUPV3_WRAP_SE3_CLK>;
+				clock-names = "se";
+				clock-frequency = <400000>;
+				interrupts = <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH 0>;
+				assigned-clocks = <&gcc GCC_QUPV3_WRAP_SE3_CLK>;
+				operating-points-v2 = <&i2c_opp_table_32mhz>;
+
+				status = "disabled";
+			};
+
+			i2c3: i2c@1a90000 {
+				compatible = "qcom,geni-i2c";
+				reg = <0x0 0x01a90000 0x0 0x4000>;
+				clocks = <&gcc GCC_QUPV3_WRAP_SE4_CLK>;
+				clock-names = "se";
+				clock-frequency = <400000>;
+				interrupts = <GIC_SPI 343 IRQ_TYPE_LEVEL_HIGH 0>;
+				assigned-clocks = <&gcc GCC_QUPV3_WRAP_SE4_CLK>;
+				operating-points-v2 = <&i2c_opp_table_32mhz>;
+
+				status = "disabled";
+			};
+
+			spi1: spi@1a94000 {
+				compatible = "qcom,geni-spi";
+				reg = <0x0 0x01a94000 0x0 0x4000>;
+				clocks = <&gcc GCC_QUPV3_WRAP_SE5_CLK>;
+				clock-names = "se";
+				interrupts = <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH 0>;
+				assigned-clocks = <&gcc GCC_QUPV3_WRAP_SE5_CLK>;
+				operating-points-v2 = <&spi_opp_table_50mhz>;
+
+				status = "disabled";
+			};
+
 			uart1: serial@1a98000 {
 				compatible = "qcom,geni-debug-uart";
 				reg = <0x0 0x01a98000 0x0 0x4000>;
@@ -408,6 +606,75 @@ uart1: serial@1a98000 {
 
 				status = "disabled";
 			};
+
+			i2c4: i2c@1a9c000 {
+				compatible = "qcom,geni-i2c";
+				reg = <0x0 0x01a9c000 0x0 0x4000>;
+				clocks = <&gcc GCC_QUPV3_WRAP_SE7_CLK>;
+				clock-names = "se";
+				clock-frequency = <400000>;
+				interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH 0>;
+				assigned-clocks = <&gcc GCC_QUPV3_WRAP_SE7_CLK>;
+				operating-points-v2 = <&i2c_opp_table_32mhz>;
+
+				status = "disabled";
+			};
+		};
+
+		system-cache-controller@4000000 {
+			compatible = "qcom,ipq9650-llcc";
+			reg = <0x0 0x04000000 0x0 0x200000>;
+			reg-names = "llcc0_base";
+			interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH 0>;
+		};
+
+		usb2: usb@1e00000 {
+			compatible = "qcom,ipq9650-dwc3", "qcom,snps-dwc3";
+			reg = <0x0 0x01e00000 0x0 0x200000>;
+
+			clocks = <&gcc GCC_SNOC_USB_CLK>,
+				 <&gcc GCC_USB1_MASTER_CLK>,
+				 <&gcc GCC_USB1_PHY_CFG_AHB_CLK>,
+				 <&gcc GCC_USB1_SLEEP_CLK>,
+				 <&gcc GCC_USB1_MOCK_UTMI_CLK>;
+
+			clock-names = "cfg_noc",
+				      "core",
+				      "iface",
+				      "sleep",
+				      "mock_utmi";
+
+			assigned-clocks = <&gcc GCC_USB1_MASTER_CLK>,
+					  <&gcc GCC_USB1_MOCK_UTMI_CLK>;
+			assigned-clock-rates = <200000000>,
+					       <24000000>;
+
+			interrupts-extended = <&intc GIC_SPI 383 IRQ_TYPE_LEVEL_HIGH 0>,
+					      <&intc GIC_SPI 395 IRQ_TYPE_LEVEL_HIGH 0>,
+					      <&intc GIC_SPI 384 IRQ_TYPE_LEVEL_HIGH 0>,
+					      <&intc GIC_SPI 388 IRQ_TYPE_LEVEL_HIGH 0>,
+					      <&intc GIC_SPI 387 IRQ_TYPE_LEVEL_HIGH 0>;
+			interrupt-names = "dwc_usb3",
+					  "pwr_event",
+					  "qusb2_phy",
+					  "dp_hs_phy_irq",
+					  "dm_hs_phy_irq";
+
+			phys = <&qusb_phy_1>;
+			phy-names = "usb2-phy";
+
+			resets = <&gcc GCC_USB1_BCR>;
+
+			qcom,select-utmi-as-pipe-clk;
+			snps,dis_u2_susphy_quirk;
+			snps,dis_u3_susphy_quirk;
+			snps,hird-threshold = /bits/ 8 <0x0>;
+			snps,is-utmi-l1-suspend;
+			tx-fifo-resize;
+
+			maximum-speed = "high-speed";
+
+			status = "disabled";
 		};
 
 		sdhc: mmc@7804000 {
@@ -429,6 +696,102 @@ sdhc: mmc@7804000 {
 				      "core",
 				      "xo";
 			non-removable;
+			qcom,ice = <&sdhc_ice>;
+			operating-points-v2 = <&sdhc_opp_table_300mhz>;
+			supports-cqe;
+
+			status = "disabled";
+		};
+
+		sdhc_ice: crypto@7808000 {
+			compatible = "qcom,ipq9650-inline-crypto-engine",
+				     "qcom,inline-crypto-engine";
+			reg = <0x0 0x07808000 0x0 0x2000>;
+
+			clocks = <&gcc GCC_SDCC1_ICE_CORE_CLK>,
+				 <&gcc GCC_SDCC1_AHB_CLK>;
+			clock-names = "core",
+				      "iface";
+
+			status = "disabled";
+		};
+
+		qpic_bam: dma-controller@7984000 {
+			compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
+			reg = <0x0 0x7984000 0x0 0x1c000>;
+			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH 0>;
+			clocks = <&gcc GCC_QPIC_AHB_CLK>;
+			clock-names = "bam_clk";
+			#dma-cells = <1>;
+			qcom,ee = <0>;
+		};
+
+		qpic_nand: spi@79b0000 {
+			compatible = "qcom,ipq9650-snand", "qcom,ipq9574-snand";
+			reg = <0x0 0x79b0000 0x0 0x10000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			clocks = <&gcc GCC_QPIC_CLK>,
+				 <&gcc GCC_QPIC_AHB_CLK>,
+				 <&gcc GCC_QPIC_IO_MACRO_CLK>;
+			clock-names = "core",
+				      "aon",
+				      "iom";
+
+			dmas = <&qpic_bam 0>,
+			       <&qpic_bam 1>,
+			       <&qpic_bam 2>;
+			dma-names = "tx",
+				    "rx",
+				    "cmd";
+
+			status = "disabled";
+		};
+
+		usb3: usb@8a00000 {
+			compatible = "qcom,ipq9650-dwc3", "qcom,snps-dwc3";
+			reg = <0x0 0x08a00000 0x0 0x200000>;
+
+			clocks = <&gcc GCC_SNOC_USB_CLK>,
+				 <&gcc GCC_USB0_MASTER_CLK>,
+				 <&gcc GCC_USB0_PHY_CFG_AHB_CLK>,
+				 <&gcc GCC_USB0_SLEEP_CLK>,
+				 <&gcc GCC_USB0_MOCK_UTMI_CLK>;
+
+			clock-names = "cfg_noc",
+				      "core",
+				      "iface",
+				      "sleep",
+				      "mock_utmi";
+
+			assigned-clocks = <&gcc GCC_USB0_MASTER_CLK>,
+					  <&gcc GCC_USB0_MOCK_UTMI_CLK>;
+			assigned-clock-rates = <200000000>,
+					       <24000000>;
+
+			interrupts-extended = <&intc GIC_SPI 409 IRQ_TYPE_LEVEL_HIGH 0>,
+					      <&intc GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH 0>,
+					      <&intc GIC_SPI 413 IRQ_TYPE_LEVEL_HIGH 0>,
+					      <&intc GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH 0>,
+					      <&intc GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH 0>;
+			interrupt-names = "dwc_usb3",
+					  "pwr_event",
+					  "qusb2_phy",
+					  "dp_hs_phy_irq",
+					  "dm_hs_phy_irq";
+
+			phys = <&qusb_phy_0>,
+			       <&ssphy_0>;
+			phy-names = "usb2-phy",
+				    "usb3-phy";
+
+			resets = <&gcc GCC_USB_BCR>;
+
+			snps,hird-threshold = /bits/ 8 <0x0>;
+			snps,is-utmi-l1-suspend;
+			snps,dis_u2_susphy_quirk;
+			snps,dis_u3_susphy_quirk;
+			tx-fifo-resize;
 
 			status = "disabled";
 		};
@@ -528,6 +891,50 @@ frame@f42d000 {
 			};
 		};
 
+		iommu@15000000 {
+			compatible = "qcom,ipq9650-smmu-500",
+				     "qcom,smmu-500",
+				     "arm,mmu-500";
+			reg = <0x0 0x15000000 0x0 0x40000>;
+
+			interrupts = <GIC_SPI 527 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 530 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 531 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 532 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 533 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 534 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 535 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 536 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 537 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 538 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 539 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 540 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 541 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 542 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 543 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 544 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 545 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 546 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 547 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 548 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 549 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 550 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 551 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 552 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 553 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 554 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 555 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 556 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 557 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 558 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 559 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 560 IRQ_TYPE_LEVEL_HIGH 0>,
+				     <GIC_SPI 561 IRQ_TYPE_LEVEL_HIGH 0>;
+
+			#iommu-cells = <2>;
+			#global-interrupts = <1>;
+		};
+
 		pcie3: pcie@30000000 {
 			compatible = "qcom,pcie-ipq9650", "qcom,pcie-ipq9574";
 			reg = <0x0 0x30000000 0x0 0xf1d>,

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 4/4] arm64: dts: qcom: ipq9650: Add RDP488 NAND variant
  2026-11-20  8:59 [PATCH 0/4] arm64: dts: qcom: ipq9650: add and enable various devices Kathiravan Thirumoorthy
                   ` (2 preceding siblings ...)
  2026-11-20  8:59 ` [PATCH 3/4] arm64: dts: qcom: ipq9650: add and enable various device nodes Kathiravan Thirumoorthy
@ 2026-11-20  8:59 ` Kathiravan Thirumoorthy
  2026-11-20  9:07   ` sashiko-bot
  3 siblings, 1 reply; 7+ messages in thread
From: Kathiravan Thirumoorthy @ 2026-11-20  8:59 UTC (permalink / raw)
  To: Bjorn Andersson, Konrad Dybcio, Abel Vesa, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley
  Cc: linux-arm-msm, devicetree, linux-kernel, Kathiravan Thirumoorthy

Add the RDP488 NAND variant DT file, include it in the Makefile,
and enable the QPIC node.

Signed-off-by: Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/Makefile                |  2 +-
 arch/arm64/boot/dts/qcom/ipq9650-rdp488-nand.dts | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 19310879349d..f3d3de3a1f7b 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -60,7 +60,7 @@ dtb-$(CONFIG_ARCH_QCOM)	+= ipq9574-rdp433.dtb ipq9574-rdp433-emmc.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= ipq9574-rdp449.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= ipq9574-rdp453.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= ipq9574-rdp454.dtb
-dtb-$(CONFIG_ARCH_QCOM)	+= ipq9650-rdp488.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= ipq9650-rdp488.dtb ipq9650-rdp488-nand.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= kaanapali-mtp.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= kaanapali-qrd.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= kaanapali-xiaomi-nezha-cn.dtb kaanapali-xiaomi-nezha-eea.dtb
diff --git a/arch/arm64/boot/dts/qcom/ipq9650-rdp488-nand.dts b/arch/arm64/boot/dts/qcom/ipq9650-rdp488-nand.dts
new file mode 100644
index 000000000000..fe592e04551c
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/ipq9650-rdp488-nand.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ */
+
+/dts-v1/;
+
+#include "ipq9650-rdp488-common.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. IPQ9650 RDP488 (NAND)";
+	compatible = "qcom,ipq9650-rdp488", "qcom,ipq9650";
+};
+
+&qpic_nand {
+	status = "okay";
+};

-- 
2.34.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 4/4] arm64: dts: qcom: ipq9650: Add RDP488 NAND variant
  2026-11-20  8:59 ` [PATCH 4/4] arm64: dts: qcom: ipq9650: Add RDP488 NAND variant Kathiravan Thirumoorthy
@ 2026-11-20  9:07   ` sashiko-bot
  0 siblings, 0 replies; 7+ messages in thread
From: sashiko-bot @ 2026-11-20  9:07 UTC (permalink / raw)
  To: Kathiravan Thirumoorthy; +Cc: devicetree, robh, conor+dt

Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Low] arm64: dts: qcom: ipq9650-rdp488-nand leaves unused sdhc_ice
  enabled
--

commit ad5347a3cef492083ed05d894cccf1bc85330536
Author: Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>

arm64: dts: qcom: ipq9650: Add RDP488 NAND variant

This commit adds the device tree for the IPQ9650 RDP488 NAND variant,
enables the QPIC NAND controller, and adds the target to the Makefile.

> diff --git a/arch/arm64/boot/dts/qcom/ipq9650-rdp488-nand.dts b/arch/arm64/boot/dts/qcom/ipq9650-rdp488-nand.dts
> new file mode 100644
> index 0000000000000..fe592e04551c0
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/ipq9650-rdp488-nand.dts
> @@ -0,0 +1,17 @@
> +// SPDX-License-Identifier: BSD-3-Clause
> +/*
> + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
> + */
> +
> +/dts-v1/;
> +
> +#include "ipq9650-rdp488-common.dtsi"
> +
> +/ {
> +	model = "Qualcomm Technologies, Inc. IPQ9650 RDP488 (NAND)";
> +	compatible = "qcom,ipq9650-rdp488", "qcom,ipq9650";
> +};
> +
> +&qpic_nand {
> +	status = "okay";
> +};

[Severity: Low]
Does including ipq9650-rdp488-common.dtsi leave sdhc_ice enabled on this
NAND variant?

ipq9650-rdp488-common.dtsi sets status = "okay" on &sdhc_ice (in addition
to ipq9650-rdp488.dts enabling both &sdhc and &sdhc_ice).  Because the
NAND variant leaves &sdhc disabled, sdhc_ice still probes and keeps its
clocks enabled for an unused eMMC inline crypto engine.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261120-ipq9650_various_devices-v1-0-14f53b84c42c@oss.qualcomm.com?part=4

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 3/4] arm64: dts: qcom: ipq9650: add and enable various device nodes
  2026-11-20  8:59 ` [PATCH 3/4] arm64: dts: qcom: ipq9650: add and enable various device nodes Kathiravan Thirumoorthy
@ 2026-11-20  9:32   ` sashiko-bot
  0 siblings, 0 replies; 7+ messages in thread
From: sashiko-bot @ 2026-11-20  9:32 UTC (permalink / raw)
  To: Kathiravan Thirumoorthy; +Cc: devicetree, robh, conor+dt

Thank you for your contribution! Sashiko AI review found 8 potential
issues to consider:
- [High] arm64: dts: qcom: ipq9650 QUPv3 I2C/SPI nodes omit
  assigned-clock-rates
- [Medium] arm64: dts: qcom: ipq9650 ssphy_0 reg size 0xa00 truncates
  0xe00 pcs_usb
- [Medium] arm64: dts: qcom: ipq9650 usb3 swaps dp_hs_phy_irq and
  dm_hs_phy_irq IRQs
- [Medium] arm64: dts: qcom: ipq9650 300 MHz OPP table attached to 200
  MHz sdhc
- [Low] arm64: dts: qcom: ipq9650 missing #address-cells/#size-cells on
  spi1 and i2c
- [Low] arm64: dts: qcom: ipq9650 sdhc_ice enabled in both common dtsi
  and board dts
- [Low] arm64: dts: qcom: ipq9650 qpic_bam omits status disabled in SoC
  dtsi
- [Low] arm64: dts: qcom: ipq9650 out-of-order DT nodes in soc@0 and
  rdp488-common
--

commit 72adc63cd895671ec07ed6eae7e42757d9770778
Author: Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>

arm64: dts: qcom: ipq9650: add and enable various device nodes

This commit adds SoC device tree nodes for QUPv3 SPI and I2C, TCSR download
mode, QPIC SPI NAND and BAM, CPU idle states, USB2/USB3 and PHYs, DSU PMU,
LLCC, SMMU, and eMMC ICE on IPQ9650, and enables several peripherals on
RDP488.

> diff --git a/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi b/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi
> index e51d75bb9576e..bc2caf42faf5d 100644
> --- a/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/ipq9650-rdp488-common.dtsi
[ ... ]
> @@ -73,11 +154,44 @@ &sdhc {
>  	pinctrl-names = "default";
>  };
>  
> +&sdhc_ice {
> +	status = "okay";
> +};

[Severity: Low]
Should sdhc_ice only be enabled in ipq9650-rdp488.dts alongside sdhc rather
than in ipq9650-rdp488-common.dtsi?

ipq9650-rdp488.dts already enables sdhc_ice, so enabling it here duplicates
that override on the eMMC board and also probes the Inline Crypto Engine
(keeping GCC_SDCC1_ICE_CORE_CLK and GCC_SDCC1_AHB_CLK enabled) on NAND board
variants where sdhc is disabled.

> diff --git a/arch/arm64/boot/dts/qcom/ipq9650.dtsi b/arch/arm64/boot/dts/qcom/ipq9650.dtsi
> index 94269c9c8d6fe..a4091fd0c1eae 100644
> --- a/arch/arm64/boot/dts/qcom/ipq9650.dtsi
> +++ b/arch/arm64/boot/dts/qcom/ipq9650.dtsi
[ ... ]
> @@ -210,6 +270,61 @@ refgen_pcie: regulator@6c000 {
[ ... ]
> +		ssphy_0: phy@7d000 {
> +			compatible = "qcom,ipq9650-qmp-usb3-phy";
> +			reg = <0x0 0x0007d000 0x0 0xa00>;

[Severity: Medium]
Does the 0xa00 reg size on ssphy_0 truncate the PCS_USB register block at
offset 0xe00?

In drivers/phy/qualcomm/phy-qcom-qmp-usb.c, ipq9650_usb3phy_cfg uses
qmp_usb_offsets_v4, which sets .pcs_usb = 0x0e00, and
ipq9650_usb3_pcs_usb_tbl programs registers up to offset 0x0e18.  Because
qmp_usb_parse_dt() maps resource 0 and computes qmp->pcs_usb = base + 0x0e00,
qmp_usb_power_on() and runtime PM transitions access 0x400 bytes past the
declared 0xa00 resource range.  Should the reg size be 0x1000?

[ ... ]

> @@ -399,6 +519,84 @@ qupv3: geniqup@1ac0000 {
>  			#size-cells = <2>;
>  			ranges;
>  
> +			spi0: spi@1a80000 {
> +				compatible = "qcom,geni-spi";
> +				reg = <0x0 0x01a80000 0x0 0x4000>;
> +				clocks = <&gcc GCC_QUPV3_WRAP_SE0_CLK>;
> +				clock-names = "se";
> +				interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH 0>;
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				assigned-clocks = <&gcc GCC_QUPV3_WRAP_SE0_CLK>;
> +				operating-points-v2 = <&spi_opp_table_50mhz>;
> +
> +				status = "disabled";
> +			};
> +
> +			i2c0: i2c@1a84000 {
> +				compatible = "qcom,geni-i2c";
> +				reg = <0x0 0x01a84000 0x0 0x4000>;
> +				clocks = <&gcc GCC_QUPV3_WRAP_SE1_CLK>;
> +				clock-names = "se";
> +				clock-frequency = <400000>;
> +				interrupts = <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH 0>;
> +				assigned-clocks = <&gcc GCC_QUPV3_WRAP_SE1_CLK>;
> +				operating-points-v2 = <&i2c_opp_table_32mhz>;
> +
> +				status = "disabled";
> +			};

[Severity: High]
Are spi0, spi1, and i2c0..i2c4 missing assigned-clock-rates to match their
assigned-clocks properties?

Without assigned-clock-rates, of_clk_set_defaults() leaves the serial engine
clocks at their boot rate.  Unlike spi-geni-qcom, i2c-qcom-geni never calls
dev_pm_opp_set_rate() to apply i2c_opp_table_32mhz, and instead checks the
current rate of se.clk at probe time:

drivers/i2c/busses/i2c-qcom-geni.c:geni_i2c_clk_map_idx() {
	if (clk_get_rate(gi2c->se.clk) == GENI_SE_CLK_32MHZ) {
		req_freq = GENI_SE_CLK_32MHZ;
		itr = geni_i2c_clk_map_32mhz;
	} else {
		req_freq = GENI_SE_CLK_19P2MHZ;
		itr = geni_i2c_clk_map_19p2mhz;
	}
}

In drivers/clk/qcom/gcc-ipq9650.c, ftbl_gcc_qupv3_wrap_se0_clk_src and
ftbl_gcc_qupv3_wrap_se4_clk_src are derived from a 24 MHz XO reference and
support 32 MHz, not 19.2 MHz.  If GCC_QUPV3_WRAP_SE*_CLK is at its 24 MHz XO
default rather than pre-programmed to 32 MHz by firmware,
geni_se_clk_freq_match() fails with -EINVAL and i2c2 fails to probe on
RDP488.

[ ... ]

> +			spi1: spi@1a94000 {
> +				compatible = "qcom,geni-spi";
> +				reg = <0x0 0x01a94000 0x0 0x4000>;
> +				clocks = <&gcc GCC_QUPV3_WRAP_SE5_CLK>;
> +				clock-names = "se";
> +				interrupts = <GIC_SPI 344 IRQ_TYPE_LEVEL_HIGH 0>;
> +				assigned-clocks = <&gcc GCC_QUPV3_WRAP_SE5_CLK>;
> +				operating-points-v2 = <&spi_opp_table_50mhz>;
> +
> +				status = "disabled";
> +			};

[Severity: Low]
Should spi1 and i2c0..i2c4 define #address-cells = <1> and #size-cells = <0>
like spi0?  Without them, DT schema validation fails and any child SPI or I2C
devices added under those controllers inherit #address-cells = <2> and
#size-cells = <1>.

Conversely, the flash@0 nodes under &qpic_nand and &spi0 in
ipq9650-rdp488-common.dtsi set #address-cells = <1> and #size-cells = <1>
with no child subnodes, which Documentation/devicetree/bindings/mtd/mtd.yaml
marks as deprecated.

[ ... ]

> @@ -408,6 +606,75 @@ uart1: serial@1a98000 {
[ ... ]
> +		system-cache-controller@4000000 {
> +			compatible = "qcom,ipq9650-llcc";
> +			reg = <0x0 0x04000000 0x0 0x200000>;
> +			reg-names = "llcc0_base";
> +			interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH 0>;
> +		};
> +
> +		usb2: usb@1e00000 {

[Severity: Low]
This isn't a bug, but system-cache-controller@4000000 is placed before
usb@1e00000 under soc@0 instead of in unit-address order.  Similarly, in
ipq9650-rdp488-common.dtsi, &qusb_phy_0 and &qusb_phy_1 are placed before
&i2c2, &spi0 before &sleep_clk, and &usb2 and &usb3 before &uart1 instead of
in alphabetical order.

[ ... ]

> @@ -429,6 +696,102 @@ sdhc: mmc@7804000 {
>  				      "core",
>  				      "xo";
>  			non-removable;
> +			qcom,ice = <&sdhc_ice>;
> +			operating-points-v2 = <&sdhc_opp_table_300mhz>;
> +			supports-cqe;
> +
> +			status = "disabled";
> +		};
> +
> +		sdhc_ice: crypto@7808000 {
> +			compatible = "qcom,ipq9650-inline-crypto-engine",
> +				     "qcom,inline-crypto-engine";
> +			reg = <0x0 0x07808000 0x0 0x2000>;
> +
> +			clocks = <&gcc GCC_SDCC1_ICE_CORE_CLK>,
> +				 <&gcc GCC_SDCC1_AHB_CLK>;
> +			clock-names = "core",
> +				      "iface";
> +
> +			status = "disabled";
> +		};

[Severity: Medium]
Is sdhc_opp_table_300mhz (300 MHz) attached to sdhc instead of configuring
the 300 MHz core clock on sdhc_ice?

sdhci_msm_probe() binds sdhc's operating-points-v2 table to its "core" clock
(GCC_SDCC1_APPS_CLK), but in drivers/clk/qcom/gcc-ipq9650.c,
ftbl_gcc_sdcc1_apps_clk_src only supports up to 200 MHz (and
ipq9650-rdp488-common.dtsi sets max-frequency = <192000000>).  300 MHz is the
rate in ftbl_gcc_sdcc1_ice_core_clk_src for sdhc_ice's GCC_SDCC1_ICE_CORE_CLK,
which currently has no rate configured in DT or drivers/soc/qcom/ice.c.
Also, Documentation/devicetree/bindings/mmc/qcom,sdhci-msm.yaml requires
required-opps on every OPP entry in an sdhci-msm opp-table.

> +
> +		qpic_bam: dma-controller@7984000 {
> +			compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
> +			reg = <0x0 0x7984000 0x0 0x1c000>;
> +			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH 0>;
> +			clocks = <&gcc GCC_QPIC_AHB_CLK>;
> +			clock-names = "bam_clk";
> +			#dma-cells = <1>;
> +			qcom,ee = <0>;
> +		};

[Severity: Low]
Should qpic_bam have status = "disabled" in ipq9650.dtsi like its consumer
qpic_nand?  Leaving it enabled causes bam_dma_probe() to probe the QPIC BAM
controller, keep GCC_QPIC_AHB_CLK enabled, and claim IRQ 109 on eMMC board
variants where qpic_nand is disabled.

[ ... ]

> +		usb3: usb@8a00000 {
[ ... ]
> +			interrupts-extended = <&intc GIC_SPI 409 IRQ_TYPE_LEVEL_HIGH 0>,
> +					      <&intc GIC_SPI 412 IRQ_TYPE_LEVEL_HIGH 0>,
> +					      <&intc GIC_SPI 413 IRQ_TYPE_LEVEL_HIGH 0>,
> +					      <&intc GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH 0>,
> +					      <&intc GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH 0>;
> +			interrupt-names = "dwc_usb3",
> +					  "pwr_event",
> +					  "qusb2_phy",
> +					  "dp_hs_phy_irq",
> +					  "dm_hs_phy_irq";

[Severity: Medium]
Are GIC_SPI 423 and GIC_SPI 424 swapped relative to "dp_hs_phy_irq" and
"dm_hs_phy_irq" on usb3?

On usb2 above (where GIC_SPI 388 is dp_hs_phy_irq and GIC_SPI 387 is
dm_hs_phy_irq) and on ipq5424.dtsi (where GIC_SPI 423 is dm_hs_phy_irq and
GIC_SPI 424 is dp_hs_phy_irq), the lower SPI number is DM and the higher SPI
number is DP.  With 423 mapped to dp_hs_phy_irq and 424 mapped to
dm_hs_phy_irq, dwc3_qcom_enable_port_interrupts() monitors D- instead of D+
for High-Speed/Full-Speed devices and D+ instead of D- for Low-Speed devices
during suspend, breaking USB2 wakeup and disconnect detection on usb3.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261120-ipq9650_various_devices-v1-0-14f53b84c42c@oss.qualcomm.com?part=3

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2026-11-20  9:32 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-20  8:59 [PATCH 0/4] arm64: dts: qcom: ipq9650: add and enable various devices Kathiravan Thirumoorthy
2026-11-20  8:59 ` [PATCH 1/4] arm64: dts: qcom: ipq9650: fix the TCSR mutex address range Kathiravan Thirumoorthy
2026-11-20  8:59 ` [PATCH 2/4] arm64: dts: qcom: ipq9650: add RDP488 common DT file Kathiravan Thirumoorthy
2026-11-20  8:59 ` [PATCH 3/4] arm64: dts: qcom: ipq9650: add and enable various device nodes Kathiravan Thirumoorthy
2026-11-20  9:32   ` sashiko-bot
2026-11-20  8:59 ` [PATCH 4/4] arm64: dts: qcom: ipq9650: Add RDP488 NAND variant Kathiravan Thirumoorthy
2026-11-20  9:07   ` sashiko-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox