From a49de1543b44fc7199e09038020bec3b1ecca7c0 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 13 Feb 2020 07:50:43 -0600 Subject: [PATCH] drivers: entropy: mcux_trng: convert to DT_INST defines Convert driver to use DT_INST_ defines. The preferred defines for drivers are DT_INST_. Signed-off-by: Kumar Gala --- drivers/entropy/entropy_mcux_trng.c | 2 +- soc/arm/nxp_imx/rt/dts_fixup.h | 4 ---- soc/arm/nxp_kinetis/k8x/dts_fixup.h | 4 ---- soc/arm/nxp_kinetis/kwx/dts_fixup.h | 4 ---- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/entropy/entropy_mcux_trng.c b/drivers/entropy/entropy_mcux_trng.c index 412e57b7329..27f14a5f651 100644 --- a/drivers/entropy/entropy_mcux_trng.c +++ b/drivers/entropy/entropy_mcux_trng.c @@ -34,7 +34,7 @@ static const struct entropy_driver_api entropy_mcux_trng_api_funcs = { }; static struct mcux_entropy_config entropy_mcux_config = { - .base = (TRNG_Type *)DT_ENTROPY_MCUX_TRNG_BASE_ADDRESS + .base = (TRNG_Type *)DT_INST_0_NXP_KINETIS_TRNG_BASE_ADDRESS }; static int entropy_mcux_trng_init(struct device *); diff --git a/soc/arm/nxp_imx/rt/dts_fixup.h b/soc/arm/nxp_imx/rt/dts_fixup.h index e563cf6a2aa..f8ec0773747 100644 --- a/soc/arm/nxp_imx/rt/dts_fixup.h +++ b/soc/arm/nxp_imx/rt/dts_fixup.h @@ -21,10 +21,6 @@ #define DT_IRQ_ETH_IEEE1588_TMR DT_NXP_KINETIS_PTP_402D8000_PTP_IRQ_0 #define DT_ETH_MCUX_0_IRQ_PRI DT_NXP_KINETIS_ETHERNET_402D8000_IRQ_0_PRIORITY -#define DT_ENTROPY_MCUX_TRNG_BASE_ADDRESS DT_NXP_KINETIS_TRNG_400CC000_BASE_ADDRESS -#define DT_ENTROPY_MCUX_TRNG_IRQ DT_NXP_KINETIS_TRNG_400CC000_IRQ_0 -#define DT_ENTROPY_MCUX_TRNG_IRQ_PRI DT_NXP_KINETIS_TRNG_400CC000_IRQ_0_PRIORITY -#define DT_ENTROPY_MCUX_TRNG_NAME DT_NXP_KINETIS_TRNG_400CC000_LABEL #define CONFIG_ENTROPY_NAME DT_NXP_KINETIS_TRNG_400CC000_LABEL #define DT_USBD_MCUX_EHCI_NAME DT_NXP_KINETIS_USBD_402E0000_LABEL diff --git a/soc/arm/nxp_kinetis/k8x/dts_fixup.h b/soc/arm/nxp_kinetis/k8x/dts_fixup.h index ebf316ba7eb..03983ab8f67 100644 --- a/soc/arm/nxp_kinetis/k8x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k8x/dts_fixup.h @@ -15,10 +15,6 @@ #define DT_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY #define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL -#define DT_ENTROPY_MCUX_TRNG_BASE_ADDRESS DT_NXP_KINETIS_TRNG_400A0000_BASE_ADDRESS -#define DT_ENTROPY_MCUX_TRNG_IRQ DT_NXP_KINETIS_TRNG_400A0000_IRQ_0 -#define DT_ENTROPY_MCUX_TRNG_IRQ_PRI DT_NXP_KINETIS_TRNG_400A0000_IRQ_0_PRIORITY -#define DT_ENTROPY_MCUX_TRNG_NAME DT_NXP_KINETIS_TRNG_400A0000_LABEL #define CONFIG_ENTROPY_NAME DT_NXP_KINETIS_TRNG_400A0000_LABEL #define DT_RTC_0_NAME DT_NXP_KINETIS_RTC_4003D000_LABEL diff --git a/soc/arm/nxp_kinetis/kwx/dts_fixup.h b/soc/arm/nxp_kinetis/kwx/dts_fixup.h index 53e42136596..2b2a9f88b0f 100644 --- a/soc/arm/nxp_kinetis/kwx/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kwx/dts_fixup.h @@ -34,10 +34,6 @@ #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFA_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFA_40020000_LABEL -#define DT_ENTROPY_MCUX_TRNG_BASE_ADDRESS DT_NXP_KINETIS_TRNG_40029000_BASE_ADDRESS -#define DT_ENTROPY_MCUX_TRNG_IRQ DT_NXP_KINETIS_TRNG_40029000_IRQ_0 -#define DT_ENTROPY_MCUX_TRNG_IRQ_PRI DT_NXP_KINETIS_TRNG_40029000_IRQ_0_PRIORITY -#define DT_ENTROPY_MCUX_TRNG_NAME DT_NXP_KINETIS_TRNG_40029000_LABEL #define CONFIG_ENTROPY_NAME DT_NXP_KINETIS_TRNG_40029000_LABEL #endif /* CONFIG_SOC_MKW40Z4 || CONFIG_SOC_MKW41Z4 */