Skip to contentSkip to conversation

riscv: dts: starfive: fix jh7110 qspi sort order

PATCH In review Conor Dooley 2 participants 3 messages Aug 15, 2023

Subsystems (3)
lore
Share & tools
lore

Conor Dooley

author maintainer
#0 lore raw

PATCH 1/1 riscv: dts: starfive: fix jh7110 qspi sort order

From: Conor Dooley <[email protected]>

Emil pointed out that "13010000 sorts after 12070000". Reshuffle the entries to be in-order.

---
 arch/riscv/boot/dts/starfive/jh7110.dtsi | 38 ++++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)
arch/riscv/boot/dts/starfive/jh7110.dtsi +19 -19
index 9aa563898868..e85464c328d0 100644
@@ -676,25 +676,6 @@ i2c6: i2c@12060000 {
 			status = "disabled";
 		};
 
-		qspi: spi@13010000 {
-			compatible = "starfive,jh7110-qspi", "cdns,qspi-nor";
-			reg = <0x0 0x13010000 0x0 0x10000>,
-			      <0x0 0x21000000 0x0 0x400000>;
-			interrupts = <25>;
-			clocks = <&syscrg JH7110_SYSCLK_QSPI_REF>,
-				 <&syscrg JH7110_SYSCLK_QSPI_AHB>,
-				 <&syscrg JH7110_SYSCLK_QSPI_APB>;
-			clock-names = "ref", "ahb", "apb";
-			resets = <&syscrg JH7110_SYSRST_QSPI_APB>,
-				 <&syscrg JH7110_SYSRST_QSPI_AHB>,
-				 <&syscrg JH7110_SYSRST_QSPI_REF>;
-			reset-names = "qspi", "qspi-ocp", "rstc_ref";
-			cdns,fifo-depth = <256>;
-			cdns,fifo-width = <4>;
-			cdns,trigger-address = <0x0>;
-			status = "disabled";
-		};
-
 		spi3: spi@12070000 {
 			compatible = "arm,pl022", "arm,primecell";
 			reg = <0x0 0x12070000 0x0 0x10000>;
@@ -767,6 +748,25 @@ sfctemp: temperature-sensor@120e0000 {
 			#thermal-sensor-cells = <0>;
 		};
 
+		qspi: spi@13010000 {
+			compatible = "starfive,jh7110-qspi", "cdns,qspi-nor";
+			reg = <0x0 0x13010000 0x0 0x10000>,
+			      <0x0 0x21000000 0x0 0x400000>;
+			interrupts = <25>;
+			clocks = <&syscrg JH7110_SYSCLK_QSPI_REF>,
+				 <&syscrg JH7110_SYSCLK_QSPI_AHB>,
+				 <&syscrg JH7110_SYSCLK_QSPI_APB>;
+			clock-names = "ref", "ahb", "apb";
+			resets = <&syscrg JH7110_SYSRST_QSPI_APB>,
+				 <&syscrg JH7110_SYSRST_QSPI_AHB>,
+				 <&syscrg JH7110_SYSRST_QSPI_REF>;
+			reset-names = "qspi", "qspi-ocp", "rstc_ref";
+			cdns,fifo-depth = <256>;
+			cdns,fifo-width = <4>;
+			cdns,trigger-address = <0x0>;
+			status = "disabled";
+		};
+
 		syscrg: clock-controller@13020000 {
 			compatible = "starfive,jh7110-syscrg";
 			reg = <0x0 0x13020000 0x0 0x10000>;
Signature · 7 lines
2.39.2


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Conor Dooley

From: Conor Dooley <[email protected]>

Emil pointed out that "13010000 sorts after 12070000". Reshuffle the entries to be in-order.

Thanks!

Quoted 62 lines
---
 arch/riscv/boot/dts/starfive/jh7110.dtsi | 38 ++++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)
arch/riscv/boot/dts/starfive/jh7110.dtsi +19 -20
index 9aa563898868..e85464c328d0 100644
@@ -676,25 +676,6 @@ i2c6: i2c@12060000 {
                        status = "disabled";
                };
 
-               qspi: spi@13010000 {
-                       compatible = "starfive,jh7110-qspi", "cdns,qspi-nor";
-                       reg = <0x0 0x13010000 0x0 0x10000>,
-                             <0x0 0x21000000 0x0 0x400000>;
-                       interrupts = <25>;
-                       clocks = <&syscrg JH7110_SYSCLK_QSPI_REF>,
-                                <&syscrg JH7110_SYSCLK_QSPI_AHB>,
-                                <&syscrg JH7110_SYSCLK_QSPI_APB>;
-                       clock-names = "ref", "ahb", "apb";
-                       resets = <&syscrg JH7110_SYSRST_QSPI_APB>,
-                                <&syscrg JH7110_SYSRST_QSPI_AHB>,
-                                <&syscrg JH7110_SYSRST_QSPI_REF>;
-                       reset-names = "qspi", "qspi-ocp", "rstc_ref";
-                       cdns,fifo-depth = <256>;
-                       cdns,fifo-width = <4>;
-                       cdns,trigger-address = <0x0>;
-                       status = "disabled";
-               };
-
                spi3: spi@12070000 {
                        compatible = "arm,pl022", "arm,primecell";
                        reg = <0x0 0x12070000 0x0 0x10000>;
@@ -767,6 +748,25 @@ sfctemp: temperature-sensor@120e0000 {
                        #thermal-sensor-cells = <0>;
                };
 
+               qspi: spi@13010000 {
+                       compatible = "starfive,jh7110-qspi", "cdns,qspi-nor";
+                       reg = <0x0 0x13010000 0x0 0x10000>,
+                             <0x0 0x21000000 0x0 0x400000>;
+                       interrupts = <25>;
+                       clocks = <&syscrg JH7110_SYSCLK_QSPI_REF>,
+                                <&syscrg JH7110_SYSCLK_QSPI_AHB>,
+                                <&syscrg JH7110_SYSCLK_QSPI_APB>;
+                       clock-names = "ref", "ahb", "apb";
+                       resets = <&syscrg JH7110_SYSRST_QSPI_APB>,
+                                <&syscrg JH7110_SYSRST_QSPI_AHB>,
+                                <&syscrg JH7110_SYSRST_QSPI_REF>;
+                       reset-names = "qspi", "qspi-ocp", "rstc_ref";
+                       cdns,fifo-depth = <256>;
+                       cdns,fifo-width = <4>;
+                       cdns,trigger-address = <0x0>;
+                       status = "disabled";
+               };
+
                syscrg: clock-controller@13020000 {
                        compatible = "starfive,jh7110-syscrg";
                        reg = <0x0 0x13020000 0x0 0x10000>;
--
Quoted 2 lines

2.39.2

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv

author maintainer
#2 lore raw
Quoted 11 lines · Emil Renner Berthing
Quoted 7 lines · Conor Dooley

From: Conor Dooley <[email protected]>

Emil pointed out that "13010000 sorts after 12070000". Reshuffle the entries to be in-order.

Thanks!

Should be pushed. I'll send it this window if I am supposed to take the Beagle Ahead bits, otherwise at some point in the future...

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv