linux-kernel - [RFC PATCH 3/3] ARM: dts: davinci, keystone: correct watchdog nodenames

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240721170840.15569-4-five231003@gmail.com>
Date: Sun, 21 Jul 2024 21:58:36 +0530
From: Kousik Sanagavarapu <five231003@...il.com>
To: Daniel Lezcano <daniel.lezcano@...aro.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Rob Herring <robh@...nel.org>,
	Krzysztof Kozlowski <krzk+dt@...nel.org>,
	Conor Dooley <conor+dt@...nel.org>,
	Wim Van Sebroeck <wim@...ux-watchdog.org>,
	Guenter Roeck <linux@...ck-us.net>,
	Nishanth Menon <nm@...com>,
	Santosh Shilimkar <ssantosh@...nel.org>
Cc: devicetree@...r.kernel.org,
	linux-arm-kernel@...ts.infradead.org,
	linux-watchdog@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Kousik Sanagavarapu <five231003@...il.com>
Subject: [RFC PATCH 3/3] ARM: dts: davinci, keystone: correct watchdog nodenames

Using "wdt" instead of "watchdog" for watchdog timer nodes doesn't allow
for validation with the corresponding dtschema and gives errors

	$ make CHECK_DTBS=y DT_SCHEMA_FILES=ti,davinci-wdt.yaml \
		ti/keystone/keystone-k2g-ice.dtb

	DTC_CHK arch/arm/boot/dts/ti/keystone/keystone-k2g-ice.dtb
	arch/arm/boot/dts/ti/keystone/keystone-k2g-ice.dtb:
	wdt@...50000: $nodename:0: 'wdt@...50000' does not match
	'^(timer|watchdog)(@.*|-([0-9]|[1-9][0-9]+))?$'
	from schema $id:
	http://devicetree.org/schemas/watchdog/ti,davinci-wdt.yaml#

Therefore change "wdt@" to "watchdog@".

While at it, remove "ti,davinci-wdt" compatible from the keystone dts
code.

Signed-off-by: Kousik Sanagavarapu <five231003@...il.com>
---
Question: Should "wdt@" be changed everywhere in the dts code or is it
only a requirement of validation against dtschema?

Also, I'm not sure about removing "ti,davinci-wdt" from the keystone dts
code.  I'm thinking it is only there so that the driver code can get
information from keystone nodes too, because it seems that there is no
code for ti,keystone-wdt.

So question,

- Is WDT Controller driver for keystone not written yet?

Or

- Does the WDT Controller driver for keystone have the same
  functionality as one on davinci - hence leading us to simply do

	.compatible = "ti,keystone-wdt"

  ?

 arch/arm/boot/dts/ti/davinci/da850.dtsi         | 2 +-
 arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi | 4 ++--
 arch/arm/boot/dts/ti/keystone/keystone.dtsi     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/ti/davinci/da850.dtsi b/arch/arm/boot/dts/ti/davinci/da850.dtsi
index 1d3fb5397ce3..89055ab87256 100644
--- a/arch/arm/boot/dts/ti/davinci/da850.dtsi
+++ b/arch/arm/boot/dts/ti/davinci/da850.dtsi
@@ -525,7 +525,7 @@ clocksource: timer@...00 {
 			interrupt-names = "tint12", "tint34";
 			clocks = <&pll0_auxclk>;
 		};
-		wdt: wdt@...00 {
+		wdt: watchdog@...00 {
 			compatible = "ti,davinci-wdt";
 			reg = <0x21000 0x1000>;
 			clocks = <&pll0_auxclk>;
diff --git a/arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi b/arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi
index dafe485dfe19..884402a5fe4a 100644
--- a/arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi
+++ b/arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi
@@ -610,8 +610,8 @@ spi3: spi@...06000 {
 			clocks = <&k2g_clks 0x0013 0>;
 		};
 
-		wdt: wdt@...50000 {
-			compatible = "ti,keystone-wdt", "ti,davinci-wdt";
+		wdt: watchdog@...50000 {
+			compatible = "ti,keystone-wdt";
 			reg = <0x02250000 0x80>;
 			power-domains = <&k2g_pds 0x22>;
 			clocks = <&k2g_clks 0x22 0>;
diff --git a/arch/arm/boot/dts/ti/keystone/keystone.dtsi b/arch/arm/boot/dts/ti/keystone/keystone.dtsi
index ff16428860a9..f697f27edcfc 100644
--- a/arch/arm/boot/dts/ti/keystone/keystone.dtsi
+++ b/arch/arm/boot/dts/ti/keystone/keystone.dtsi
@@ -225,8 +225,8 @@ usb0: usb@...0000 {
 			};
 		};
 
-		wdt: wdt@...0080 {
-			compatible = "ti,keystone-wdt","ti,davinci-wdt";
+		wdt: watchdog@...0080 {
+			compatible = "ti,keystone-wdt";
 			reg = <0x022f0080 0x80>;
 			clocks = <&clkwdtimer0>;
 		};
-- 
2.45.2.827.g557ae147e6.dirty