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>
This commit is contained in:
Shiji Yang 2025-04-02 08:03:20 +08:00 committed by Robert Marko
parent 02d3aa72bb
commit 40851dae6a
26 changed files with 90 additions and 14 deletions

View file

@ -177,3 +177,7 @@
gpio-controller;
};
};
&wdt {
status = "disabled";
};

View file

@ -163,6 +163,10 @@
nvmem-cell-names = "mac-address";
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -173,6 +173,10 @@
nvmem-cell-names = "mac-address";
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -166,6 +166,10 @@
};
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -73,3 +73,7 @@
always-running;
};
};
&wdt {
status = "disabled";
};

View file

@ -218,6 +218,10 @@
nvmem-cell-names = "mac-address";
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -178,6 +178,10 @@
nvmem-cell-names = "mac-address";
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -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 {

View file

@ -41,10 +41,6 @@
status = "okay";
};
&wdt {
status = "okay";
};
&spi {
status = "okay";

View file

@ -32,10 +32,6 @@
status = "okay";
};
&wdt {
status = "okay";
};
&spi {
status = "okay";

View file

@ -121,6 +121,10 @@
status = "okay";
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -182,6 +182,10 @@
nvmem-cell-names = "mac-address";
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -138,6 +138,10 @@
nvmem-cell-names = "mac-address";
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -149,6 +149,10 @@
nvmem-cell-names = "mac-address";
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -75,7 +75,7 @@
};
&wdt {
status = "okay";
status = "disabled";
};
&rst {

View file

@ -170,6 +170,10 @@
nvmem-cell-names = "mac-address";
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -148,6 +148,10 @@
nvmem-cell-names = "mac-address";
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -149,7 +149,7 @@
};
&wdt {
status = "okay";
status = "disabled";
};
&wmac {

View file

@ -104,6 +104,10 @@
};
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";
};

View file

@ -137,6 +137,10 @@
};
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -210,6 +210,10 @@
};
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -194,6 +194,10 @@
phy-handle = <&phy2>;
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -175,6 +175,10 @@
};
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -213,6 +213,10 @@
phy-handle = <&phy2>;
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -252,6 +252,10 @@
phy-handle = <&phy1>;
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";

View file

@ -157,6 +157,10 @@
phy-handle = <&phy0>;
};
&wdt {
status = "disabled";
};
&wmac {
status = "okay";