From 61cb8b6c4f961a778175d5861b9456efe7556c91 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 24 Jan 2019 16:14:03 -0600 Subject: [PATCH] drivers: wdog: cmsdk: Convert to new DT__ defines Convert cmsdk driver to use new defines so we can remove the dts_fixup.h code for it. Signed-off-by: Kumar Gala --- boards/arm/mps2_an385/dts_fixup.h | 3 --- drivers/watchdog/wdog_cmsdk_apb.c | 2 +- soc/arm/arm/beetle/dts_fixup.h | 3 --- soc/arm/arm/musca_a/dts_fixup.h | 6 ------ 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/boards/arm/mps2_an385/dts_fixup.h b/boards/arm/mps2_an385/dts_fixup.h index 2eb6af67b1b..b982c83184c 100644 --- a/boards/arm/mps2_an385/dts_fixup.h +++ b/boards/arm/mps2_an385/dts_fixup.h @@ -13,9 +13,6 @@ #define DT_CMSDK_APB_DTIMER DT_ARM_CMSDK_DTIMER_40002000_BASE_ADDRESS #define DT_CMSDK_APB_DUALTIMER_IRQ DT_ARM_CMSDK_DTIMER_40002000_IRQ_0 -/* CMSDK APB Watchdog */ -#define DT_CMSDK_APB_WDOG DT_ARM_CMSDK_WATCHDOG_40008000_BASE_ADDRESS - /* CMSDK AHB General Purpose Input/Output (GPIO) */ #define DT_CMSDK_AHB_GPIO0 DT_ARM_CMSDK_GPIO_40010000_BASE_ADDRESS #define DT_IRQ_PORT0_ALL DT_ARM_CMSDK_GPIO_40010000_IRQ_0 diff --git a/drivers/watchdog/wdog_cmsdk_apb.c b/drivers/watchdog/wdog_cmsdk_apb.c index 056d712b23e..e071e09486c 100644 --- a/drivers/watchdog/wdog_cmsdk_apb.c +++ b/drivers/watchdog/wdog_cmsdk_apb.c @@ -57,7 +57,7 @@ struct wdog_cmsdk_apb { #define CMSDK_APB_WDOG_LOCK_VALUE (0x2BDDF662) #define WDOG_STRUCT \ - ((volatile struct wdog_cmsdk_apb *)(DT_CMSDK_APB_WDOG)) + ((volatile struct wdog_cmsdk_apb *)(DT_ARM_CMSDK_WATCHDOG_0_BASE_ADDRESS)) /* Keep reference of the device to pass it to the callback */ struct device *wdog_r; diff --git a/soc/arm/arm/beetle/dts_fixup.h b/soc/arm/arm/beetle/dts_fixup.h index 2eb6af67b1b..b982c83184c 100644 --- a/soc/arm/arm/beetle/dts_fixup.h +++ b/soc/arm/arm/beetle/dts_fixup.h @@ -13,9 +13,6 @@ #define DT_CMSDK_APB_DTIMER DT_ARM_CMSDK_DTIMER_40002000_BASE_ADDRESS #define DT_CMSDK_APB_DUALTIMER_IRQ DT_ARM_CMSDK_DTIMER_40002000_IRQ_0 -/* CMSDK APB Watchdog */ -#define DT_CMSDK_APB_WDOG DT_ARM_CMSDK_WATCHDOG_40008000_BASE_ADDRESS - /* CMSDK AHB General Purpose Input/Output (GPIO) */ #define DT_CMSDK_AHB_GPIO0 DT_ARM_CMSDK_GPIO_40010000_BASE_ADDRESS #define DT_IRQ_PORT0_ALL DT_ARM_CMSDK_GPIO_40010000_IRQ_0 diff --git a/soc/arm/arm/musca_a/dts_fixup.h b/soc/arm/arm/musca_a/dts_fixup.h index bb0300394c6..21547153868 100644 --- a/soc/arm/arm/musca_a/dts_fixup.h +++ b/soc/arm/arm/musca_a/dts_fixup.h @@ -39,9 +39,6 @@ #define DT_PL011_PORT1_BAUD_RATE DT_ARM_PL011_40102000_CURRENT_SPEED #define DT_PL011_PORT1_NAME DT_ARM_PL011_40102000_LABEL -/* CMSDK APB Watchdog */ -#define DT_CMSDK_APB_WDOG DT_ARM_CMSDK_WATCHDOG_40081000_BASE_ADDRESS - /* SCC */ #define DT_ARM_SCC_BASE_ADDRESS DT_ARM_SCC_4010C000_BASE_ADDRESS @@ -77,9 +74,6 @@ #define DT_PL011_PORT1_BAUD_RATE DT_ARM_PL011_50102000_CURRENT_SPEED #define DT_PL011_PORT1_NAME DT_ARM_PL011_50102000_LABEL -/* CMSDK APB Watchdog */ -#define DT_CMSDK_APB_WDOG DT_ARM_CMSDK_WATCHDOG_50081000_BASE_ADDRESS - /* SCC */ #define DT_ARM_SCC_BASE_ADDRESS DT_ARM_SCC_5010C000_BASE_ADDRESS