linux-kernel - [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties

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]

Date:   Wed,  4 Oct 2017 19:46:34 +1030
From:   Joel Stanley <joel@....id.au>
To:     Joel Stanley <joel@....id.au>, Rob Herring <robh+dt@...nel.org>,
        Mark Rutland <mark.rutland@....com>
Cc:     Russell King <linux@...linux.org.uk>, devicetree@...r.kernel.org,
        linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
        Andrew Jeffery <andrew@...id.au>,
        Cédric Le Goater <clg@...d.org>,
        linux-aspeed@...ts.ozlabs.org
Subject: [PATCH 1/2] ARM: dts: aspeed: Remove undocumented wdt properties

The watchdog bindings do not describe an interrupt property nor clock
phandle, and the upstream driver never had code to use them. Drop them
from the device tree.

Also rename the node from wdt the more commonly used watchdog.

Signed-off-by: Joel Stanley <joel@....id.au>
---
 arch/arm/boot/dts/aspeed-g4.dtsi | 7 ++-----
 arch/arm/boot/dts/aspeed-g5.dtsi | 8 +++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index e455bd236798..5be2e6a39917 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -204,17 +204,14 @@
 				status = "disabled";
 			};
 
-			wdt1: wdt@...85000 {
+			wdt1: watchdog@...85000 {
 				compatible = "aspeed,ast2400-wdt";
 				reg = <0x1e785000 0x1c>;
-				interrupts = <27>;
 			};
 
-			wdt2: wdt@...85020 {
+			wdt2: watchdog@...85020 {
 				compatible = "aspeed,ast2400-wdt";
 				reg = <0x1e785020 0x1c>;
-				interrupts = <27>;
-				clocks = <&clk_apb>;
 				status = "disabled";
 			};
 
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 77dded187d5a..71e1264b81aa 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -248,20 +248,18 @@
 				status = "disabled";
 			};
 
-			wdt1: wdt@...85000 {
+			wdt1: watchdog@...85000 {
 				compatible = "aspeed,ast2500-wdt";
 				reg = <0x1e785000 0x20>;
-				interrupts = <27>;
 			};
 
-			wdt2: wdt@...85020 {
+			wdt2: watchdog@...85020 {
 				compatible = "aspeed,ast2500-wdt";
 				reg = <0x1e785020 0x20>;
-				interrupts = <27>;
 				status = "disabled";
 			};
 
-			wdt3: wdt@...85040 {
+			wdt3: watchdog@...85040 {
 				compatible = "aspeed,ast2500-wdt";
 				reg = <0x1e785040 0x20>;
 				status = "disabled";
-- 
2.14.1