diff --git a/arch/arm/soc/arm/beetle/Kconfig.defconfig.series b/arch/arm/soc/arm/beetle/Kconfig.defconfig.series index 61646d312ce..d32184bec85 100644 --- a/arch/arm/soc/arm/beetle/Kconfig.defconfig.series +++ b/arch/arm/soc/arm/beetle/Kconfig.defconfig.series @@ -13,16 +13,16 @@ source "arch/arm/soc/arm/beetle/Kconfig.defconfig.beetle*" config SOC_SERIES default beetle +config NUM_IRQS + int + default 45 + if !HAS_DTS config NUM_IRQ_PRIO_BITS int default 3 -config NUM_IRQS - int - default 45 - config SRAM_BASE_ADDRESS default 0x20000000 diff --git a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series index a472216cd83..29a7e2cc449 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series +++ b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.series @@ -23,13 +23,13 @@ config NUM_IRQ_PRIO_BITS int default 4 +endif # !HAS_DTS + config NUM_IRQS int # must be >= the highest interrupt number used default 86 -endif # !HAS_DTS - source "arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk*" endif # SOC_SERIES_KINETIS_K6X diff --git a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 index 72ad54ad8cf..e03a2d23e41 100644 --- a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 +++ b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.defconfig.mkw41z4 @@ -17,12 +17,12 @@ config NUM_IRQ_PRIO_BITS int default 2 +endif # !HAS_DTS + config NUM_IRQS int default 32 -endif # !HAS_DTS - if PINMUX config PINMUX_MCUX diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb index e256548799c..2472b136c2e 100644 --- a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb +++ b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb @@ -17,11 +17,11 @@ config SRAM_SIZE config FLASH_SIZE default 128 +endif # !HAS_DTS config NUM_IRQS int default 59 -endif # !HAS_DTS endif # SOC_STM32F103XB diff --git a/arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx b/arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx index ae5f9135fa6..9a4ff286d7a 100644 --- a/arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx +++ b/arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx @@ -19,10 +19,11 @@ config SRAM_SIZE config FLASH_SIZE default 1024 +endif # !HAS_DTS + config NUM_IRQS int default 82 -endif # !HAS_DTS endif # SOC_STM32L476XX diff --git a/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc3200 b/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc3200 index 18817b14ec2..2e16c30b0c8 100644 --- a/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc3200 +++ b/arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc3200 @@ -18,14 +18,14 @@ config SRAM_SIZE config FLASH_SIZE default 0 +endif # !HAS_DTS + config NUM_IRQS int # must be >= the highest interrupt number used # This includes the NWP interrupt default 179 -endif # !HAS_DTS - config CC3200SDK_LIBRARY def_bool n diff --git a/dts/arm/cc3200_launchxl.fixup b/dts/arm/cc3200_launchxl.fixup index 1e8b2f62072..e92cd6aeab1 100644 --- a/dts/arm/cc3200_launchxl.fixup +++ b/dts/arm/cc3200_launchxl.fixup @@ -1,4 +1,3 @@ -#define CONFIG_NUM_IRQS ARM_ARMV7M_NVIC_E000E100_NUM_IRQS #define CONFIG_NUM_IRQ_PRIO_BITS ARM_ARMV7M_NVIC_E000E100_NUM_IRQ_PRIO_BITS #define EXCEPTION_UARTA0 TI_CC32XX_UART_4000C000_IRQ_0 diff --git a/dts/arm/cc32xx_launchxl.dtsi b/dts/arm/cc32xx_launchxl.dtsi index 68325ce942b..01f9ce15c78 100644 --- a/dts/arm/cc32xx_launchxl.dtsi +++ b/dts/arm/cc32xx_launchxl.dtsi @@ -46,5 +46,4 @@ &nvic { num-irq-prio-bits = <3>; - num-irqs = <179>; }; diff --git a/dts/arm/frdm_k64f.fixup b/dts/arm/frdm_k64f.fixup index e4e0ec96646..d38f5609fcc 100644 --- a/dts/arm/frdm_k64f.fixup +++ b/dts/arm/frdm_k64f.fixup @@ -1,4 +1,3 @@ -#define CONFIG_NUM_IRQS ARM_ARMV7M_NVIC_E000E100_NUM_IRQS #define CONFIG_NUM_IRQ_PRIO_BITS ARM_ARMV7M_NVIC_E000E100_NUM_IRQ_PRIO_BITS #define CONFIG_UART_MCUX_0_BAUD_RATE NXP_K64F_UART_4006A000_BAUD_RATE diff --git a/dts/arm/frdm_kw41z.fixup b/dts/arm/frdm_kw41z.fixup index 69926142fab..90e32cb60e3 100644 --- a/dts/arm/frdm_kw41z.fixup +++ b/dts/arm/frdm_kw41z.fixup @@ -1,4 +1,3 @@ -#define CONFIG_NUM_IRQS ARM_ARMV6M_NVIC_E000E100_NUM_IRQS #define CONFIG_NUM_IRQ_PRIO_BITS ARM_ARMV6M_NVIC_E000E100_NUM_IRQ_PRIO_BITS #define CONFIG_UART_MCUX_LPUART_0_BAUD_RATE NXP_KW41Z_LPUART_40054000_BAUD_RATE diff --git a/dts/arm/hexiwear_k64.fixup b/dts/arm/hexiwear_k64.fixup index e4e0ec96646..d38f5609fcc 100644 --- a/dts/arm/hexiwear_k64.fixup +++ b/dts/arm/hexiwear_k64.fixup @@ -1,4 +1,3 @@ -#define CONFIG_NUM_IRQS ARM_ARMV7M_NVIC_E000E100_NUM_IRQS #define CONFIG_NUM_IRQ_PRIO_BITS ARM_ARMV7M_NVIC_E000E100_NUM_IRQ_PRIO_BITS #define CONFIG_UART_MCUX_0_BAUD_RATE NXP_K64F_UART_4006A000_BAUD_RATE diff --git a/dts/arm/nucleo_l476rg.fixup b/dts/arm/nucleo_l476rg.fixup index 56061acf4b2..37425ebbb26 100644 --- a/dts/arm/nucleo_l476rg.fixup +++ b/dts/arm/nucleo_l476rg.fixup @@ -4,8 +4,6 @@ * generated data matches the driver definitions. */ - -#define CONFIG_NUM_IRQS ARM_ARMV7M_NVIC_E000E100_NUM_IRQS #define CONFIG_NUM_IRQ_PRIO_BITS ARM_ARMV7M_NVIC_E000E100_NUM_IRQ_PRIO_BITS #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS diff --git a/dts/arm/nxp_k6x.dtsi b/dts/arm/nxp_k6x.dtsi index 0084f1d40ae..cc2d9e1f2f9 100644 --- a/dts/arm/nxp_k6x.dtsi +++ b/dts/arm/nxp_k6x.dtsi @@ -271,6 +271,5 @@ }; &nvic { - num-irqs = <86>; num-irq-prio-bits = <4>; }; diff --git a/dts/arm/nxp_kw41z.dtsi b/dts/arm/nxp_kw41z.dtsi index e4f280b6d30..2dee8e81ad1 100644 --- a/dts/arm/nxp_kw41z.dtsi +++ b/dts/arm/nxp_kw41z.dtsi @@ -182,6 +182,5 @@ }; &nvic { - num-irqs = <32>; num-irq-prio-bits = <2>; }; diff --git a/dts/arm/olimexino_stm32.fixup b/dts/arm/olimexino_stm32.fixup index b81effe2fa0..e944f021ae1 100644 --- a/dts/arm/olimexino_stm32.fixup +++ b/dts/arm/olimexino_stm32.fixup @@ -5,7 +5,6 @@ */ -#define CONFIG_NUM_IRQS ARM_ARMV7M_NVIC_E000E100_NUM_IRQS #define CONFIG_NUM_IRQ_PRIO_BITS ARM_ARMV7M_NVIC_E000E100_NUM_IRQ_PRIO_BITS #define CONFIG_UART_STM32_PORT_1_BASE_ADDRESS ST_STM32_USART_40013800_BASE_ADDRESS diff --git a/dts/arm/stm32f103xb.dtsi b/dts/arm/stm32f103xb.dtsi index 891da8d4c73..92b89f35ff8 100644 --- a/dts/arm/stm32f103xb.dtsi +++ b/dts/arm/stm32f103xb.dtsi @@ -94,5 +94,4 @@ &nvic { num-irq-prio-bits = <4>; - num-irqs = <59>; }; diff --git a/dts/arm/stm32l476.dtsi b/dts/arm/stm32l476.dtsi index 1efa09e7eaa..579dc0ff052 100644 --- a/dts/arm/stm32l476.dtsi +++ b/dts/arm/stm32l476.dtsi @@ -126,5 +126,4 @@ &nvic { num-irq-prio-bits = <4>; - num-irqs = <82>; }; diff --git a/dts/arm/v2m_beetle.dts b/dts/arm/v2m_beetle.dts index e044e55321a..e90f2ac8d58 100644 --- a/dts/arm/v2m_beetle.dts +++ b/dts/arm/v2m_beetle.dts @@ -48,5 +48,4 @@ &nvic { num-irq-prio-bits = <3>; - num-irqs = <45>; }; diff --git a/dts/arm/v2m_beetle.fixup b/dts/arm/v2m_beetle.fixup index 64934fe8b90..c01729d6a9e 100644 --- a/dts/arm/v2m_beetle.fixup +++ b/dts/arm/v2m_beetle.fixup @@ -1,4 +1,3 @@ -#define CONFIG_NUM_IRQS ARM_ARMV7M_NVIC_E000E100_NUM_IRQS #define CONFIG_NUM_IRQ_PRIO_BITS ARM_ARMV7M_NVIC_E000E100_NUM_IRQ_PRIO_BITS #define CMSDK_APB_UART_0_IRQ ARM_CMSDK_UART_40004000_IRQ_0 diff --git a/dts/arm/yaml/arm,armv6m-nvic.yaml b/dts/arm/yaml/arm,armv6m-nvic.yaml index 1aed64fa54e..c384130e0dd 100644 --- a/dts/arm/yaml/arm,armv6m-nvic.yaml +++ b/dts/arm/yaml/arm,armv6m-nvic.yaml @@ -24,12 +24,6 @@ properties: description: number of bits of IRQ priorities generation: define - - num-irqs: - category: required - type: int - description: number of interrupts controlled by controller - generation: define - cell_string: IRQ "#cells": diff --git a/dts/arm/yaml/arm_cortex_m4_nvic.yaml b/dts/arm/yaml/arm_cortex_m4_nvic.yaml index fe175541aed..58bbe35597a 100644 --- a/dts/arm/yaml/arm_cortex_m4_nvic.yaml +++ b/dts/arm/yaml/arm_cortex_m4_nvic.yaml @@ -24,12 +24,6 @@ properties: description: number of bits of IRQ priorities generation: define - - num-irqs: - category: required - type: int - description: number of interrupts controlled by controller - generation: define - cell_string: IRQ "#cells":