From ee9b08d7daebc1021dd9c127ba31f710c5ea0c6d Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 14 Nov 2018 09:23:40 -0600 Subject: [PATCH] drivers: watchdog: Convert Atmel SAM driver to DTS The majority of bits where already in place, but some minor support get the driver name from DTS was needed. Now we select HAS_DTS_WDT for the driver. Signed-off-by: Kumar Gala --- drivers/watchdog/Kconfig.sam | 1 + drivers/watchdog/wdt_sam.c | 2 +- soc/arm/atmel_sam/sam3x/dts_fixup.h | 1 + soc/arm/atmel_sam/sam4s/dts_fixup.h | 1 + soc/arm/atmel_sam/same70/dts_fixup.h | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/Kconfig.sam b/drivers/watchdog/Kconfig.sam index 52f4104bd23..0df5d2090c8 100644 --- a/drivers/watchdog/Kconfig.sam +++ b/drivers/watchdog/Kconfig.sam @@ -8,6 +8,7 @@ menuconfig WDT_SAM bool "Atmel SAM MCU Family Watchdog (WDT) Driver" depends on SOC_FAMILY_SAM + select HAS_DTS_WDT default y help Enable WDT driver for Atmel SAM MCUs. diff --git a/drivers/watchdog/wdt_sam.c b/drivers/watchdog/wdt_sam.c index b073e3fcdc6..12a8fade110 100644 --- a/drivers/watchdog/wdt_sam.c +++ b/drivers/watchdog/wdt_sam.c @@ -249,6 +249,6 @@ static int wdt_sam_init(struct device *dev) return 0; } -DEVICE_AND_API_INIT(wdt_sam, CONFIG_WDT_0_NAME, wdt_sam_init, +DEVICE_AND_API_INIT(wdt_sam, DT_WDT_SAM_LABEL, wdt_sam_init, &wdt_sam_data, &wdt_sam_cfg, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sam_api); diff --git a/soc/arm/atmel_sam/sam3x/dts_fixup.h b/soc/arm/atmel_sam/sam3x/dts_fixup.h index ab5cbc15248..fc7ccd3d5be 100644 --- a/soc/arm/atmel_sam/sam3x/dts_fixup.h +++ b/soc/arm/atmel_sam/sam3x/dts_fixup.h @@ -39,5 +39,6 @@ #define DT_WDT_SAM_IRQ_PRIORITY DT_ATMEL_SAM_WATCHDOG_400E1A50_IRQ_0_PRIORITY #define DT_WDT_SAM_LABEL DT_ATMEL_SAM_WATCHDOG_400E1A50_LABEL #define DT_WDT_SAM_BASE_ADDRESS DT_ATMEL_SAM_WATCHDOG_400E1A50_BASE_ADDRESS +#define CONFIG_WDT_0_NAME DT_WDT_SAM_LABEL /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/atmel_sam/sam4s/dts_fixup.h b/soc/arm/atmel_sam/sam4s/dts_fixup.h index b2c58857349..1201aa39d44 100644 --- a/soc/arm/atmel_sam/sam4s/dts_fixup.h +++ b/soc/arm/atmel_sam/sam4s/dts_fixup.h @@ -54,4 +54,5 @@ #define DT_WDT_SAM_IRQ_PRIORITY DT_ATMEL_SAM_WATCHDOG_400E1450_IRQ_0_PRIORITY #define DT_WDT_SAM_LABEL DT_ATMEL_SAM_WATCHDOG_400E1450_LABEL #define DT_WDT_SAM_BASE_ADDRESS DT_ATMEL_SAM_WATCHDOG_400E1450_BASE_ADDRESS +#define CONFIG_WDT_0_NAME DT_WDT_SAM_LABEL /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/atmel_sam/same70/dts_fixup.h b/soc/arm/atmel_sam/same70/dts_fixup.h index 086116bc108..bf872efe879 100644 --- a/soc/arm/atmel_sam/same70/dts_fixup.h +++ b/soc/arm/atmel_sam/same70/dts_fixup.h @@ -120,6 +120,7 @@ #define DT_WDT_SAM_IRQ_PRIORITY DT_ATMEL_SAM_WATCHDOG_400E1850_IRQ_0_PRIORITY #define DT_WDT_SAM_LABEL DT_ATMEL_SAM_WATCHDOG_400E1850_LABEL #define DT_WDT_SAM_BASE_ADDRESS DT_ATMEL_SAM_WATCHDOG_400E1850_BASE_ADDRESS +#define CONFIG_WDT_0_NAME DT_WDT_SAM_LABEL #define DT_USBHS_IRQ DT_ATMEL_SAM_USBHS_40038000_IRQ_0 #define DT_USBHS_IRQ_PRI DT_ATMEL_SAM_USBHS_40038000_IRQ_0_PRIORITY