VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   30 Branches   50 Tags
author: andy.hu <andy.hu@starfivetech.com> 2023-10-18 10:50:13 +0000 committer: andy.hu <andy.hu@starfivetech.com> 2023-10-18 10:50:13 +0000 commit: e1e55763e64b85d5ca6e2df05c69babcfd654209 parent: 365f177b130ee3a900d5beed5f4255f2ce2585fe
Commit Summary:
Merge branch 'CR_7889_evb_qspi_5.15_ziv.xu' into 'jh7110-5.15.y-devel'
Diffstat:
2 files changed, 30 insertions, 24 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
index 36988c1f1023..6c9cbbe96cc2 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
@@ -741,3 +741,36 @@
 	memory-region = <&xrp_reserved>;
 	status = "okay";
 };
+
+&qspi {
+    nor_flash: nor-flash@0 {
+    compatible = "jedec,spi-nor";
+    reg=<0>;
+    cdns,read-delay = <5>;
+    spi-max-frequency = <100000000>;
+    cdns,tshsl-ns = <1>;
+    cdns,tsd2d-ns = <1>;
+    cdns,tchsh-ns = <1>;
+    cdns,tslch-ns = <1>;
+    status = "okay";
+
+        partitions {
+            compatible = "fixed-partitions";
+            #address-cells = <1>;
+            #size-cells = <1>;
+
+            spl@0 {
+                reg = <0x0 0x40000>;
+            };
+            uboot-env@100000 {
+                reg = <0xf0000 0x10000>;
+            };
+            uboot@100000 {
+                reg = <0x100000 0x300000>;
+            };
+            data@f00000 {
+                reg = <0xf00000 0x100000>;
+            };
+        };
+    };
+};
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index 29556b3f21ff..79a2f934ede7 100644
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -403,33 +403,6 @@
 			cdns,fifo-width = <4>;
 			cdns,trigger-address = <0x0>;
 			spi-max-frequency = <250000000>;
-
-			nor_flash: nor-flash@0 {
-				compatible = "jedec,spi-nor";
-				reg=<0>;
-				cdns,read-delay = <5>;
-				spi-max-frequency = <100000000>;
-				cdns,tshsl-ns = <1>;
-				cdns,tsd2d-ns = <1>;
-				cdns,tchsh-ns = <1>;
-				cdns,tslch-ns = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					spl@0 {
-						reg = <0x0 0x40000>;
-					};
-					uboot@100000 {
-						reg = <0x100000 0x300000>;
-					};
-					data@f00000 {
-						reg = <0xf00000 0x100000>;
-					};
-				};
-			};
 		};
 
 		otp: otp@17050000 {