Skip to contentSkip to conversation

Add QSPI and QUPv3 DT nodes for SC7280 SoC

PATCH In review Roja Rani Yarubandi 5 participants 17 messages Jun 4, 2021 – Sep 9, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v3 cover Add QSPI and QUPv3 DT nodes for SC7280 SoC

Hi,

Broken the huge V2 patch into 3 smaller patches.

Roja Rani Yarubandi (3):
arm64: dts: sc7280: Add QSPI node
arm64: dts: sc7280: Add QUPv3 wrapper_0 nodes
arm64: dts: sc7280: Add QUPv3 wrapper_1 nodes

This patch depends on interconnect change [1]
[1] https://lore.kernel.org/patchwork/patch/1392104/

 arch/arm64/boot/dts/qcom/sc7280-idp.dts |  130 +-
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 2726 ++++++++++++++++++-----
 2 files changed, 2262 insertions(+), 594 deletions(-)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member 
of Code Aurora Forum, hosted by The Linux Foundation
#1 lore raw

PATCH v3 1/3 arm64: dts: sc7280: Add QSPI node

Add QSPI DT node for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts | 29 ++++++++++++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 61 +++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +29 -0
index 3900cfc09562..d0edffc15736 100644
@@ -268,6 +268,22 @@ pmr735b_die_temp {
 		};
 };
 
+&qspi {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&qspi_clk>, <&qspi_cs0>, <&qspi_data01>;
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+
+		/* TODO: Increase frequency after testing */
+		spi-max-frequency = <25000000>;
+		spi-tx-bus-width = <2>;
+		spi-rx-bus-width = <2>;
+	};
+};
+
 &qupv3_id_0 {
 	status = "okay";
 };
@@ -278,6 +294,19 @@ &uart5 {
 
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 
+&qspi_cs0 {
+	bias-disable;
+};
+
+&qspi_clk {
+	bias-disable;
+};
+
+&qspi_data01 {
+	/* High-Z when no transfers; nice to park the lines */
+	bias-pull-up;
+};
+
 &qup_uart5_default {
 	tx {
 		pins = "gpio46";
arch/arm64/boot/dts/qcom/sc7280.dtsi +61 -0

73 lines not on this page · raw message

Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member 
of Code Aurora Forum, hosted by The Linux Foundation
#2 lore raw

Re: [PATCH V3 1/3] arm64: dts: sc7280: Add QSPI node

Quoting Roja Rani Yarubandi (2021-06-04 06:54:37)

Quoted 8 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dts +0 -0
index 3900cfc09562..d0edffc15736 100644
@@ -268,6 +268,22 @@ pmr735b_die_temp {
                };
 };
 

arch/arm64/boot/dts/qcom/sc7280-idp.dts pmr735b_die_temp { · line 280

Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dts +10 -0
+&qspi {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&qspi_clk>, <&qspi_cs0>, <&qspi_data01>;
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+
+               /* TODO: Increase frequency after testing */

Is this going to change? Please set it to 37.5MHz if that's the max supported.

Quoted 9 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dts +6 -0
+               spi-max-frequency = <25000000>;
+               spi-tx-bus-width = <2>;
+               spi-rx-bus-width = <2>;
+       };
+};
+
 &qupv3_id_0 {
        status = "okay";
 };
#3 lore raw

Re: [PATCH V3 1/3] arm64: dts: sc7280: Add QSPI node

Quoted 9 lines · Stephen Boyd

Quoting Roja Rani Yarubandi (2021-06-04 06:54:37)

Quoted 8 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dts +0 -0
index 3900cfc09562..d0edffc15736 100644
@@ -268,6 +268,22 @@ pmr735b_die_temp {
                };
 };
 
Quoted 14 lines

arch/arm64/boot/dts/qcom/sc7280-idp.dts pmr735b_die_temp { · line 280

Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dts +10 -0
+&qspi {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&qspi_clk>, <&qspi_cs0>, <&qspi_data01>;
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+
+               /* TODO: Increase frequency after testing */

Is this going to change? Please set it to 37.5MHz if that's the max supported.

Okay, will set it to 37.5MHz.

Thanks,
Roja

Quoted 9 lines
Quoted 9 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dts +6 -0
+               spi-max-frequency = <25000000>;
+               spi-tx-bus-width = <2>;
+               spi-rx-bus-width = <2>;
+       };
+};
+
 &qupv3_id_0 {
        status = "okay";
 };
#4 lore raw

Re: [PATCH V3 1/3] arm64: dts: sc7280: Add QSPI node

In reply to Roja Rani Yarubandi
Quoted 71 lines · Roja Rani Yarubandi

Add QSPI DT node for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts | 29 ++++++++++++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 61 +++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +29 -0
index 3900cfc09562..d0edffc15736 100644
@@ -268,6 +268,22 @@ pmr735b_die_temp {
 		};
 };
 
+&qspi {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&qspi_clk>, <&qspi_cs0>, <&qspi_data01>;
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+
+		/* TODO: Increase frequency after testing */
+		spi-max-frequency = <25000000>;
+		spi-tx-bus-width = <2>;
+		spi-rx-bus-width = <2>;
+	};
+};
+
 &qupv3_id_0 {
 	status = "okay";
 };
@@ -278,6 +294,19 @@ &uart5 {
 
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 
+&qspi_cs0 {
+	bias-disable;
+};
+
+&qspi_clk {
+	bias-disable;
+};
+
+&qspi_data01 {
+	/* High-Z when no transfers; nice to park the lines */
+	bias-pull-up;
+};
+
 &qup_uart5_default {
 	tx {
 		pins = "gpio46";
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -0
index 6c9d5eb93f93..3047ab802cd2 100644

arch/arm64/boot/dts/qcom/sc7280.dtsi apss_merge_funnel_in: endpoint { · line 1064

Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -0
@@ -1061,6 +1061,42 @@ apss_merge_funnel_in: endpoint {
 			};
 		};
 
+		qspi_opp_table: qspi-opp-table {

This node doesn't represents anything on the mmio bus, so it shouldn't live in in /soc. Can't you move it into &qspi?

Regards,
Bjorn

Quoted 34 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +34 -0
+			compatible = "operating-points-v2";
+
+			opp-75000000 {
+				opp-hz = /bits/ 64 <75000000>;
+				required-opps = <&rpmhpd_opp_low_svs>;
+			};
+
+			opp-150000000 {
+				opp-hz = /bits/ 64 <150000000>;
+				required-opps = <&rpmhpd_opp_svs>;
+			};
+
+			opp-300000000 {
+				opp-hz = /bits/ 64 <300000000>;
+				required-opps = <&rpmhpd_opp_nom>;
+			};
+		};
+
+		qspi: spi@88dc000 {
+			compatible = "qcom,qspi-v1";
+			reg = <0 0x088dc000 0 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc GCC_QSPI_CNOC_PERIPH_AHB_CLK>,
+				 <&gcc GCC_QSPI_CORE_CLK>;
+			clock-names = "iface", "core";
+			interconnects = <&gem_noc MASTER_APPSS_PROC 0
+					&cnoc2 SLAVE_QSPI_0 0>;
+			interconnect-names = "qspi-config";
+			power-domains = <&rpmhpd SC7280_CX>;
+			operating-points-v2 = <&qspi_opp_table>;
+			status = "disabled";
+		};
#5 lore raw

Re: [PATCH V3 1/3] arm64: dts: sc7280: Add QSPI node

Quoted 77 lines · Bjorn Andersson
Quoted 75 lines · Roja Rani Yarubandi

Add QSPI DT node for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts | 29 ++++++++++++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 61 
+++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +29 -0
index 3900cfc09562..d0edffc15736 100644
@@ -268,6 +268,22 @@ pmr735b_die_temp {
 		};
 };
 
+&qspi {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&qspi_clk>, <&qspi_cs0>, <&qspi_data01>;
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+
+		/* TODO: Increase frequency after testing */
+		spi-max-frequency = <25000000>;
+		spi-tx-bus-width = <2>;
+		spi-rx-bus-width = <2>;
+	};
+};
+
 &qupv3_id_0 {
 	status = "okay";
 };
@@ -278,6 +294,19 @@ &uart5 {
 
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 
+&qspi_cs0 {
+	bias-disable;
+};
+
+&qspi_clk {
+	bias-disable;
+};
+
+&qspi_data01 {
+	/* High-Z when no transfers; nice to park the lines */
+	bias-pull-up;
+};
+
 &qup_uart5_default {
 	tx {
 		pins = "gpio46";
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -0
index 6c9d5eb93f93..3047ab802cd2 100644
@@ -1061,6 +1061,42 @@ apss_merge_funnel_in: endpoint {
 			};
 		};
 
Quoted 8 lines

arch/arm64/boot/dts/qcom/sc7280.dtsi apss_merge_funnel_in: endpoint { · line 1064

Quoted 1 line
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -0
+		qspi_opp_table: qspi-opp-table {

This node doesn't represents anything on the mmio bus, so it shouldn't live in in /soc. Can't you move it into &qspi?

Regards,
Bjorn

Sure, will move it into qspi node.

Thanks,
Roja

Quoted 34 lines
Quoted 34 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +34 -0
+			compatible = "operating-points-v2";
+
+			opp-75000000 {
+				opp-hz = /bits/ 64 <75000000>;
+				required-opps = <&rpmhpd_opp_low_svs>;
+			};
+
+			opp-150000000 {
+				opp-hz = /bits/ 64 <150000000>;
+				required-opps = <&rpmhpd_opp_svs>;
+			};
+
+			opp-300000000 {
+				opp-hz = /bits/ 64 <300000000>;
+				required-opps = <&rpmhpd_opp_nom>;
+			};
+		};
+
+		qspi: spi@88dc000 {
+			compatible = "qcom,qspi-v1";
+			reg = <0 0x088dc000 0 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc GCC_QSPI_CNOC_PERIPH_AHB_CLK>,
+				 <&gcc GCC_QSPI_CORE_CLK>;
+			clock-names = "iface", "core";
+			interconnects = <&gem_noc MASTER_APPSS_PROC 0
+					&cnoc2 SLAVE_QSPI_0 0>;
+			interconnect-names = "qspi-config";
+			power-domains = <&rpmhpd SC7280_CX>;
+			operating-points-v2 = <&qspi_opp_table>;
+			status = "disabled";
+		};
#6 lore raw

Re: [PATCH V3 1/3] arm64: dts: sc7280: Add QSPI node

Quoted 83 lines · On 2021-06-08 13:37, [email protected] wrote:
Quoted 82 lines · Bjorn Andersson
Quoted 72 lines · Roja Rani Yarubandi

Add QSPI DT node for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts | 29 ++++++++++++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 61 
+++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +29 -0
index 3900cfc09562..d0edffc15736 100644
@@ -268,6 +268,22 @@ pmr735b_die_temp {
 		};
 };
 
+&qspi {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&qspi_clk>, <&qspi_cs0>, <&qspi_data01>;
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+
+		/* TODO: Increase frequency after testing */
+		spi-max-frequency = <25000000>;
+		spi-tx-bus-width = <2>;
+		spi-rx-bus-width = <2>;
+	};
+};
+
 &qupv3_id_0 {
 	status = "okay";
 };
@@ -278,6 +294,19 @@ &uart5 {
 
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 
+&qspi_cs0 {
+	bias-disable;
+};
+
+&qspi_clk {
+	bias-disable;
+};
+
+&qspi_data01 {
+	/* High-Z when no transfers; nice to park the lines */
+	bias-pull-up;
+};
+
 &qup_uart5_default {
 	tx {
 		pins = "gpio46";
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -0
index 6c9d5eb93f93..3047ab802cd2 100644

arch/arm64/boot/dts/qcom/sc7280.dtsi apss_merge_funnel_in: endpoint { · line 1064

Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -0
@@ -1061,6 +1061,42 @@ apss_merge_funnel_in: endpoint {
 			};
 		};
 
+		qspi_opp_table: qspi-opp-table {

This node doesn't represents anything on the mmio bus, so it shouldn't live in in /soc. Can't you move it into &qspi?

Quoted 9 lines
Quoted 3 lines

Regards,
Bjorn

Sure, will move it into qspi node.

Thanks,
Roja

Hi Bjorn,

Moving "qspi_opp_table" inside &qspi node causing this warning:
arch/arm64/boot/dts/qcom/sc7280.dtsi:1055.35-1072.6: Warning (spi_bus_reg): /soc@0/spi@88dc000/qspi-opp-table: missing or empty reg property

Shall I keep the qspi-opp-table out of &qspi node?

Thanks,
Roja

Quoted 34 lines
Quoted 34 lines
Quoted 34 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +34 -0
+			compatible = "operating-points-v2";
+
+			opp-75000000 {
+				opp-hz = /bits/ 64 <75000000>;
+				required-opps = <&rpmhpd_opp_low_svs>;
+			};
+
+			opp-150000000 {
+				opp-hz = /bits/ 64 <150000000>;
+				required-opps = <&rpmhpd_opp_svs>;
+			};
+
+			opp-300000000 {
+				opp-hz = /bits/ 64 <300000000>;
+				required-opps = <&rpmhpd_opp_nom>;
+			};
+		};
+
+		qspi: spi@88dc000 {
+			compatible = "qcom,qspi-v1";
+			reg = <0 0x088dc000 0 0x1000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc GCC_QSPI_CNOC_PERIPH_AHB_CLK>,
+				 <&gcc GCC_QSPI_CORE_CLK>;
+			clock-names = "iface", "core";
+			interconnects = <&gem_noc MASTER_APPSS_PROC 0
+					&cnoc2 SLAVE_QSPI_0 0>;
+			interconnect-names = "qspi-config";
+			power-domains = <&rpmhpd SC7280_CX>;
+			operating-points-v2 = <&qspi_opp_table>;
+			status = "disabled";
+		};
#7 lore raw

Re: [PATCH V3 1/3] arm64: dts: sc7280: Add QSPI node

Quoting [email protected] (2021-07-06 02:19:27)

Quoted 96 lines · On 2021-06-08 13:37, [email protected] wrote:
Quoted 85 lines · Bjorn Andersson
Quoted 84 lines · Roja Rani Yarubandi
Quoted 75 lines

Add QSPI DT node for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts | 29 ++++++++++++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 61
+++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +29 -0
index 3900cfc09562..d0edffc15736 100644
@@ -268,6 +268,22 @@ pmr735b_die_temp {
            };
 };
 
+&qspi {
+   status = "okay";
+   pinctrl-names = "default";
+   pinctrl-0 = <&qspi_clk>, <&qspi_cs0>, <&qspi_data01>;
+
+   flash@0 {
+           compatible = "jedec,spi-nor";
+           reg = <0>;
+
+           /* TODO: Increase frequency after testing */
+           spi-max-frequency = <25000000>;
+           spi-tx-bus-width = <2>;
+           spi-rx-bus-width = <2>;
+   };
+};
+
 &qupv3_id_0 {
    status = "okay";
 };
@@ -278,6 +294,19 @@ &uart5 {
 
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 
+&qspi_cs0 {
+   bias-disable;
+};
+
+&qspi_clk {
+   bias-disable;
+};
+
+&qspi_data01 {
+   /* High-Z when no transfers; nice to park the lines */
+   bias-pull-up;
+};
+
 &qup_uart5_default {
    tx {
            pins = "gpio46";
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -0
index 6c9d5eb93f93..3047ab802cd2 100644

arch/arm64/boot/dts/qcom/sc7280.dtsi apss_merge_funnel_in: endpoint { · line 1064

Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -0
@@ -1061,6 +1061,42 @@ apss_merge_funnel_in: endpoint {
                    };
            };
 
+           qspi_opp_table: qspi-opp-table {

This node doesn't represents anything on the mmio bus, so it shouldn't live in in /soc. Can't you move it into &qspi?

Quoted 9 lines
Quoted 3 lines

Regards,
Bjorn

Sure, will move it into qspi node.

Thanks,
Roja

Quoted 6 lines

Hi Bjorn,

Moving "qspi_opp_table" inside &qspi node causing this warning:
arch/arm64/boot/dts/qcom/sc7280.dtsi:1055.35-1072.6: Warning (spi_bus_reg): /soc@0/spi@88dc000/qspi-opp-table: missing or empty reg property

If DT folks are OK I think we should hard-code 'opp-table' as not a device for spi to populate on the spi bus and relax the warning in the devicetree compiler (see [1] for more details). Technically, nodes that are bus controllers assume all child nodes are devices on that bus. In this case, we want to stick the opp table as a child of the spi node so that it can be called 'opp-table' and not be a node in the root of DT.

Quoted 3 lines

Shall I keep the qspi-opp-table out of &qspi node?

If you do, please move it to / instead of putting it under /soc as it doesn't have an address or a reg property.

[1] https://github.com/dgibson/dtc/blob/69595a167f06c4482ce784e30df1ac9b16ceb5b0/checks.c#L1844

#8 lore raw

Re: [PATCH V3 1/3] arm64: dts: sc7280: Add QSPI node

Quoted 112 lines · Stephen Boyd

Quoting [email protected] (2021-07-06 02:19:27)

Quoted 96 lines · On 2021-06-08 13:37, [email protected] wrote:
Quoted 85 lines · Bjorn Andersson
Quoted 84 lines · Roja Rani Yarubandi
Quoted 75 lines

Add QSPI DT node for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts | 29 ++++++++++++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 61
+++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +29 -0
index 3900cfc09562..d0edffc15736 100644
@@ -268,6 +268,22 @@ pmr735b_die_temp {
            };
 };
 
+&qspi {
+   status = "okay";
+   pinctrl-names = "default";
+   pinctrl-0 = <&qspi_clk>, <&qspi_cs0>, <&qspi_data01>;
+
+   flash@0 {
+           compatible = "jedec,spi-nor";
+           reg = <0>;
+
+           /* TODO: Increase frequency after testing */
+           spi-max-frequency = <25000000>;
+           spi-tx-bus-width = <2>;
+           spi-rx-bus-width = <2>;
+   };
+};
+
 &qupv3_id_0 {
    status = "okay";
 };
@@ -278,6 +294,19 @@ &uart5 {
 
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 
+&qspi_cs0 {
+   bias-disable;
+};
+
+&qspi_clk {
+   bias-disable;
+};
+
+&qspi_data01 {
+   /* High-Z when no transfers; nice to park the lines */
+   bias-pull-up;
+};
+
 &qup_uart5_default {
    tx {
            pins = "gpio46";
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -0
index 6c9d5eb93f93..3047ab802cd2 100644

arch/arm64/boot/dts/qcom/sc7280.dtsi apss_merge_funnel_in: endpoint { · line 1064

Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -0
@@ -1061,6 +1061,42 @@ apss_merge_funnel_in: endpoint {
                    };
            };
 
+           qspi_opp_table: qspi-opp-table {

This node doesn't represents anything on the mmio bus, so it shouldn't live in in /soc. Can't you move it into &qspi?

Quoted 9 lines
Quoted 3 lines

Regards,
Bjorn

Sure, will move it into qspi node.

Thanks,
Roja

Quoted 6 lines

Hi Bjorn,

Moving "qspi_opp_table" inside &qspi node causing this warning:
arch/arm64/boot/dts/qcom/sc7280.dtsi:1055.35-1072.6: Warning (spi_bus_reg): /soc@0/spi@88dc000/qspi-opp-table: missing or empty reg property

If DT folks are OK I think we should hard-code 'opp-table' as not a device for spi to populate on the spi bus and relax the warning in the devicetree compiler (see [1] for more details). Technically, nodes that are bus controllers assume all child nodes are devices on that bus. In this case, we want to stick the opp table as a child of the spi node so that it can be called 'opp-table' and not be a node in the root of DT.

Quoted 1 line
Quoted 6 lines
Quoted 2 lines

Shall I keep the qspi-opp-table out of &qspi node?

If you do, please move it to / instead of putting it under /soc as it doesn't have an address or a reg property.

Hi Bjorn, Rob

Can we move this "qspi_opp_table" to / from /soc?

Thanks,
Roja

Quoted 2 lines

[1]
https://github.com/dgibson/dtc/blob/69595a167f06c4482ce784e30df1ac9b16ceb5b0/checks.c#L1844

#9 lore raw

Re: [PATCH V3 1/3] arm64: dts: sc7280: Add QSPI node

Quoted 116 lines · On Wed 14 Jul 02:47 CDT 2021, [email protected] wrote:
Quoted 115 lines · Stephen Boyd

Quoting [email protected] (2021-07-06 02:19:27)

Quoted 96 lines · On 2021-06-08 13:37, [email protected] wrote:
Quoted 85 lines · Bjorn Andersson
Quoted 84 lines · Roja Rani Yarubandi
Quoted 75 lines

Add QSPI DT node for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts | 29 ++++++++++++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 61
+++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +29 -0
index 3900cfc09562..d0edffc15736 100644
@@ -268,6 +268,22 @@ pmr735b_die_temp {
            };
 };
 
+&qspi {
+   status = "okay";
+   pinctrl-names = "default";
+   pinctrl-0 = <&qspi_clk>, <&qspi_cs0>, <&qspi_data01>;
+
+   flash@0 {
+           compatible = "jedec,spi-nor";
+           reg = <0>;
+
+           /* TODO: Increase frequency after testing */
+           spi-max-frequency = <25000000>;
+           spi-tx-bus-width = <2>;
+           spi-rx-bus-width = <2>;
+   };
+};
+
 &qupv3_id_0 {
    status = "okay";
 };
@@ -278,6 +294,19 @@ &uart5 {
 
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 
+&qspi_cs0 {
+   bias-disable;
+};
+
+&qspi_clk {
+   bias-disable;
+};
+
+&qspi_data01 {
+   /* High-Z when no transfers; nice to park the lines */
+   bias-pull-up;
+};
+
 &qup_uart5_default {
    tx {
            pins = "gpio46";
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -0
index 6c9d5eb93f93..3047ab802cd2 100644

arch/arm64/boot/dts/qcom/sc7280.dtsi apss_merge_funnel_in: endpoint { · line 1064

Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -0
@@ -1061,6 +1061,42 @@ apss_merge_funnel_in: endpoint {
                    };
            };
 
+           qspi_opp_table: qspi-opp-table {

This node doesn't represents anything on the mmio bus, so it shouldn't live in in /soc. Can't you move it into &qspi?

Quoted 9 lines
Quoted 3 lines

Regards,
Bjorn

Sure, will move it into qspi node.

Thanks,
Roja

Quoted 6 lines

Hi Bjorn,

Moving "qspi_opp_table" inside &qspi node causing this warning:
arch/arm64/boot/dts/qcom/sc7280.dtsi:1055.35-1072.6: Warning (spi_bus_reg): /soc@0/spi@88dc000/qspi-opp-table: missing or empty reg property

If DT folks are OK I think we should hard-code 'opp-table' as not a device for spi to populate on the spi bus and relax the warning in the devicetree compiler (see [1] for more details). Technically, nodes that are bus controllers assume all child nodes are devices on that bus. In this case, we want to stick the opp table as a child of the spi node so that it can be called 'opp-table' and not be a node in the root of DT.

Quoted 3 lines

Shall I keep the qspi-opp-table out of &qspi node?

Quoted 8 lines
Quoted 3 lines

If you do, please move it to / instead of putting it under /soc as it doesn't have an address or a reg property.

Hi Bjorn, Rob

Can we move this "qspi_opp_table" to / from /soc?

If you have made a proper attempt to convince Rob and Mark that a child "opp-table" in a SPI master is not a SPI device - and the conclusion is that this is not a good idea...then yes it should live outside /soc.

Thanks,
Bjorn

#10 lore raw

Re: [PATCH V3 1/3] arm64: dts: sc7280: Add QSPI node

Quoted 127 lines · Bjorn Andersson
Quoted 116 lines · On Wed 14 Jul 02:47 CDT 2021, [email protected] wrote:
Quoted 115 lines · Stephen Boyd

Quoting [email protected] (2021-07-06 02:19:27)

Quoted 96 lines · On 2021-06-08 13:37, [email protected] wrote:
Quoted 85 lines · Bjorn Andersson
Quoted 84 lines · Roja Rani Yarubandi
Quoted 75 lines

Add QSPI DT node for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts | 29 ++++++++++++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 61
+++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +29 -0
index 3900cfc09562..d0edffc15736 100644
@@ -268,6 +268,22 @@ pmr735b_die_temp {
            };
 };
 
+&qspi {
+   status = "okay";
+   pinctrl-names = "default";
+   pinctrl-0 = <&qspi_clk>, <&qspi_cs0>, <&qspi_data01>;
+
+   flash@0 {
+           compatible = "jedec,spi-nor";
+           reg = <0>;
+
+           /* TODO: Increase frequency after testing */
+           spi-max-frequency = <25000000>;
+           spi-tx-bus-width = <2>;
+           spi-rx-bus-width = <2>;
+   };
+};
+
 &qupv3_id_0 {
    status = "okay";
 };
@@ -278,6 +294,19 @@ &uart5 {
 
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 
+&qspi_cs0 {
+   bias-disable;
+};
+
+&qspi_clk {
+   bias-disable;
+};
+
+&qspi_data01 {
+   /* High-Z when no transfers; nice to park the lines */
+   bias-pull-up;
+};
+
 &qup_uart5_default {
    tx {
            pins = "gpio46";
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -0
index 6c9d5eb93f93..3047ab802cd2 100644

arch/arm64/boot/dts/qcom/sc7280.dtsi apss_merge_funnel_in: endpoint { · line 1064

Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +1 -0
@@ -1061,6 +1061,42 @@ apss_merge_funnel_in: endpoint {
                    };
            };
 
+           qspi_opp_table: qspi-opp-table {

This node doesn't represents anything on the mmio bus, so it shouldn't live in in /soc. Can't you move it into &qspi?

Quoted 9 lines
Quoted 3 lines

Regards,
Bjorn

Sure, will move it into qspi node.

Thanks,
Roja

Quoted 6 lines

Hi Bjorn,

Moving "qspi_opp_table" inside &qspi node causing this warning:
arch/arm64/boot/dts/qcom/sc7280.dtsi:1055.35-1072.6: Warning (spi_bus_reg): /soc@0/spi@88dc000/qspi-opp-table: missing or empty reg property

If DT folks are OK I think we should hard-code 'opp-table' as not a device for spi to populate on the spi bus and relax the warning in the devicetree compiler (see [1] for more details). Technically, nodes that are bus controllers assume all child nodes are devices on that bus. In this case, we want to stick the opp table as a child of the spi node so that it can be called 'opp-table' and not be a node in the root of DT.

Quoted 3 lines

Shall I keep the qspi-opp-table out of &qspi node?

Quoted 8 lines
Quoted 3 lines

If you do, please move it to / instead of putting it under /soc as it doesn't have an address or a reg property.

Hi Bjorn, Rob

Can we move this "qspi_opp_table" to / from /soc?

Quoted 7 lines

If you have made a proper attempt to convince Rob and Mark that a child "opp-table" in a SPI master is not a SPI device - and the conclusion is that this is not a good idea...then yes it should live outside /soc.

Thanks,
Bjorn

Hi Rob/Mark,

adding "qspi_opp_table" inside &qspi node causing warning
we are getting "empty reg warning". qspi_opp_table contain
frequencies for qspi and i think putting "opp-table" under qspi node is not a
good idea because if we put under qspi it will treat "opp-table" as a device on the bus. in this scenario "opp-table" is not a device on the bus. so we moved qspi_opp_table from /soc to /. please give your inputs about this.

Thanks and Regards,
Rajesh

#11 lore raw

PATCH v3 2/3 arm64: dts: sc7280: Add QUPv3 wrapper_0 nodes

In reply to Roja Rani Yarubandi

Add QUPv3 wrapper_0 DT nodes for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts |  97 ++-
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 750 +++++++++++++++++++++++-
 2 files changed, 835 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +89 -8
index d0edffc15736..f57458dbe763 100644
@@ -292,6 +292,16 @@ &uart5 {
 	status = "okay";
 };
 
+&uart7 {
+	status = "okay";
+
+	/delete-property/interrupts;
+	interrupts-extended = <&intc GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>,
+				<&tlmm 31 IRQ_TYPE_EDGE_FALLING>;
+	pinctrl-names = "default", "sleep";
+	pinctrl-1 = <&qup_uart7_sleep_cts>, <&qup_uart7_sleep_rts>, <&qup_uart7_sleep_tx>, <&qup_uart7_sleep_rx>;
+};
+
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 
 &qspi_cs0 {
@@ -307,16 +317,87 @@ &qspi_data01 {
 	bias-pull-up;
 };
 
-&qup_uart5_default {
-	tx {
-		pins = "gpio46";
-		drive-strength = <2>;
-		bias-disable;
+&qup_uart5_tx {
+	drive-strength = <2>;
+	bias-disable;
+};
+
+&qup_uart5_rx {
+	drive-strength = <2>;
+	bias-pull-up;
+};
+
+&qup_uart7_cts {
+	/*
+	 * Configure a pull-down on CTS to match the pull of
+	 * the Bluetooth module.
+	 */
+	bias-pull-down;
+};
+
+&qup_uart7_rts {
+	/* We'll drive RTS, so no pull */
+	drive-strength = <2>;
+	bias-disable;
+};
+
+&qup_uart7_tx {
+	/* We'll drive TX, so no pull */
+	drive-strength = <2>;
+	bias-disable;
+};
+
+&qup_uart7_rx {
+	/*
+	 * Configure a pull-up on RX. This is needed to avoid
+	 * garbage data when the TX pin of the Bluetooth module is
+	 * in tri-state (module powered off or not driving the
+	 * signal yet).
+	 */
+	bias-pull-up;
+};
+
+&tlmm {
+	qup_uart7_sleep_cts: qup-uart7-sleep-cts {
+		pins = "gpio28";
+		function = "gpio";
+		/*
+		 * Configure a pull-down on CTS to match the pull of
+		 * the Bluetooth module.
+		 */
+		bias-pull-down;
+	};
+
+	qup_uart7_sleep_rts: qup-uart7-sleep-rts {
+		pins = "gpio29";
+		function = "gpio";
+		/*
+		 * Configure pull-down on RTS. As RTS is active low
+		 * signal, pull it low to indicate the BT SoC that it
+		 * can wakeup the system anytime from suspend state by
+		 * pulling RX low (by sending wakeup bytes).
+		 */
+		bias-pull-down;
+	};
+
+	qup_uart7_sleep_tx: qup-uart7-sleep-tx {
+		pins = "gpio30";
+		function = "gpio";
+		/*
+		 * Configure pull-up on TX when it isn't actively driven
+		 * to prevent BT SoC from receiving garbage during sleep.
+		 */
+		bias-pull-up;
 	};
 
-	rx {
-		pins = "gpio47";
-		drive-strength = <2>;
+	qup_uart7_sleep_rx: qup-uart7-sleep-rx {
+		pins = "gpio31";
+		function = "gpio";
+		/*
+		 * Configure a pull-up on RX. This is needed to avoid
+		 * garbage data when the TX pin of the Bluetooth module
+		 * is floating which may cause spurious wakeups.
+		 */
 		bias-pull-up;
 	};
 };
arch/arm64/boot/dts/qcom/sc7280.dtsi +746 -4

777 lines not on this page · raw message

Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member 
of Code Aurora Forum, hosted by The Linux Foundation
#12 lore raw

Re: [PATCH V3 2/3] arm64: dts: sc7280: Add QUPv3 wrapper_0 nodes

Quoted 41 lines · Roja Rani Yarubandi

Add QUPv3 wrapper_0 DT nodes for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts |  97 ++-
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 750 +++++++++++++++++++++++-
 2 files changed, 835 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +10 -0
index d0edffc15736..f57458dbe763 100644
@@ -292,6 +292,16 @@ &uart5 {
 	status = "okay";
 };
 
+&uart7 {
+	status = "okay";
+
+	/delete-property/interrupts;
+	interrupts-extended = <&intc GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>,
+				<&tlmm 31 IRQ_TYPE_EDGE_FALLING>;
+	pinctrl-names = "default", "sleep";
+	pinctrl-1 = <&qup_uart7_sleep_cts>, <&qup_uart7_sleep_rts>, <&qup_uart7_sleep_tx>, <&qup_uart7_sleep_rx>;
+};
+
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 
 &qspi_cs0 {

arch/arm64/boot/dts/qcom/sc7280-idp.dts &qspi_data01 { · line 312

Quoted 6 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dts +0 -3
@@ -307,16 +317,87 @@ &qspi_data01 {
 	bias-pull-up;
 };
 
-&qup_uart5_default {
-	tx {
-		pins = "gpio46";

Commit message says "add stuff", but somehow uart5 is no longer gpio46/47 and these gpios are no longer specified.

Can you roll this in a way where the giant patch actually _only_ adds a whole bunch of stuff?

arch/arm64/boot/dts/qcom/sc7280-idp.dts &qspi_data01 { · line 324

Quoted 7 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dts +5 -2
-		drive-strength = <2>;
-		bias-disable;
+&qup_uart5_tx {
+	drive-strength = <2>;
+	bias-disable;
+};
+

Regards,
Bjorn

#13 lore raw

Re: [PATCH V3 2/3] arm64: dts: sc7280: Add QUPv3 wrapper_0 nodes

Quoted 58 lines · Bjorn Andersson
Quoted 43 lines · Roja Rani Yarubandi

Add QUPv3 wrapper_0 DT nodes for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts |  97 ++-
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 750 
+++++++++++++++++++++++-
 2 files changed, 835 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +10 -0
index d0edffc15736..f57458dbe763 100644
@@ -292,6 +292,16 @@ &uart5 {
 	status = "okay";
 };
 
+&uart7 {
+	status = "okay";
+
+	/delete-property/interrupts;
+	interrupts-extended = <&intc GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>,
+				<&tlmm 31 IRQ_TYPE_EDGE_FALLING>;
+	pinctrl-names = "default", "sleep";
+	pinctrl-1 = <&qup_uart7_sleep_cts>, <&qup_uart7_sleep_rts>, 
 <&qup_uart7_sleep_tx>, <&qup_uart7_sleep_rx>;
+};
+
 /* PINCTRL - additions to nodes defined in sc7280.dtsi */
 

&qspi_cs0 {

arch/arm64/boot/dts/qcom/sc7280-idp.dts &qspi_data01 { · line 312

Quoted 6 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dts +0 -3
@@ -307,16 +317,87 @@ &qspi_data01 {
 	bias-pull-up;
 };
 
-&qup_uart5_default {
-	tx {
-		pins = "gpio46";

Commit message says "add stuff", but somehow uart5 is no longer gpio46/47 and these gpios are no longer specified.

Can you roll this in a way where the giant patch actually _only_ adds a whole bunch of stuff?

Quoted 10 lines

arch/arm64/boot/dts/qcom/sc7280-idp.dts &qspi_data01 { · line 324

Quoted 7 lines
arch/arm64/boot/dts/qcom/sc7280-idp.dts +5 -2
-		drive-strength = <2>;
-		bias-disable;
+&qup_uart5_tx {
+	drive-strength = <2>;
+	bias-disable;
+};
+

Regards,
Bjorn

Okay, so shall I split this 2/3rd patch into two with one patch modifying uart5 node and the other one with _only_ adds rest all nodes?

Thanks,
Roja

#14 lore raw

PATCH v3 3/3 arm64: dts: sc7280: Add QUPv3 wrapper_1 nodes

In reply to Roja Rani Yarubandi

Add QUPv3 wrapper_1 DT nodes for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts |   4 +
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 751 ++++++++++++++++++++++++
 2 files changed, 755 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +4 -0
index f57458dbe763..bdea9bf4eeca 100644
@@ -288,6 +288,10 @@ &qupv3_id_0 {
 	status = "okay";
 };
 
+&qupv3_id_1 {
+	status = "okay";
+};
+
 &uart5 {
 	status = "okay";
 };
arch/arm64/boot/dts/qcom/sc7280.dtsi +751 -0

775 lines not on this page · raw message

Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member 
of Code Aurora Forum, hosted by The Linux Foundation
#15 lore raw

Re: [PATCH V3 3/3] arm64: dts: sc7280: Add QUPv3 wrapper_1 nodes

Quoted 44 lines · Roja Rani Yarubandi

Add QUPv3 wrapper_1 DT nodes for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts |   4 +
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 751 ++++++++++++++++++++++++
 2 files changed, 755 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +4 -0
index f57458dbe763..bdea9bf4eeca 100644
@@ -288,6 +288,10 @@ &qupv3_id_0 {
 	status = "okay";
 };
 
+&qupv3_id_1 {
+	status = "okay";
+};
+
 &uart5 {
 	status = "okay";
 };
arch/arm64/boot/dts/qcom/sc7280.dtsi +2 -0
index b783f5622a66..348a34f3448e 100644
@@ -881,6 +881,437 @@ uart7: serial@99c000 {
 			};
 		};
 
+		qupv3_id_1: geniqup@ac0000 {
+			compatible = "qcom,geni-se-qup";

arch/arm64/boot/dts/qcom/sc7280.dtsi uart7: serial@99c000 { · line 895

Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +10 -0
+			reg = <0 0x00ac0000 0 0x2000>;
+			clock-names = "m-ahb", "s-ahb";
+			clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
+				 <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
+			#address-cells = <2>;
+			#size-cells = <2>;
+			ranges;
+			iommus = <&apps_smmu 0x43 0x0>;
+			interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt SLAVE_QUP_CORE_1 0>;
+			interconnect-names = "qup-core";

We used to have interconnect votes for the wrapper, but I recently merged patches that dropped these for sc7180, so please conclude which way this should be.

The rest looks good.

Regards,
Bjorn

#16 lore raw

Re: [PATCH V3 3/3] arm64: dts: sc7280: Add QUPv3 wrapper_1 nodes

Quoted 63 lines · Bjorn Andersson
Quoted 46 lines · Roja Rani Yarubandi

Add QUPv3 wrapper_1 DT nodes for SC7280 SoC.

---
Changes in V3:
- Broken the huge V2 patch into 3 smaller patches.
1. QSPI DT nodes
2. QUP wrapper_0 DT nodes
3. QUP wrapper_1 DT nodes

Changes in V2:
- As per Doug's comments removed pinmux/pinconf subnodes.
- As per Doug's comments split of SPI, UART nodes has been done.
- Moved QSPI node before aps_smmu as per the order.

 arch/arm64/boot/dts/qcom/sc7280-idp.dts |   4 +
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 751 
++++++++++++++++++++++++
 2 files changed, 755 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +4 -0
index f57458dbe763..bdea9bf4eeca 100644
@@ -288,6 +288,10 @@ &qupv3_id_0 {
 	status = "okay";
 };
 
+&qupv3_id_1 {
+	status = "okay";
+};
+
 &uart5 {
 	status = "okay";
 };
arch/arm64/boot/dts/qcom/sc7280.dtsi +3 -0
index b783f5622a66..348a34f3448e 100644
@@ -881,6 +881,437 @@ uart7: serial@99c000 {
 			};
 		};
 
+		qupv3_id_1: geniqup@ac0000 {
+			compatible = "qcom,geni-se-qup";
+			reg = <0 0x00ac0000 0 0x2000>;

arch/arm64/boot/dts/qcom/sc7280.dtsi uart7: serial@99c000 { · line 896

Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +9 -0
+			clock-names = "m-ahb", "s-ahb";
+			clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
+				 <&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
+			#address-cells = <2>;
+			#size-cells = <2>;
+			ranges;
+			iommus = <&apps_smmu 0x43 0x0>;
+			interconnects = <&clk_virt MASTER_QUP_CORE_1 0 &clk_virt 
 SLAVE_QUP_CORE_1 0>;
+			interconnect-names = "qup-core";

We used to have interconnect votes for the wrapper, but I recently merged patches that dropped these for sc7180, so please conclude which way this should be.

Quoted 4 lines

The rest looks good.

Regards,
Bjorn

Sorry, forgot to remove interconnect votes here for both the wrappers. I will correct this in the follow up patch.

Thanks,
Roja