From dc2cb92c4af47c0c713c6564b3ce0263598eeac1 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 4 Nov 2019 12:17:05 -0600 Subject: [PATCH] dts: Add standard alias for watchdog Introduce a standard watchdog alias 'watchdog0' that can be utilized by sample/test code in the future. This helps remove the need for CONFIG_WDT_0_NAME in dts_fixup.h files. Signed-off-by: Kumar Gala --- boards/arm/arduino_due/arduino_due.dts | 1 - boards/arm/sam4s_xplained/sam4s_xplained.dts | 1 - boards/arm/sam_e70_xplained/sam_e70_xplained.dts | 1 - dts/arm/atmel/sam3x.dtsi | 4 ++++ dts/arm/atmel/sam4s.dtsi | 4 ++++ dts/arm/atmel/samd.dtsi | 4 ++++ dts/arm/atmel/same70.dtsi | 4 ++++ dts/arm/nxp/nxp_k2x.dtsi | 5 +++++ dts/arm/nxp/nxp_k6x.dtsi | 5 +++++ dts/arm/nxp/nxp_k8x.dtsi | 2 +- dts/arm/nxp/nxp_ke1xf.dtsi | 2 +- dts/arm/nxp/nxp_kw2xd.dtsi | 4 ++++ 12 files changed, 32 insertions(+), 5 deletions(-) diff --git a/boards/arm/arduino_due/arduino_due.dts b/boards/arm/arduino_due/arduino_due.dts index 65438bdf3a7..5c7fb4ad7ef 100644 --- a/boards/arm/arduino_due/arduino_due.dts +++ b/boards/arm/arduino_due/arduino_due.dts @@ -9,7 +9,6 @@ compatible = "arduino,due", "atmel,sam3x8e", "atmel,sam3x"; aliases { - wdog = &wdog; uart-0 = &uart0; i2c-0 = &i2c0; i2c-1 = &i2c1; diff --git a/boards/arm/sam4s_xplained/sam4s_xplained.dts b/boards/arm/sam4s_xplained/sam4s_xplained.dts index 43daf0855f5..9eae8201ee2 100644 --- a/boards/arm/sam4s_xplained/sam4s_xplained.dts +++ b/boards/arm/sam4s_xplained/sam4s_xplained.dts @@ -17,7 +17,6 @@ led0 = &yellow_led_1; led1 = &yellow_led_2; sw0 = &user_button; - wdog = &wdog; }; chosen { diff --git a/boards/arm/sam_e70_xplained/sam_e70_xplained.dts b/boards/arm/sam_e70_xplained/sam_e70_xplained.dts index ee7c634af5b..94052e9b0d9 100644 --- a/boards/arm/sam_e70_xplained/sam_e70_xplained.dts +++ b/boards/arm/sam_e70_xplained/sam_e70_xplained.dts @@ -19,7 +19,6 @@ i2c-2 = &i2c2; led0 = &green_led; sw0 = &sw0_user_button; - wdog = &wdog; }; chosen { diff --git a/dts/arm/atmel/sam3x.dtsi b/dts/arm/atmel/sam3x.dtsi index f990505dae9..8eca45074d7 100644 --- a/dts/arm/atmel/sam3x.dtsi +++ b/dts/arm/atmel/sam3x.dtsi @@ -8,6 +8,10 @@ #include / { + aliases { + watchdog0 = &wdog; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/dts/arm/atmel/sam4s.dtsi b/dts/arm/atmel/sam4s.dtsi index c5e7e251ee7..e74909ac7c2 100644 --- a/dts/arm/atmel/sam4s.dtsi +++ b/dts/arm/atmel/sam4s.dtsi @@ -9,6 +9,10 @@ #include / { + aliases { + watchdog0 = &wdog; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/dts/arm/atmel/samd.dtsi b/dts/arm/atmel/samd.dtsi index ec8dc22dbd7..cb28d57a52f 100644 --- a/dts/arm/atmel/samd.dtsi +++ b/dts/arm/atmel/samd.dtsi @@ -9,6 +9,10 @@ #include / { + aliases { + watchdog0 = &wdog; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/dts/arm/atmel/same70.dtsi b/dts/arm/atmel/same70.dtsi index a4db4067e40..51304611335 100644 --- a/dts/arm/atmel/same70.dtsi +++ b/dts/arm/atmel/same70.dtsi @@ -10,6 +10,10 @@ #include / { + aliases { + watchdog0 = &wdog; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/dts/arm/nxp/nxp_k2x.dtsi b/dts/arm/nxp/nxp_k2x.dtsi index 13f13a252bf..47b6dbe5aad 100644 --- a/dts/arm/nxp/nxp_k2x.dtsi +++ b/dts/arm/nxp/nxp_k2x.dtsi @@ -11,6 +11,11 @@ #include / { + + aliases { + watchdog0 = &wdog; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/dts/arm/nxp/nxp_k6x.dtsi b/dts/arm/nxp/nxp_k6x.dtsi index f391f44c15c..5621eb63425 100644 --- a/dts/arm/nxp/nxp_k6x.dtsi +++ b/dts/arm/nxp/nxp_k6x.dtsi @@ -7,6 +7,11 @@ #include / { + + aliases { + watchdog0 = &wdog; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/dts/arm/nxp/nxp_k8x.dtsi b/dts/arm/nxp/nxp_k8x.dtsi index 564d891cde6..3058e98bd84 100644 --- a/dts/arm/nxp/nxp_k8x.dtsi +++ b/dts/arm/nxp/nxp_k8x.dtsi @@ -41,7 +41,7 @@ uart-3 = &lpuart3; uart-4 = &lpuart4; usbd-0 = &usbd; - wdt-0 = &wdog; + watchdog0 = &wdog; }; cpus { diff --git a/dts/arm/nxp/nxp_ke1xf.dtsi b/dts/arm/nxp/nxp_ke1xf.dtsi index 38990867fa2..362a5449a41 100644 --- a/dts/arm/nxp/nxp_ke1xf.dtsi +++ b/dts/arm/nxp/nxp_ke1xf.dtsi @@ -13,7 +13,7 @@ / { aliases { rtc-0 = &rtc0; - wdt-0 = &wdog0; + watchdog0 = &wdog0; uart-0 = &uart0; uart-1 = &uart1; uart-2 = &uart2; diff --git a/dts/arm/nxp/nxp_kw2xd.dtsi b/dts/arm/nxp/nxp_kw2xd.dtsi index 8b5c0f12424..931d262f17e 100644 --- a/dts/arm/nxp/nxp_kw2xd.dtsi +++ b/dts/arm/nxp/nxp_kw2xd.dtsi @@ -7,6 +7,10 @@ #include / { + aliases { + watchdog0 = &wdog; + }; + cpus { #address-cells = <1>; #size-cells = <0>;