Skip to contentSkip to conversation

arm64: dts: realtek: Initial RTD1395 and BPi-M4 / Lion Skin support

PATCH Applied Andreas Färber 2 participants 12 messages Dec 2, 2019 – Dec 28, 2019

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

v2 cover arm64: dts: realtek: Initial RTD1395 and BPi-M4 / Lion Skin support

Hello,

This patch series adds initial Device Trees for Realtek RTD1395 SoC and Banana Pi BPI-M4 SBC and (new in v2) Realtek Lion Skin EVB.

It is based on my RTD1195 series and James' RTD1619 series.

It starts with some refactorings to align the various SoCs and then introduces an r-bus node and goes on to properly shadow RAM areas.

RTD1395 family seems pretty similar to RTD1295 family, but allows for more RAM, and it uses a different reserved memory region for RPC.
RTD1295 resets appear sufficiently compatible for now (no documentation yet).

More details at:
https://en.opensuse.org/HCL:BananaPi_M4

Latest experimental patches at:
https://github.com/afaerber/linux/commits/rtd1295-next

Have a lot of fun!

Cheers,
Andreas

v1 -> v2:
* RTD1195 patches squashed/moved into RTD1195 v3 series
* Fixed RTD1295 r-bus size (James)
* Use #address-cells/#size-cells of 1 (James)
* Add/update patches to carve out boot ROM from RAM (Rob/James)
* Add patches adding RTD1395 Lion Skin EVB

Andreas Färber (9):
arm64: dts: realtek: rtd129x: Fix GIC CPU masks for RTD1293
arm64: dts: realtek: rtd129x: Use reserved-memory for RPC regions
arm64: dts: realtek: rtd129x: Introduce r-bus
arm64: dts: realtek: rtd129x: Carve out boot ROM from memory
arm64: dts: realtek: rtd16xx: Carve out boot ROM from memory
dt-bindings: arm: realtek: Add RTD1395 and Banana Pi BPI-M4
arm64: dts: realtek: Add RTD1395 and BPi-M4
dt-bindings: arm: realtek: Add Realtek Lion Skin EVB
arm64: dts: realtek: rtd1395: Add Realtek Lion Skin EVB

 Documentation/devicetree/bindings/arm/realtek.yaml |   7 +
 arch/arm64/boot/dts/realtek/Makefile               |   3 +
 arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts     |   6 +-
 arch/arm64/boot/dts/realtek/rtd1293.dtsi           |  12 +-
 arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts    |   6 +-
 .../arm64/boot/dts/realtek/rtd1295-probox2-ava.dts |   6 +-
 arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts  |   4 +-
 arch/arm64/boot/dts/realtek/rtd1295.dtsi           |  21 +--
 arch/arm64/boot/dts/realtek/rtd1296-ds418.dts      |   4 +-
 arch/arm64/boot/dts/realtek/rtd1296.dtsi           |   8 +-
 arch/arm64/boot/dts/realtek/rtd129x.dtsi           | 170 ++++++++++++---------
 arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts     |  30 ++++
 arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts   |  36 +++++
 arch/arm64/boot/dts/realtek/rtd1395.dtsi           |  65 ++++++++
 arch/arm64/boot/dts/realtek/rtd139x.dtsi           | 142 +++++++++++++++++
 arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts    |   5 +-
 arch/arm64/boot/dts/realtek/rtd16xx.dtsi           |   4 +-
 17 files changed, 417 insertions(+), 112 deletions(-)
 create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts
 create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts
 create mode 100644 arch/arm64/boot/dts/realtek/rtd1395.dtsi
 create mode 100644 arch/arm64/boot/dts/realtek/rtd139x.dtsi
Signature · 1 line
2.16.4
#1 lore raw

PATCH v2 1/9 arm64: dts: realtek: rtd129x: Fix GIC CPU masks for RTD1293

Convert from GIC_CPU_MASK_RAW() to GIC_CPU_MASK_SIMPLE().

In case of RTD1293 adjust the arch timer and VGIC interrupts' CPU masks to its smaller number of CPUs.

Fixes cf976f660ee8 ("arm64: dts: realtek: Add RTD1293 and Synology DS418j")

---
v1 -> v2: Unchanged

 arch/arm64/boot/dts/realtek/rtd1293.dtsi | 12 ++++++++----
 arch/arm64/boot/dts/realtek/rtd1295.dtsi |  8 ++++----
 arch/arm64/boot/dts/realtek/rtd1296.dtsi |  8 ++++----
 3 files changed, 16 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/realtek/rtd1293.dtsi +8 -4
index bd4e22723f7b..2d92b56ac94d 100644
@@ -36,16 +36,20 @@
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>,
+			(GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
 			     <GIC_PPI 14
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>,
+			(GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
 			     <GIC_PPI 11
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>,
+			(GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
 			     <GIC_PPI 10
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>;
+			(GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
 	};
 };
 
 &arm_pmu {
 	interrupt-affinity = <&cpu0>, <&cpu1>;
 };
+
+&gic {
+	interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
+};
arch/arm64/boot/dts/realtek/rtd1295.dtsi +4 -4
index 93f0e1d97721..34f6cc6f16fe 100644
@@ -61,13 +61,13 @@
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>,
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 			     <GIC_PPI 14
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>,
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 			     <GIC_PPI 11
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>,
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 			     <GIC_PPI 10
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>;
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
 	};
 };
 
arch/arm64/boot/dts/realtek/rtd1296.dtsi +4 -4
index 0f9e59cac086..fb864a139c97 100644
@@ -50,13 +50,13 @@
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>,
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 			     <GIC_PPI 14
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>,
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 			     <GIC_PPI 11
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>,
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 			     <GIC_PPI 10
-			(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_LOW)>;
+			(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
 	};
 };
 
Signature · 1 line
2.16.4
#2 lore raw

PATCH v2 2/9 arm64: dts: realtek: rtd129x: Use reserved-memory for RPC regions

In reply to Andreas Färber

Move /reserved-memory node from RTD1295 to RTD129x DT. Convert RPC /memreserve/s into /reserved-memory nodes.

Fixes 72a7786c0a0d ("ARM64: dts: Add Realtek RTD1295 and Zidoo X9S")
Fixes f8b3436dad5c ("arm64: dts: realtek: Factor out common RTD129x parts")

---
v1 -> v2: Unchanged
* Added Fixes headers

 arch/arm64/boot/dts/realtek/rtd1295.dtsi | 13 +------------
 arch/arm64/boot/dts/realtek/rtd129x.dtsi | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 15 deletions(-)
arch/arm64/boot/dts/realtek/rtd1295.dtsi +1 -12
index 34f6cc6f16fe..1402abe80ea1 100644
@@ -2,7 +2,7 @@
 /*
  * Realtek RTD1295 SoC
  *
- * Copyright (c) 2016-2017 Andreas Färber
+ * Copyright (c) 2016-2019 Andreas Färber
  */
 
 #include "rtd129x.dtsi"
@@ -47,17 +47,6 @@
 		};
 	};
 
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		tee@10100000 {
-			reg = <0x10100000 0xf00000>;
-			no-map;
-		};
-	};
-
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupts = <GIC_PPI 13
arch/arm64/boot/dts/realtek/rtd129x.dtsi +20 -3
index 4433114476f5..8d80cca945bc 100644
@@ -2,14 +2,12 @@
 /*
  * Realtek RTD1293/RTD1295/RTD1296 SoC
  *
- * Copyright (c) 2016-2017 Andreas Färber
+ * Copyright (c) 2016-2019 Andreas Färber
  */
 
 /memreserve/	0x0000000000000000 0x0000000000030000;
-/memreserve/	0x000000000001f000 0x0000000000001000;
 /memreserve/	0x0000000000030000 0x00000000000d0000;
 /memreserve/	0x0000000001b00000 0x00000000004be000;
-/memreserve/	0x0000000001ffe000 0x0000000000004000;
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/reset/realtek,rtd1295.h>
@@ -19,6 +17,25 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		rpc_comm: rpc@1f000 {
+			reg = <0x1f000 0x1000>;
+		};
+
+		rpc_ringbuf: rpc@1ffe000 {
+			reg = <0x1ffe000 0x4000>;
+		};
+
+		tee: tee@10100000 {
+			reg = <0x10100000 0xf00000>;
+			no-map;
+		};
+	};
+
 	arm_pmu: arm-pmu {
 		compatible = "arm,cortex-a53-pmu";
 		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.16.4
#3 lore raw

PATCH v2 3/9 arm64: dts: realtek: rtd129x: Introduce r-bus

In reply to Andreas Färber

Model Realtek's register bus in DT.

---
v1 -> v2:
* Fixed r-bus size from 0x100000 to 0x200000 (James)
* Renamed node from r-bus to bus (Rob)

 arch/arm64/boot/dts/realtek/rtd129x.dtsi | 136 ++++++++++++++++---------------
 1 file changed, 72 insertions(+), 64 deletions(-)
arch/arm64/boot/dts/realtek/rtd129x.dtsi +72 -64
index 8d80cca945bc..5e755dda7abb 100644
@@ -55,70 +55,78 @@
 		/* Exclude up to 2 GiB of RAM */
 		ranges = <0x80000000 0x80000000 0x80000000>;
 
-		reset1: reset-controller@98000000 {
-			compatible = "snps,dw-low-reset";
-			reg = <0x98000000 0x4>;
-			#reset-cells = <1>;
-		};
-
-		reset2: reset-controller@98000004 {
-			compatible = "snps,dw-low-reset";
-			reg = <0x98000004 0x4>;
-			#reset-cells = <1>;
-		};
-
-		reset3: reset-controller@98000008 {
-			compatible = "snps,dw-low-reset";
-			reg = <0x98000008 0x4>;
-			#reset-cells = <1>;
-		};
-
-		reset4: reset-controller@98000050 {
-			compatible = "snps,dw-low-reset";
-			reg = <0x98000050 0x4>;
-			#reset-cells = <1>;
-		};
-
-		iso_reset: reset-controller@98007088 {
-			compatible = "snps,dw-low-reset";
-			reg = <0x98007088 0x4>;
-			#reset-cells = <1>;
-		};
-
-		wdt: watchdog@98007680 {
-			compatible = "realtek,rtd1295-watchdog";
-			reg = <0x98007680 0x100>;
-			clocks = <&osc27M>;
-		};
-
-		uart0: serial@98007800 {
-			compatible = "snps,dw-apb-uart";
-			reg = <0x98007800 0x400>;
-			reg-shift = <2>;
-			reg-io-width = <4>;
-			clock-frequency = <27000000>;
-			resets = <&iso_reset RTD1295_ISO_RSTN_UR0>;
-			status = "disabled";
-		};
-
-		uart1: serial@9801b200 {
-			compatible = "snps,dw-apb-uart";
-			reg = <0x9801b200 0x100>;
-			reg-shift = <2>;
-			reg-io-width = <4>;
-			clock-frequency = <432000000>;
-			resets = <&reset2 RTD1295_RSTN_UR1>;
-			status = "disabled";
-		};
-
-		uart2: serial@9801b400 {
-			compatible = "snps,dw-apb-uart";
-			reg = <0x9801b400 0x100>;
-			reg-shift = <2>;
-			reg-io-width = <4>;
-			clock-frequency = <432000000>;
-			resets = <&reset2 RTD1295_RSTN_UR2>;
-			status = "disabled";
+		rbus: bus@98000000 {
+			compatible = "simple-bus";
+			reg = <0x98000000 0x200000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x98000000 0x200000>;
+
+			reset1: reset-controller@0 {
+				compatible = "snps,dw-low-reset";
+				reg = <0x0 0x4>;
+				#reset-cells = <1>;
+			};
+
+			reset2: reset-controller@4 {
+				compatible = "snps,dw-low-reset";
+				reg = <0x4 0x4>;
+				#reset-cells = <1>;
+			};
+
+			reset3: reset-controller@8 {
+				compatible = "snps,dw-low-reset";
+				reg = <0x8 0x4>;
+				#reset-cells = <1>;
+			};
+
+			reset4: reset-controller@50 {
+				compatible = "snps,dw-low-reset";
+				reg = <0x50 0x4>;
+				#reset-cells = <1>;
+			};
+
+			iso_reset: reset-controller@7088 {
+				compatible = "snps,dw-low-reset";
+				reg = <0x7088 0x4>;
+				#reset-cells = <1>;
+			};
+
+			wdt: watchdog@7680 {
+				compatible = "realtek,rtd1295-watchdog";
+				reg = <0x7680 0x100>;
+				clocks = <&osc27M>;
+			};
+
+			uart0: serial@7800 {
+				compatible = "snps,dw-apb-uart";
+				reg = <0x7800 0x400>;
+				reg-shift = <2>;
+				reg-io-width = <4>;
+				clock-frequency = <27000000>;
+				resets = <&iso_reset RTD1295_ISO_RSTN_UR0>;
+				status = "disabled";
+			};
+
+			uart1: serial@1b200 {
+				compatible = "snps,dw-apb-uart";
+				reg = <0x1b200 0x100>;
+				reg-shift = <2>;
+				reg-io-width = <4>;
+				clock-frequency = <432000000>;
+				resets = <&reset2 RTD1295_RSTN_UR1>;
+				status = "disabled";
+			};
+
+			uart2: serial@1b400 {
+				compatible = "snps,dw-apb-uart";
+				reg = <0x1b400 0x100>;
+				reg-shift = <2>;
+				reg-io-width = <4>;
+				clock-frequency = <432000000>;
+				resets = <&reset2 RTD1295_RSTN_UR2>;
+				status = "disabled";
+			};
 		};
 
 		gic: interrupt-controller@ff011000 {
Signature · 1 line
2.16.4
#4 lore raw

PATCH v2 4/9 arm64: dts: realtek: rtd129x: Carve out boot ROM from memory

In reply to Andreas Färber

Update DS418j, MeLE V9, PROBOX2 AVA, Zidoo X9S and DS418 /memory nodes to exclude 0..0x1efff from reg entry and update unit address to match. Add this region to /soc ranges and for now just update the /memreserve/s.

Fixes 72a7786c0a0d ("ARM64: dts: Add Realtek RTD1295 and Zidoo X9S")
Fixes d938a964a966 ("arm64: dts: realtek: Add ProBox2 Ava")
Fixes a9ce6f854581 ("arm64: dts: realtek: Add MeLE V9")
Fixes cf976f660ee8 ("arm64: dts: realtek: Add RTD1293 and Synology DS418j")
Fixes 5133636e41a2 ("arm64: dts: realtek: Add RTD1296 and Synology DS418")
Cc James Tai <[email protected]>

---
v2: New

 arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts      | 6 +++---
 arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts     | 6 +++---
 arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts | 6 +++---
 arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts   | 4 ++--
 arch/arm64/boot/dts/realtek/rtd1296-ds418.dts       | 4 ++--
 arch/arm64/boot/dts/realtek/rtd129x.dtsi            | 9 +++++----
 6 files changed, 18 insertions(+), 17 deletions(-)
arch/arm64/boot/dts/realtek/rtd1293-ds418j.dts +3 -3
index b2dd583146b4..b2e44c6c2d22 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
 /*
- * Copyright (c) 2017 Andreas Färber
+ * Copyright (c) 2017-2019 Andreas Färber
  */
 
 /dts-v1/;
@@ -11,9 +11,9 @@
 	compatible = "synology,ds418j", "realtek,rtd1293";
 	model = "Synology DiskStation DS418j";
 
-	memory@0 {
+	memory@1f000 {
 		device_type = "memory";
-		reg = <0x0 0x40000000>;
+		reg = <0x1f000 0x3ffe1000>; /* boot ROM to 1 GiB */
 	};
 
 	aliases {
arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts +3 -3
index bd584e99fff9..cf4a57c012a8 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Andreas Färber
+ * Copyright (c) 2017-2019 Andreas Färber
  *
  * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
@@ -12,9 +12,9 @@
 	compatible = "mele,v9", "realtek,rtd1295";
 	model = "MeLE V9";
 
-	memory@0 {
+	memory@1f000 {
 		device_type = "memory";
-		reg = <0x0 0x80000000>;
+		reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */
 	};
 
 	aliases {
arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts +3 -3
index 8e2b0e75298a..14161c3f304d 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Andreas Färber
+ * Copyright (c) 2017-2019 Andreas Färber
  *
  * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
  */
@@ -12,9 +12,9 @@
 	compatible = "probox2,ava", "realtek,rtd1295";
 	model = "PROBOX2 AVA";
 
-	memory@0 {
+	memory@1f000 {
 		device_type = "memory";
-		reg = <0x0 0x80000000>;
+		reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */
 	};
 
 	aliases {
arch/arm64/boot/dts/realtek/rtd1295-zidoo-x9s.dts +2 -2
index e98e508b9514..4beb37bb9522 100644
@@ -11,9 +11,9 @@
 	compatible = "zidoo,x9s", "realtek,rtd1295";
 	model = "Zidoo X9S";
 
-	memory@0 {
+	memory@1f000 {
 		device_type = "memory";
-		reg = <0x0 0x80000000>;
+		reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */
 	};
 
 	aliases {
arch/arm64/boot/dts/realtek/rtd1296-ds418.dts +2 -2
index 5a051a52bf88..cc706d13da8b 100644
@@ -11,9 +11,9 @@
 	compatible = "synology,ds418", "realtek,rtd1296";
 	model = "Synology DiskStation DS418";
 
-	memory@0 {
+	memory@1f000 {
 		device_type = "memory";
-		reg = <0x0 0x80000000>;
+		reg = <0x1f000 0x7ffe1000>; /* boot ROM to 2 GiB */
 	};
 
 	aliases {
arch/arm64/boot/dts/realtek/rtd129x.dtsi +5 -4
index 5e755dda7abb..0de9e675be16 100644
@@ -5,8 +5,8 @@
  * Copyright (c) 2016-2019 Andreas Färber
  */
 
-/memreserve/	0x0000000000000000 0x0000000000030000;
-/memreserve/	0x0000000000030000 0x00000000000d0000;
+/memreserve/	0x0000000000000000 0x000000000001f000;
+/memreserve/	0x000000000001f000 0x00000000000e1000;
 /memreserve/	0x0000000001b00000 0x00000000004be000;
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -52,8 +52,9 @@
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
-		/* Exclude up to 2 GiB of RAM */
-		ranges = <0x80000000 0x80000000 0x80000000>;
+		ranges = <0x00000000 0x00000000 0x0001f000>, /* boot ROM */
+			 /* Exclude up to 2 GiB of RAM */
+			 <0x80000000 0x80000000 0x80000000>;
 
 		rbus: bus@98000000 {
 			compatible = "simple-bus";
Signature · 1 line
2.16.4
#5 lore raw

PATCH v2 5/9 arm64: dts: realtek: rtd16xx: Carve out boot ROM from memory

In reply to Andreas Färber

Update Mjolnir /memory node to exclude 0..0x2dfff from reg entry. Add this region to /soc ranges instead.

---
TODO: Add Fixes header once RTD1619 has a stable -rc1 based commit hash.

To be followed up by patch unshadowing more RAM from /soc 0x98000000..0xffffffff, once we know the higher RAM windows.

v2: New

 arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts | 5 +++--
 arch/arm64/boot/dts/realtek/rtd16xx.dtsi        | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/realtek/rtd1619-mjolnir.dts +3 -2
index 44dd67e04335..90ed6681468f 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
 /*
  * Copyright (c) 2019 Realtek Semiconductor Corp.
+ * Copyright (c) 2019 Andreas Färber
  */
 
 /dts-v1/;
@@ -11,9 +12,9 @@
 	compatible = "realtek,mjolnir", "realtek,rtd1619";
 	model = "Realtek Mjolnir EVB";
 
-	memory@0 {
+	memory@2e000 {
 		device_type = "memory";
-		reg = <0x0 0x80000000>;
+		reg = <0x2e000 0x7ffd2000>; /* boot ROM to 2 GiB */
 	};
 
 	chosen {
arch/arm64/boot/dts/realtek/rtd16xx.dtsi +3 -1
index c7bbf2c7bb7c..69cc0d941c8d 100644
@@ -3,6 +3,7 @@
  * Realtek RTD16xx SoC family
  *
  * Copyright (c) 2019 Realtek Semiconductor Corp.
+ * Copyright (c) 2019 Andreas Färber
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -107,7 +108,8 @@
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
-		ranges = <0x98000000 0x98000000 0x68000000>;
+		ranges = <0x00000000 0x00000000 0x0002e000>, /* boot ROM */
+			 <0x98000000 0x98000000 0x68000000>;
 
 		rbus: bus@98000000 {
 			compatible = "simple-bus";
Signature · 1 line
2.16.4
#6 lore raw

PATCH v2 6/9 dt-bindings: arm: realtek: Add RTD1395 and Banana Pi BPI-M4

In reply to Andreas Färber

Define compatible strings for Realtek RTD1395 SoC and BPI-M4 SBC.

---
v1 -> v2: Unchanged
* Picked up Reviewed-by from Rob

 Documentation/devicetree/bindings/arm/realtek.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/arm/realtek.yaml +6 -0
index 445c56cbdcbb..dc097ed5a7e5 100644
@@ -41,6 +41,12 @@ properties:
               - synology,ds418 # Synology DiskStation DS418
           - const: realtek,rtd1296
 
+      # RTD1395 SoC based boards
+      - items:
+          - enum:
+              - bananapi,bpi-m4 # Banana Pi BPI-M4
+          - const: realtek,rtd1395
+
       # RTD1619 SoC based boards
       - items:
           - enum:
Signature · 1 line
2.16.4
#7 lore raw

PATCH v2 7/9 arm64: dts: realtek: Add RTD1395 and BPi-M4

In reply to Andreas Färber

Add Device Trees for Realtek RTD1395 SoC and Banana Pi BPi-M4 SBC.

For now reuse RTD1295 reset constants.

---
To be followed up by patch unshadowing more RAM from /soc 0x98000000..0xffffffff, once we know the higher RAM windows.

v1 -> v2:
* Fixed r-bus size from 0x100000 to 0x200000 (James)
* Changed #address-cells and #size-cells from 2 to 1 (James)
* Carved out boot ROM from /memory and added it to /soc ranges (Rob/James)

 arch/arm64/boot/dts/realtek/Makefile           |   2 +
 arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts |  30 ++++++
 arch/arm64/boot/dts/realtek/rtd1395.dtsi       |  65 +++++++++++
 arch/arm64/boot/dts/realtek/rtd139x.dtsi       | 142 +++++++++++++++++++++++++
 4 files changed, 239 insertions(+)
 create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts
 create mode 100644 arch/arm64/boot/dts/realtek/rtd1395.dtsi
 create mode 100644 arch/arm64/boot/dts/realtek/rtd139x.dtsi
arch/arm64/boot/dts/realtek/Makefile +2 -0
index fb5f05978ecc..f614080b5e27 100644
@@ -8,4 +8,6 @@ dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-zidoo-x9s.dtb
 
 dtb-$(CONFIG_ARCH_REALTEK) += rtd1296-ds418.dtb
 
+dtb-$(CONFIG_ARCH_REALTEK) += rtd1395-bpi-m4.dtb
+
 dtb-$(CONFIG_ARCH_REALTEK) += rtd1619-mjolnir.dtb
arch/arm64/boot/dts/realtek/rtd1395-bpi-m4.dts new file +30 -0
new file mode 100644
index 000000000000..9891967d1315
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
+/*
+ * Copyright (c) 2019 Andreas Färber
+ */
+
+/dts-v1/;
+
+#include "rtd1395.dtsi"
+
+/ {
+	compatible = "bananapi,bpi-m4", "realtek,rtd1395";
+	model = "Banana Pi BPI-M4";
+
+	memory@2f000 {
+		device_type = "memory";
+		reg = <0x2f000 0x3ffd1000>; /* boot ROM to 1 GiB or 2 GiB */
+	};
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
arch/arm64/boot/dts/realtek/rtd1395.dtsi new file +65 -0

65 lines not on this page · raw message

arch/arm64/boot/dts/realtek/rtd139x.dtsi new file +142 -0

142 lines not on this page · raw message

Signature · 1 line
2.16.4
#8 lore raw

PATCH v2 8/9 dt-bindings: arm: realtek: Add Realtek Lion Skin EVB

In reply to Andreas Färber

Define a compatible string for Realtek RTD1395 Lion Skin eval board.

---
v2: New

 Documentation/devicetree/bindings/arm/realtek.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/realtek.yaml +1 -0
index dc097ed5a7e5..40ca4c3f21f4 100644
@@ -45,6 +45,7 @@ properties:
       - items:
           - enum:
               - bananapi,bpi-m4 # Banana Pi BPI-M4
+              - realtek,lion-skin # Realtek Lion Skin EVB
           - const: realtek,rtd1395
 
       # RTD1619 SoC based boards
Signature · 1 line
2.16.4
maintainer Acked-by on v2 8/9
#9 lore raw

Re: [PATCH v2 8/9] dt-bindings: arm: realtek: Add Realtek Lion Skin EVB

Quoted 9 lines · On Mon, 2 Dec 2019 11:29:09 +0100, =?UTF-8?q?Andreas=20F=C3=A4rber?= wrote:

Define a compatible string for Realtek RTD1395 Lion Skin eval board.

---
v2: New

 Documentation/devicetree/bindings/arm/realtek.yaml | 1 +
 1 file changed, 1 insertion(+)
#10 lore raw

PATCH v2 9/9 arm64: dts: realtek: rtd1395: Add Realtek Lion Skin EVB

In reply to Andreas Färber

Add a Device Tree for Realtek RTD1395 SoC Lion Skin evaluation board.

---
v2: New

 arch/arm64/boot/dts/realtek/Makefile             |  1 +
 arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts | 36 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts
arch/arm64/boot/dts/realtek/Makefile +1 -0
index f614080b5e27..54bd02d11c02 100644
@@ -9,5 +9,6 @@ dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-zidoo-x9s.dtb
 dtb-$(CONFIG_ARCH_REALTEK) += rtd1296-ds418.dtb
 
 dtb-$(CONFIG_ARCH_REALTEK) += rtd1395-bpi-m4.dtb
+dtb-$(CONFIG_ARCH_REALTEK) += rtd1395-lionskin.dtb
 
 dtb-$(CONFIG_ARCH_REALTEK) += rtd1619-mjolnir.dtb
arch/arm64/boot/dts/realtek/rtd1395-lionskin.dts new file +36 -0
new file mode 100644
index 000000000000..83f9b536cdea
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
+/*
+ * Copyright (c) 2019 Andreas Färber
+ */
+
+/dts-v1/;
+
+#include "rtd1395.dtsi"
+
+/ {
+	compatible = "realtek,lion-skin", "realtek,rtd1395";
+	model = "Realtek Lion Skin EVB";
+
+	memory@2f000 {
+		device_type = "memory";
+		reg = <0x2f000 0x3ffd1000>; /* boot ROM to 1 GiB or 2 GiB */
+	};
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+};
+
+/* debug console (J1) */
+&uart0 {
+	status = "okay";
+};
+
+/* M.2 slot (CON1) */
+&uart1 {
+	status = "disabled";
+};
Signature · 1 line
2.16.4
author Applied
#11 lore raw
In reply to Andreas Färber

Am 02.12.19 um 11:29 schrieb Andreas Färber:

Quoted 10 lines

Andreas Färber (9):
arm64: dts: realtek: rtd129x: Fix GIC CPU masks for RTD1293
arm64: dts: realtek: rtd129x: Use reserved-memory for RPC regions
arm64: dts: realtek: rtd129x: Introduce r-bus
arm64: dts: realtek: rtd129x: Carve out boot ROM from memory
arm64: dts: realtek: rtd16xx: Carve out boot ROM from memory
dt-bindings: arm: realtek: Add RTD1395 and Banana Pi BPI-M4
arm64: dts: realtek: Add RTD1395 and BPi-M4
dt-bindings: arm: realtek: Add Realtek Lion Skin EVB
arm64: dts: realtek: rtd1395: Add Realtek Lion Skin EVB

Applied to linux-realtek.git v5.6/dt:

https://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git/commit/?h=v5.6/dt

with RTD16xx rebased onto RTD1395.

Regards,
Andreas

Signature · 4 lines
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer
HRB 36809 (AG Nürnberg)