Skip to contentSkip to conversation

ARM: dts: nspire: Add unit name addresses to memory nodes

PATCH Applied Andrew Davis 2 participants 3 messages Jun 12, 2024 – Jun 23, 2024

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

PATCH 1/2 ARM: dts: nspire: Add unit name addresses to memory nodes

Fixes the following DTB check warning:

Quoted 1 line

node has a reg or ranges property, but no unit name

---
 arch/arm/boot/dts/nspire/nspire-classic.dtsi | 2 +-
 arch/arm/boot/dts/nspire/nspire-cx.dts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/nspire/nspire-classic.dtsi +1 -1
index a6e9cbf51524d..0ee53d3ecd542 100644
@@ -55,7 +55,7 @@ &vbus_reg {
 };
 
 / {
-	memory {
+	memory@10000000 {
 		device_type = "memory";
 		reg = <0x10000000 0x2000000>; /* 32 MB */
 	};
arch/arm/boot/dts/nspire/nspire-cx.dts +1 -1
index 29f0181e5b385..debeff0ec010f 100644
@@ -122,7 +122,7 @@ / {
 	model = "TI-NSPIRE CX";
 	compatible = "ti,nspire-cx";
 
-	memory {
+	memory@10000000 {
 		device_type = "memory";
 		reg = <0x10000000 0x4000000>; /* 64 MB */
 	};
Signature · 1 line
2.39.2
#1 lore raw

PATCH 2/2 ARM: dts: nspire: Add full compatible for watchdog node

The watchdog appears to be an ARM SP805, add the full compatible and the needed clocks properties. Leave this disabled for now as functionality is not fully tested.

---
 arch/arm/boot/dts/nspire/nspire.dtsi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/arm/boot/dts/nspire/nspire.dtsi +4 -1
index d56fef7250dbd..95588b716c6f3 100644
@@ -170,9 +170,12 @@ timer1: timer@900d0000 {
 			};
 
 			watchdog: watchdog@90060000 {
-				compatible = "arm,primecell";
+				compatible = "arm,sp805", "arm,primecell";
 				reg = <0x90060000 0x1000>;
 				interrupts = <3>;
+				clocks = <&apb_pclk>, <&apb_pclk>;
+				clock-names = "wdog_clk", "apb_pclk";
+				status = "disabled";
 			};
 
 			rtc: rtc@90090000 {
Signature · 1 line
2.39.2
#2 lore raw
In reply to Andrew Davis
Quoted 5 lines · Andrew Davis

Fixes the following DTB check warning:

Quoted 1 line

node has a reg or ranges property, but no unit name

Applied, thanks!

[1/2] ARM: dts: nspire: Add unit name addresses to memory nodes

      https://git.kernel.org/krzk/linux-dt/c/af88df12762dab540d02c13324a0767473322f1e
[2/2] ARM: dts: nspire: Add full compatible for watchdog node
      https://git.kernel.org/krzk/linux-dt/c/c322d10fe52138b2d47e3b8dd65c20d705e1c313

Best regards,

Signature · 1 line
Krzysztof Kozlowski <[email protected]>