From 98785ecec80f03d4bdb24df752300561644dd44a Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Sat, 18 Nov 2023 21:00:59 +0100
Subject: [PATCH] [dts] Fix PINE64 device trees for Linux 6.1

Signed-off-by: MichaIng <micha@dietpi.com>
---
 .../dts/starfive/jh7110-pine64-pinetabv.dts   |  4 +--
 .../dts/starfive/jh7110-pine64-pinetabv.dtsi  | 25 +++++++++++--------
 .../dts/starfive/jh7110-pine64-star64.dts     |  4 +--
 .../dts/starfive/jh7110-pine64-star64.dtsi    | 25 +++++++++++--------
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dts b/arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dts
index c96966311a97..67bbe6811732 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dts
@@ -226,13 +226,13 @@
 	status = "okay";
 };
 
-&sdio0 {
+&mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins>;
 	status = "okay";
 };
 
-&sdio1 {
+&mmc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdcard1_pins>;
 	//cd-gpios = <&gpio 41 0>;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dtsi b/arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dtsi
index 3bc32e965938..63b87efb1723 100755
--- a/arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-pine64-pinetabv.dtsi
@@ -23,8 +23,8 @@
 		gpio0 = &gpio;
 		ethernet0 = &gmac0;
 		ethernet1 = &gmac1;
-		mmc0 = &sdio0;
-		mmc1 = &sdio1;
+		mmc0 = &mmc0;
+		mmc1 = &mmc1;
 		serial0 = &uart0;
 		serial3 = &uart3;
 		i2c0 = &i2c0;
@@ -70,10 +70,12 @@
 			reg = <0x0 0x6ce00000 0x0 0x1600000>;
 		};
 
-		hifi4_reserved: hifi4@f0000000 {
-			reg = <0x0 0x69c00000 0x0 0x03001000>;
+		xrp_reserved: xrpbuffer@f0000000 {
+			reg = <0x0 0x69c00000 0x0 0x01ffffff
+				0x0 0x6bc00000 0x0 0x00001000
+				0x0 0x6bc01000 0x0 0x00fff000
+				0x0 0x6cc00000 0x0 0x00001000>;
 		};
-
 	};
 
     vcc5v: vcc5v{
@@ -702,7 +704,7 @@
 
 };
 
-&sdio0 {
+&mmc0 {
 	max-frequency = <100000000>;
 	assigned-clocks = <&clkgen JH7110_SDIO0_CLK_SDCARD>;
 	assigned-clock-rates = <50000000>;
@@ -718,7 +720,7 @@
 	status = "okay";
 };
 
-&sdio1 {
+&mmc1 {
 	max-frequency = <100000000>;
 	assigned-clocks = <&clkgen JH7110_SDIO1_CLK_SDCARD>;
 	assigned-clock-rates = <50000000>;
@@ -987,12 +989,13 @@
 	xhci-lowmem-pool;
 };
 
+&xrp {
+	memory-region = <&xrp_reserved>;	
+	status = "okay";
+};
+
 &ptc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&lcdbl_pins>;
 	status = "okay";
 };
-
-&sof_dsp {
-	memory-region = <&hifi4_reserved>;
-};
\ No newline at end of file
diff --git a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
index 1071e3676d04..8dbe8f894724 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts
@@ -226,13 +226,13 @@
 	status = "okay";
 };
 
-&sdio0 {
+&mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins>;
 	status = "okay";
 };
 
-&sdio1 {
+&mmc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdcard1_pins>;
 	//cd-gpios = <&gpio 41 0>;
diff --git a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dtsi b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dtsi
index 78742b6f01b5..daf8ccb3e534 100755
--- a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dtsi
@@ -21,8 +21,8 @@
 		gpio0 = &gpio;
 		ethernet0 = &gmac0;
 		ethernet1 = &gmac1;
-		mmc0 = &sdio0;
-		mmc1 = &sdio1;
+		mmc0 = &mmc0;
+		mmc1 = &mmc1;
 		serial0 = &uart0;
 		serial3 = &uart3;
 		i2c0 = &i2c0;
@@ -68,10 +68,12 @@
 			reg = <0x0 0x6ce00000 0x0 0x1600000>;
 		};
 
-		hifi4_reserved: hifi4@f0000000 {
-			reg = <0x0 0x69c00000 0x0 0x03001000>;
+		xrp_reserved: xrpbuffer@f0000000 {
+			reg = <0x0 0x69c00000 0x0 0x01ffffff
+				0x0 0x6bc00000 0x0 0x00001000
+				0x0 0x6bc01000 0x0 0x00fff000
+				0x0 0x6cc00000 0x0 0x00001000>;
 		};
-
 	};
 
 	leds {
@@ -493,7 +495,7 @@
 
 };
 
-&sdio0 {
+&mmc0 {
 	max-frequency = <100000000>;
 	assigned-clocks = <&clkgen JH7110_SDIO0_CLK_SDCARD>;
 	assigned-clock-rates = <50000000>;
@@ -509,7 +511,7 @@
 	status = "okay";
 };
 
-&sdio1 {
+&mmc1 {
 	max-frequency = <100000000>;
 	assigned-clocks = <&clkgen JH7110_SDIO0_CLK_SDCARD>;
 	assigned-clock-rates = <50000000>;
@@ -780,12 +782,13 @@
 	pinctrl-0 = <&usb_pins>;
 };
 
+&xrp {
+	memory-region = <&xrp_reserved>;
+	status = "okay";
+};
+
 &ptc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pwm_pins>;
 	status = "okay";
 };
-
-&sof_dsp {
-	memory-region = <&hifi4_reserved>;
-};
\ No newline at end of file