ath79: dts: disable redundant built-in watchdog

The built-in watchdog is redundant when the device has an external
GPIO based hardware watchdog. And there is a conflict that both of
them will attempt to register the same device entry in sysfs. This
resulted in the built-in watchdog being unable to be activated.
This patch explicitly disables the built-in watchdog for devices
that use GPIO watchdog to fix the error:

[    1.779206] ath79-wdt 18060008.wdt: unable to register misc device, err=-16
[    1.786355] ath79-wdt: probe of 18060008.wdt failed with error -16

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18395
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
index 28b764069e04b39186d702d6d81cacfbedf39cdc..71664094f3fa0f3f552a05faade1d32b4a80a873 100644 (file)
--- a/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
+++ b/target/linux/ath79/dts/ar7240_openmesh_om2p-v1.dts
@@ -177,3 +177,7 @@
                gpio-controller;
        };
 };
+
+&wdt {
+       status = "disabled";
+};

diff --git a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
index 51a2c8b2af70bed2835a5db0c24753522331fa56..1a02a8dec50871dc3a84c4b38fed9575e5a8f65d 100644 (file)
--- a/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
+++ b/target/linux/ath79/dts/ar9330_openmesh_om2p.dtsi
@@ -163,6 +163,10 @@
        nvmem-cell-names = "mac-address";
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
index 885e8bb4201a0c35192c5dbd38ab33b59694d525..767570280250bbf1139e75786069e37a8d841aa7 100644 (file)
--- a/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
+++ b/target/linux/ath79/dts/ar9341_openmesh_om2p-hs.dtsi
@@ -173,6 +173,10 @@
        nvmem-cell-names = "mac-address";
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
index 8dfcd2ee3a107fcf922df189b3b9767ca0c08bbf..18cd8db4aa8d2bb35f7015a6c7cac96467ce9f18 100644 (file)
--- a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
+++ b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts
@@ -166,6 +166,10 @@
        };
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts b/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts
index b6bec0a4385f63777446174223c02455ce0aef01..de7acdbca9affcad1a28deac2c8d36b291561131 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts
+++ b/target/linux/ath79/dts/ar9344_openmesh_mr600-v2.dts
@@ -73,3 +73,7 @@
                always-running;
        };
 };
+
+&wdt {
+       status = "disabled";
+};

diff --git a/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts b/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
index d15acfc7ca2eb883c82377be818baa874bbe0d42..24ce6eead67192f2054bc9a4c982bf9f8c1af2b4 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
+++ b/target/linux/ath79/dts/ar9344_openmesh_om5p-an.dts
@@ -218,6 +218,10 @@
        nvmem-cell-names = "mac-address";
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/ar9344_openmesh_om5p.dts b/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
index d1ce727489bc4776d23e934d1332486b2104a5c8..7b08d6a5e60b2bb42709abc66289b893f9303cb5 100644 (file)
--- a/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
+++ b/target/linux/ath79/dts/ar9344_openmesh_om5p.dts
@@ -178,6 +178,10 @@
        nvmem-cell-names = "mac-address";
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
index b0002e455fa18c3b7a5be778bb19af53328008b6..60de383008cf9e1b3c985a18f1cd4e23a3062e06 100644 (file)
--- a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
+++ b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
@@ -62,6 +62,9 @@
        
        watchdog {
                compatible = "linux,wdt-gpio";
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&enable_gpio21>;
                gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
                hw_algo = "toggle";
                hw_margin_ms = <30000>;
@@ -70,10 +73,7 @@
 };
 
 &wdt {
-       status = "okay";
-
-       pinctrl-names = "default";
-       pinctrl-0 = <&enable_gpio21>;
+       status = "disabled";
 };
 
 &gpio {

diff --git a/target/linux/ath79/dts/qca9531_8dev_carambola3.dts b/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
index a740999af6d4441923fdf2f5162553a6d4c125bd..f34c9e744e4b818ad848a06fc42c6f1b50f8c275 100644 (file)
--- a/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
+++ b/target/linux/ath79/dts/qca9531_8dev_carambola3.dts
@@ -41,10 +41,6 @@
        status = "okay";
 };
 
-&wdt {
-       status = "okay";
-};
-
 &spi {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9531_8dev_lima.dts b/target/linux/ath79/dts/qca9531_8dev_lima.dts
index 22d80a7d6fe15cba6edf09f779ab0f5ef8b30d21..3ab2272f21ef75280b9061d32157d132e43dafba 100644 (file)
--- a/target/linux/ath79/dts/qca9531_8dev_lima.dts
+++ b/target/linux/ath79/dts/qca9531_8dev_lima.dts
@@ -32,10 +32,6 @@
        status = "okay";
 };
 
-&wdt {
-       status = "okay";
-};
-
 &spi {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
index 48f2eff86a2f3283416c7839effaa9edb89d5cf6..f07e711829a1d19826430ed0b1d7ed76e352daac 100644 (file)
--- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
+++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi
@@ -121,6 +121,10 @@
        status = "okay";
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
index 19256aa10dceb11e352c838331d7c3a36f344527..ca44106ba0d19266f33e3a258b26cc1c531c6c0e 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
@@ -182,6 +182,10 @@
        nvmem-cell-names = "mac-address";
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts
index 227764650014569d14a40086bcea1c6fd286fe29..c5a96c661360ef6439814ceb857800689e576687 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew71-v2.dts
@@ -138,6 +138,10 @@
        nvmem-cell-names = "mac-address";
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
index e5eac041387a3ab5027c4c3432bc802d1acb5907..b5dcab0b029f41ea00116e0de995ada8d6420682 100644 (file)
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
@@ -149,6 +149,10 @@
        nvmem-cell-names = "mac-address";
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
index 5a88731e66f003ed464d4e7e0e5c2e2ea81c67aa..6e9df069188ee7daf3d33a575a43224e7769e1de 100644 (file)
--- a/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
+++ b/target/linux/ath79/dts/qca9531_engenius_ews511ap.dts
@@ -75,7 +75,7 @@
 };
 
 &wdt {
-       status = "okay";
+       status = "disabled";
 };
 
 &rst {

diff --git a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
index bd43ccad791722349af9af1f2393724ac0286a81..28737c9e96aa84ee343fb960b2fa7f4fad93752d 100644 (file)
--- a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
+++ b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
@@ -170,6 +170,10 @@
        nvmem-cell-names = "mac-address";
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
index 07edeed80663083df910f0b31d7eea88cf61b003..4ff8ae2f61a33897a5d880068a8965f4ac16057e 100644 (file)
--- a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
+++ b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
@@ -148,6 +148,10 @@
        nvmem-cell-names = "mac-address";
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
index afe97df6d487307da6f59e6e84075ca82794db7b..79b5e4e6ea77b948bc03da95e369004537fd3054 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-e380ac-v2.dts
@@ -149,7 +149,7 @@
 };
 
 &wdt {
-       status = "okay";
+       status = "disabled";
 };
 
 &wmac {

diff --git a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
index 7bcadb2adaf4cd132f57caff1fdb3db4e7b1dd6d..4143ca927025f8540e73f31df8ffd4b2da982ecf 100644 (file)
--- a/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
+++ b/target/linux/ath79/dts/qca9558_comfast_cf-wr650ac.dtsi
@@ -104,6 +104,10 @@
        };
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 };

diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
index 63d4a75e619a2e8a57b94aeec80552921a79abb8..b189b8ff14796cd4799d5a0440d27e4ce0e78f72 100644 (file)
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -137,6 +137,10 @@
        };
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
index a8c1e75d8d233876f73cd1e0c3dd51d146bc47a2..e1936ef2ee1871eb1b6cb35ef88702d345d2ac5b 100644 (file)
--- a/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
+++ b/target/linux/ath79/dts/qca9558_librerouter_librerouter-v1.dts
@@ -210,6 +210,10 @@
        };
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
index 8cd27e01cc85b926d00919b82097c2c2a59abd8b..650250dee6efc08f635ced7182f12a011d9052b3 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_a60.dtsi
@@ -194,6 +194,10 @@
        phy-handle = <&phy2>;
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
index d4087d511f7e49f238920175f0c81dc9ddb0a743..48b8fe819021bb33c959e216a530315751b563c4 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
@@ -175,6 +175,10 @@
        };
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
index 838aa1f0b804642e7ea19c83eaa26d35d6b19799..0dcbbad79666c81d5f182c4f2ea846a7c63321ac 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v1.dts
@@ -213,6 +213,10 @@
        phy-handle = <&phy2>;
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
index 9c5b70a606bad25d65b15f58a954270e37efe9aa..9983222af9a9888edd8c8e520fee8cc3a4dbf280 100644 (file)
--- a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
@@ -252,6 +252,10 @@
        phy-handle = <&phy1>;
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";
 

diff --git a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
index 9fca52bf33bf7041b390cfae2d40f0e79bd9c46a..c0f563bae6df405b3c20fb7063b948da60075c21 100644 (file)
--- a/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
+++ b/target/linux/ath79/dts/qca9563_comfast_cf-e375ac.dts
@@ -157,6 +157,10 @@
        phy-handle = <&phy0>;
 };
 
+&wdt {
+       status = "disabled";
+};
+
 &wmac {
        status = "okay";