From f3b4d8a86f7810249486bfe17a3b372db2580b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Thu, 16 Apr 2020 14:18:52 -0700 Subject: [PATCH] soc: remove DT_WDT_0_NAME, DT_WDT_1_NAME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are no more in-tree users of these fixup macros. Signed-off-by: Martí Bolívar --- soc/arm/microchip_mec/mec1501/dts_fixup.h | 2 -- soc/arm/nordic_nrf/nrf51/dts_fixup.h | 2 -- soc/arm/nordic_nrf/nrf52/dts_fixup.h | 2 -- soc/arm/nordic_nrf/nrf53/dts_fixup.h | 2 -- soc/arm/nordic_nrf/nrf91/dts_fixup.h | 2 -- soc/arm/nxp_kinetis/ke1xf/dts_fixup.h | 2 -- soc/arm/silabs_exx32/efm32gg11b/dts_fixup.h | 3 --- soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h | 3 --- soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h | 3 --- soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h | 2 -- soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h | 3 --- soc/arm/st_stm32/stm32f0/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32f1/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32f2/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32f3/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32f4/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32f7/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32g0/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32g4/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32l0/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32l1/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32l4/dts_fixup.h | 2 -- soc/arm/st_stm32/stm32wb/dts_fixup.h | 2 -- soc/xtensa/esp32/dts_fixup.h | 1 - 24 files changed, 51 deletions(-) diff --git a/soc/arm/microchip_mec/mec1501/dts_fixup.h b/soc/arm/microchip_mec/mec1501/dts_fixup.h index 7c27ef771cc..98a868ec7a3 100644 --- a/soc/arm/microchip_mec/mec1501/dts_fixup.h +++ b/soc/arm/microchip_mec/mec1501/dts_fixup.h @@ -66,8 +66,6 @@ #define DT_RTC_0_NAME DT_LABEL(DT_INST(0, microchip_xec_timer)) -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, microchip_xec_watchdog)) - #define DT_KSCAN_0_NAME DT_LABEL(DT_INST(0, microchip_xec_kscan)) #define DT_SPI_XEC_QMSPI_0_LABEL \ diff --git a/soc/arm/nordic_nrf/nrf51/dts_fixup.h b/soc/arm/nordic_nrf/nrf51/dts_fixup.h index 64f9fa07ba3..7d6013ff17b 100644 --- a/soc/arm/nordic_nrf/nrf51/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf51/dts_fixup.h @@ -13,8 +13,6 @@ #define DT_SPI_0_NAME DT_NORDIC_NRF_SPI_SPI_0_LABEL #define DT_SPI_1_NAME DT_NORDIC_NRF_SPI_SPI_1_LABEL -#define DT_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL - #define DT_RTC_0_NAME DT_NORDIC_NRF_RTC_RTC_0_LABEL #define DT_RTC_1_NAME DT_NORDIC_NRF_RTC_RTC_1_LABEL diff --git a/soc/arm/nordic_nrf/nrf52/dts_fixup.h b/soc/arm/nordic_nrf/nrf52/dts_fixup.h index 6173a020cd1..cf6659397d8 100644 --- a/soc/arm/nordic_nrf/nrf52/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf52/dts_fixup.h @@ -37,8 +37,6 @@ #define DT_SPI_3_NAME DT_NORDIC_NRF_SPIM_SPI_3_LABEL -#define DT_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL - #define DT_RTC_0_NAME DT_NORDIC_NRF_RTC_RTC_0_LABEL #define DT_RTC_1_NAME DT_NORDIC_NRF_RTC_RTC_1_LABEL #define DT_RTC_2_NAME DT_NORDIC_NRF_RTC_RTC_2_LABEL diff --git a/soc/arm/nordic_nrf/nrf53/dts_fixup.h b/soc/arm/nordic_nrf/nrf53/dts_fixup.h index ccd83ad8c21..246b356ffdd 100644 --- a/soc/arm/nordic_nrf/nrf53/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf53/dts_fixup.h @@ -20,8 +20,6 @@ #define DT_SPI_1_NAME DT_NORDIC_NRF_SPIM_SPI_1_LABEL #define DT_SPI_2_NAME DT_NORDIC_NRF_SPIM_SPI_2_LABEL -#define DT_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL - #define DT_TIMER_0_NAME DT_NORDIC_NRF_TIMER_TIMER_0_LABEL #define DT_TIMER_1_NAME DT_NORDIC_NRF_TIMER_TIMER_1_LABEL #define DT_TIMER_2_NAME DT_NORDIC_NRF_TIMER_TIMER_2_LABEL diff --git a/soc/arm/nordic_nrf/nrf91/dts_fixup.h b/soc/arm/nordic_nrf/nrf91/dts_fixup.h index 6a81351d3d1..2c38ccc7765 100644 --- a/soc/arm/nordic_nrf/nrf91/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf91/dts_fixup.h @@ -22,8 +22,6 @@ #define DT_SPI_2_NAME DT_NORDIC_NRF_SPIM_SPI_2_LABEL #define DT_SPI_3_NAME DT_NORDIC_NRF_SPIM_SPI_3_LABEL -#define DT_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL - #define DT_TIMER_0_NAME DT_NORDIC_NRF_TIMER_TIMER_0_LABEL #define DT_TIMER_1_NAME DT_NORDIC_NRF_TIMER_TIMER_1_LABEL #define DT_TIMER_2_NAME DT_NORDIC_NRF_TIMER_TIMER_2_LABEL diff --git a/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h b/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h index e4fc5de3e61..eac7e5f3589 100644 --- a/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h +++ b/soc/arm/nxp_kinetis/ke1xf/dts_fixup.h @@ -14,7 +14,5 @@ #define DT_ADC_1_NAME DT_NXP_KINETIS_ADC12_40027000_LABEL #define DT_ADC_2_NAME DT_NXP_KINETIS_ADC12_4003C000_LABEL -#define DT_WDT_0_NAME DT_NXP_KINETIS_WDOG32_40052000_LABEL - #define DT_CAN_0_NAME DT_NXP_KINETIS_FLEXCAN_40024000_LABEL #define DT_CAN_1_NAME DT_NXP_KINETIS_FLEXCAN_40025000_LABEL diff --git a/soc/arm/silabs_exx32/efm32gg11b/dts_fixup.h b/soc/arm/silabs_exx32/efm32gg11b/dts_fixup.h index df345837be8..cfaaed5d686 100644 --- a/soc/arm/silabs_exx32/efm32gg11b/dts_fixup.h +++ b/soc/arm/silabs_exx32/efm32gg11b/dts_fixup.h @@ -14,7 +14,4 @@ #define DT_RTC_0_NAME DT_LABEL(DT_INST(0, silabs_gecko_rtcc)) -#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 89d978e6997..d9f673305e2 100644 --- a/soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h +++ b/soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h @@ -13,7 +13,4 @@ #define DT_GPIO_GECKO_SWO_LOCATION DT_SILABS_GECKO_GPIO_4000A400_LOCATION_SWO -#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/efm32pg12b/dts_fixup.h b/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h index 32a7421c9f1..05787bd0af2 100644 --- a/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h +++ b/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h @@ -13,7 +13,4 @@ #define DT_GPIO_GECKO_SWO_LOCATION DT_SILABS_GECKO_GPIO_4000A400_LOCATION_SWO -#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/efr32fg1p/dts_fixup.h b/soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h index 3d9cced46b4..9a4b713bfaf 100644 --- a/soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h +++ b/soc/arm/silabs_exx32/efr32fg1p/dts_fixup.h @@ -15,6 +15,4 @@ #define DT_GPIO_GECKO_SWO_LOCATION DT_SILABS_GECKO_GPIO_4000A400_LOCATION_SWO -#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 4f9344548e1..9a4b713bfaf 100644 --- a/soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h +++ b/soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h @@ -15,7 +15,4 @@ #define DT_GPIO_GECKO_SWO_LOCATION DT_SILABS_GECKO_GPIO_4000A400_LOCATION_SWO -#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/st_stm32/stm32f0/dts_fixup.h b/soc/arm/st_stm32/stm32f0/dts_fixup.h index e26cc560e1d..49dd5dc49ad 100644 --- a/soc/arm/st_stm32/stm32f0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f0/dts_fixup.h @@ -16,8 +16,6 @@ #define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, st_stm32f0_flash_controller)) -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32f1/dts_fixup.h b/soc/arm/st_stm32/stm32f1/dts_fixup.h index 1812c568045..d84ebecf72d 100644 --- a/soc/arm/st_stm32/stm32f1/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f1/dts_fixup.h @@ -2,8 +2,6 @@ /* SoC level DTS fixup file */ -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL #define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS diff --git a/soc/arm/st_stm32/stm32f2/dts_fixup.h b/soc/arm/st_stm32/stm32f2/dts_fixup.h index 441496530b8..e8a1be97d0d 100644 --- a/soc/arm/st_stm32/stm32f2/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f2/dts_fixup.h @@ -2,8 +2,6 @@ /* SoC level DTS fixup file */ -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012000_LABEL /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32f3/dts_fixup.h b/soc/arm/st_stm32/stm32f3/dts_fixup.h index 67e58fcfb79..fb3506c6799 100644 --- a/soc/arm/st_stm32/stm32f3/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f3/dts_fixup.h @@ -6,8 +6,6 @@ #define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - #define DT_ADC_1_NAME DT_ST_STM32_ADC_50000000_LABEL #define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS diff --git a/soc/arm/st_stm32/stm32f4/dts_fixup.h b/soc/arm/st_stm32/stm32f4/dts_fixup.h index 8f7f846c9f4..23dc458c284 100644 --- a/soc/arm/st_stm32/stm32f4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f4/dts_fixup.h @@ -142,8 +142,6 @@ #define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012000_LABEL #define DT_CAN_1_BASE_ADDRESS DT_ST_STM32_CAN_40006400_BASE_ADDRESS diff --git a/soc/arm/st_stm32/stm32f7/dts_fixup.h b/soc/arm/st_stm32/stm32f7/dts_fixup.h index 4e5f4e0deb3..5a97568fb81 100644 --- a/soc/arm/st_stm32/stm32f7/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f7/dts_fixup.h @@ -21,8 +21,6 @@ #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012000_LABEL /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32g0/dts_fixup.h b/soc/arm/st_stm32/stm32g0/dts_fixup.h index f14789dd6d5..897e3e56f1b 100644 --- a/soc/arm/st_stm32/stm32g0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32g0/dts_fixup.h @@ -11,6 +11,4 @@ #define DT_PWM_STM32_3_DEV_NAME DT_ST_STM32_PWM_40000400_PWM_LABEL #define DT_PWM_STM32_3_PRESCALER DT_ST_STM32_PWM_40000400_PWM_ST_PRESCALER -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32g4/dts_fixup.h b/soc/arm/st_stm32/stm32g4/dts_fixup.h index ed9983329b3..b293f68b081 100644 --- a/soc/arm/st_stm32/stm32g4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32g4/dts_fixup.h @@ -13,6 +13,4 @@ #define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/st_stm32/stm32l0/dts_fixup.h b/soc/arm/st_stm32/stm32l0/dts_fixup.h index 7307acc93ea..edcdc3e1fee 100644 --- a/soc/arm/st_stm32/stm32l0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l0/dts_fixup.h @@ -2,8 +2,6 @@ /* SoC level DTS fixup file */ -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL #define DT_RTC_0_NAME DT_ST_STM32_RTC_40002800_LABEL diff --git a/soc/arm/st_stm32/stm32l1/dts_fixup.h b/soc/arm/st_stm32/stm32l1/dts_fixup.h index c57bdbc355a..a27be1260da 100644 --- a/soc/arm/st_stm32/stm32l1/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l1/dts_fixup.h @@ -6,8 +6,6 @@ /* SoC level DTS fixup file */ -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - #define DT_ADC_1_NAME DT_ST_STM32_ADC_40012400_LABEL #define DT_RTC_0_NAME DT_LABEL(DT_INST(0, st_stm32_rtc)) diff --git a/soc/arm/st_stm32/stm32l4/dts_fixup.h b/soc/arm/st_stm32/stm32l4/dts_fixup.h index 543499fd174..be8c88a53f7 100644 --- a/soc/arm/st_stm32/stm32l4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l4/dts_fixup.h @@ -21,8 +21,6 @@ #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - #define DT_ADC_1_NAME DT_ST_STM32_ADC_50040000_LABEL #define DT_LPTIM_1_BASE_ADDRESS DT_ST_STM32_TIMERS_40007C00_BASE_ADDRESS diff --git a/soc/arm/st_stm32/stm32wb/dts_fixup.h b/soc/arm/st_stm32/stm32wb/dts_fixup.h index 36895cf7512..c7df1a521d3 100644 --- a/soc/arm/st_stm32/stm32wb/dts_fixup.h +++ b/soc/arm/st_stm32/stm32wb/dts_fixup.h @@ -12,8 +12,6 @@ #define DT_ADC_1_NAME DT_ST_STM32_ADC_50040000_LABEL -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, st_stm32_watchdog)) - #define DT_LPTIM_1_BASE_ADDRESS DT_ST_STM32_TIMERS_40007C00_BASE_ADDRESS #define DT_LPTIM_1_IRQ DT_ST_STM32_TIMERS_40007C00_IRQ_0 #define DT_LPTIM_1_IRQ_PRI DT_ST_STM32_TIMERS_40007C00_IRQ_0_PRIORITY diff --git a/soc/xtensa/esp32/dts_fixup.h b/soc/xtensa/esp32/dts_fixup.h index 6a2b1f42835..11d02ffc4b9 100644 --- a/soc/xtensa/esp32/dts_fixup.h +++ b/soc/xtensa/esp32/dts_fixup.h @@ -7,5 +7,4 @@ /* SoC level DTS fixup file */ #define DT_CPU_CLOCK_FREQUENCY DT_CADENCE_TENSILICA_XTENSA_LX6_0_CLOCK_FREQUENCY -#define DT_WDT_0_NAME DT_LABEL(DT_INST(0, espressif_esp32_watchdog)) /* End of SoC Level DTS fixup file */