From 64bd0951e48c15c66782cb65a4a8c4407b61e069 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 24 Mar 2020 16:39:11 -0500 Subject: [PATCH] soc: silabs: Convert to new DT_INST macros Convert older DT_INST_ macro use the new include/devicetree.h DT_INST macro APIs. Signed-off-by: Kumar Gala --- soc/arm/silabs_exx32/efm32gg11b/dts_fixup.h | 6 +++--- soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h | 4 ++-- soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h | 4 ++-- soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h | 2 +- soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/soc/arm/silabs_exx32/efm32gg11b/dts_fixup.h b/soc/arm/silabs_exx32/efm32gg11b/dts_fixup.h index 08338ab49d2..392d6a13faf 100644 --- a/soc/arm/silabs_exx32/efm32gg11b/dts_fixup.h +++ b/soc/arm/silabs_exx32/efm32gg11b/dts_fixup.h @@ -14,9 +14,9 @@ #define DT_GPIO_GECKO_SWO_LOCATION DT_SILABS_GECKO_GPIO_40088400_LOCATION_SWO -#define DT_RTC_0_NAME DT_INST_0_SILABS_GECKO_RTCC_LABEL +#define DT_RTC_0_NAME DT_LABEL(DT_INST(0, silabs_gecko_rtcc)) -#define DT_WDT_0_NAME DT_INST_0_SILABS_GECKO_WDOG_LABEL -#define DT_WDT_1_NAME DT_INST_1_SILABS_GECKO_WDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, silabs_gecko_wdog)) +#define DT_WDT_1_NAME DT_LABEL(DT_INST(1, silabs_gecko_wdog)) /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h b/soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h index 1a2768057e1..00cf7a3bf3f 100644 --- a/soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h +++ b/soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h @@ -14,8 +14,8 @@ #define DT_GPIO_GECKO_SWO_LOCATION DT_SILABS_GECKO_GPIO_4000A400_LOCATION_SWO -#define DT_WDT_0_NAME DT_INST_0_SILABS_GECKO_WDOG_LABEL -#define DT_WDT_1_NAME DT_INST_1_SILABS_GECKO_WDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, silabs_gecko_wdog)) +#define DT_WDT_1_NAME DT_LABEL(DT_INST(1, silabs_gecko_wdog)) #define CONFIG_ENTROPY_NAME DT_SILABS_GECKO_TRNG_4001D000_LABEL /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h b/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h index cab08ea0502..01d7f88d22d 100644 --- a/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h +++ b/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h @@ -14,8 +14,8 @@ #define DT_GPIO_GECKO_SWO_LOCATION DT_SILABS_GECKO_GPIO_4000A400_LOCATION_SWO -#define DT_WDT_0_NAME DT_INST_0_SILABS_GECKO_WDOG_LABEL -#define DT_WDT_1_NAME DT_INST_1_SILABS_GECKO_WDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, silabs_gecko_wdog)) +#define DT_WDT_1_NAME DT_LABEL(DT_INST(1, silabs_gecko_wdog)) #define CONFIG_ENTROPY_NAME DT_SILABS_GECKO_TRNG_4001D000_LABEL /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h b/soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h index d0419bff874..d033db61af0 100644 --- a/soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h +++ b/soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h @@ -16,6 +16,6 @@ #define DT_GPIO_GECKO_SWO_LOCATION DT_SILABS_GECKO_GPIO_4000A400_LOCATION_SWO -#define DT_WDT_0_NAME DT_INST_0_SILABS_GECKO_WDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, silabs_gecko_wdog)) /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h b/soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h index 3d57c77c45b..616e52c4177 100644 --- a/soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h +++ b/soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h @@ -16,8 +16,8 @@ #define DT_GPIO_GECKO_SWO_LOCATION DT_SILABS_GECKO_GPIO_4000A400_LOCATION_SWO -#define DT_WDT_0_NAME DT_INST_0_SILABS_GECKO_WDOG_LABEL -#define DT_WDT_1_NAME DT_INST_1_SILABS_GECKO_WDOG_LABEL +#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, silabs_gecko_wdog)) +#define DT_WDT_1_NAME DT_LABEL(DT_INST(1, silabs_gecko_wdog)) #define CONFIG_ENTROPY_NAME DT_SILABS_GECKO_TRNG_4001D000_LABEL /* End of SoC Level DTS fixup file */