From ee65932c96d40b25e928e5aaf7e65c872a011477 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Sat, 11 Jan 2020 14:57:15 -0600 Subject: [PATCH] drivers: watchdog: Refactor mcux wdog driver to use generated dts macros Refactors the mcux wdog driver to use generated device tree macros directly. Removes now unused dts fixup macros from kinetis socs. Signed-off-by: Maureen Helm --- drivers/watchdog/wdt_mcux_wdog.c | 12 +++++++----- soc/arm/nxp_kinetis/k2x/dts_fixup.h | 6 ------ soc/arm/nxp_kinetis/k6x/dts_fixup.h | 6 ------ soc/arm/nxp_kinetis/k8x/dts_fixup.h | 6 ------ soc/arm/nxp_kinetis/kwx/dts_fixup.h | 6 ------ 5 files changed, 7 insertions(+), 29 deletions(-) diff --git a/drivers/watchdog/wdt_mcux_wdog.c b/drivers/watchdog/wdt_mcux_wdog.c index b0662275115..e545cd7e084 100644 --- a/drivers/watchdog/wdt_mcux_wdog.c +++ b/drivers/watchdog/wdt_mcux_wdog.c @@ -165,9 +165,10 @@ static const struct wdt_driver_api mcux_wdog_api = { static void mcux_wdog_config_func_0(struct device *dev); static const struct mcux_wdog_config mcux_wdog_config_0 = { - .base = (WDOG_Type *) DT_WDT_0_BASE_ADDRESS, - .clock_name = DT_WDT_0_CLOCK_NAME, - .clock_subsys = (clock_control_subsys_t) DT_WDT_0_CLOCK_SUBSYS, + .base = (WDOG_Type *) DT_NXP_KINETIS_WDOG_WATCHDOG0_BASE_ADDRESS, + .clock_name = DT_NXP_KINETIS_WDOG_WATCHDOG0_CLOCK_CONTROLLER, + .clock_subsys = (clock_control_subsys_t) + DT_NXP_KINETIS_WDOG_WATCHDOG0_CLOCK_NAME, .irq_config_func = mcux_wdog_config_func_0, }; @@ -181,8 +182,9 @@ DEVICE_AND_API_INIT(mcux_wdog_0, DT_INST_0_NXP_KINETIS_WDOG_LABEL, static void mcux_wdog_config_func_0(struct device *dev) { - IRQ_CONNECT(DT_WDT_0_IRQ, DT_WDT_0_IRQ_PRI, + IRQ_CONNECT(DT_NXP_KINETIS_WDOG_WATCHDOG0_IRQ_0, + DT_NXP_KINETIS_WDOG_WATCHDOG0_IRQ_0_PRIORITY, mcux_wdog_isr, DEVICE_GET(mcux_wdog_0), 0); - irq_enable(DT_WDT_0_IRQ); + irq_enable(DT_NXP_KINETIS_WDOG_WATCHDOG0_IRQ_0); } diff --git a/soc/arm/nxp_kinetis/k2x/dts_fixup.h b/soc/arm/nxp_kinetis/k2x/dts_fixup.h index de958cfcf4f..84e8964a80f 100644 --- a/soc/arm/nxp_kinetis/k2x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k2x/dts_fixup.h @@ -18,12 +18,6 @@ #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFE_40020000_LABEL -#define DT_WDT_0_BASE_ADDRESS DT_NXP_KINETIS_WDOG_40052000_BASE_ADDRESS -#define DT_WDT_0_IRQ DT_NXP_KINETIS_WDOG_40052000_IRQ_0 -#define DT_WDT_0_IRQ_PRI DT_NXP_KINETIS_WDOG_40052000_IRQ_0_PRIORITY -#define DT_WDT_0_CLOCK_NAME DT_NXP_KINETIS_WDOG_40052000_CLOCK_CONTROLLER -#define DT_WDT_0_CLOCK_SUBSYS DT_NXP_KINETIS_WDOG_40052000_CLOCK_NAME - #define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL #define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG #define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY diff --git a/soc/arm/nxp_kinetis/k6x/dts_fixup.h b/soc/arm/nxp_kinetis/k6x/dts_fixup.h index 1eb0b97132e..a694ed3ff84 100644 --- a/soc/arm/nxp_kinetis/k6x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k6x/dts_fixup.h @@ -21,12 +21,6 @@ #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFE_40020000_LABEL -#define DT_WDT_0_BASE_ADDRESS DT_NXP_KINETIS_WDOG_40052000_BASE_ADDRESS -#define DT_WDT_0_IRQ DT_NXP_KINETIS_WDOG_40052000_IRQ_0 -#define DT_WDT_0_IRQ_PRI DT_NXP_KINETIS_WDOG_40052000_IRQ_0_PRIORITY -#define DT_WDT_0_CLOCK_NAME DT_NXP_KINETIS_WDOG_40052000_CLOCK_CONTROLLER -#define DT_WDT_0_CLOCK_SUBSYS DT_NXP_KINETIS_WDOG_40052000_CLOCK_NAME - #define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL #define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG #define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY diff --git a/soc/arm/nxp_kinetis/k8x/dts_fixup.h b/soc/arm/nxp_kinetis/k8x/dts_fixup.h index 08178dbb533..71331b5bbb7 100644 --- a/soc/arm/nxp_kinetis/k8x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k8x/dts_fixup.h @@ -38,9 +38,3 @@ #define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY #define DT_USBD_KINETIS_BASE_ADDRESS DT_NXP_KINETIS_USBD_40072000_BASE_ADDRESS #define DT_USBD_KINETIS_NUM_BIDIR_EP DT_NXP_KINETIS_USBD_40072000_NUM_BIDIR_ENDPOINTS - -#define DT_WDT_0_BASE_ADDRESS DT_NXP_KINETIS_WDOG_40052000_BASE_ADDRESS -#define DT_WDT_0_IRQ DT_NXP_KINETIS_WDOG_40052000_IRQ_0 -#define DT_WDT_0_IRQ_PRI DT_NXP_KINETIS_WDOG_40052000_IRQ_0_PRIORITY -#define DT_WDT_0_CLOCK_NAME DT_NXP_KINETIS_WDOG_40052000_CLOCK_CONTROLLER -#define DT_WDT_0_CLOCK_SUBSYS DT_NXP_KINETIS_WDOG_40052000_CLOCK_NAME diff --git a/soc/arm/nxp_kinetis/kwx/dts_fixup.h b/soc/arm/nxp_kinetis/kwx/dts_fixup.h index 4b718edee19..f2c80e1ca12 100644 --- a/soc/arm/nxp_kinetis/kwx/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kwx/dts_fixup.h @@ -20,12 +20,6 @@ #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFL_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFL_40020000_LABEL -#define DT_WDT_0_BASE_ADDRESS DT_NXP_KINETIS_WDOG_40052000_BASE_ADDRESS -#define DT_WDT_0_IRQ DT_NXP_KINETIS_WDOG_40052000_IRQ_0 -#define DT_WDT_0_IRQ_PRI DT_NXP_KINETIS_WDOG_40052000_IRQ_0_PRIORITY -#define DT_WDT_0_CLOCK_NAME DT_NXP_KINETIS_WDOG_40052000_CLOCK_CONTROLLER -#define DT_WDT_0_CLOCK_SUBSYS DT_NXP_KINETIS_WDOG_40052000_CLOCK_NAME - #define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL #define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG #define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY