From 83fa6c9554c17ad66b3132902b922521e95b7b28 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Fri, 23 Feb 2018 10:12:35 -0600 Subject: [PATCH] dts: arm: Refactor SoC dts.fixup into arch/arm/soc Move common SoC dts.fixup defines into arch/arm/soc//dts.fixup so we remove duplication in the boards and only have board specific defines in boards/arm//dts.fixup. Signed-off-by: Kumar Gala --- {boards/arm/v2m_beetle => arch/arm/soc/arm/beetle}/dts.fixup | 4 ++++ {boards/arm/mps2_an385 => arch/arm/soc/arm/mps2}/dts.fixup | 4 ++++ .../arm/soc/silabs_exx32/efm32wg}/dts.fixup | 3 +++ .../arm/qemu_cortex_m3 => arch/arm/soc/ti_lm3s6965}/dts.fixup | 4 ++++ 4 files changed, 15 insertions(+) rename {boards/arm/v2m_beetle => arch/arm/soc/arm/beetle}/dts.fixup (96%) rename {boards/arm/mps2_an385 => arch/arm/soc/arm/mps2}/dts.fixup (97%) rename {boards/arm/efm32wg_stk3800 => arch/arm/soc/silabs_exx32/efm32wg}/dts.fixup (89%) rename {boards/arm/qemu_cortex_m3 => arch/arm/soc/ti_lm3s6965}/dts.fixup (53%) diff --git a/boards/arm/v2m_beetle/dts.fixup b/arch/arm/soc/arm/beetle/dts.fixup similarity index 96% rename from boards/arm/v2m_beetle/dts.fixup rename to arch/arm/soc/arm/beetle/dts.fixup index 6d35f948d0d..c342179560e 100644 --- a/boards/arm/v2m_beetle/dts.fixup +++ b/arch/arm/soc/arm/beetle/dts.fixup @@ -1,3 +1,5 @@ +/* SoC level DTS fixup file */ + #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS /* CMSDK APB Timers */ @@ -35,3 +37,5 @@ #define CMSDK_AHB_GPIO2 ARM_CMSDK_GPIO_40012000_BASE_ADDRESS_0 #define CMSDK_AHB_GPIO3 ARM_CMSDK_GPIO_40013000_BASE_ADDRESS_0 + +/* End of SoC Level DTS fixup file */ diff --git a/boards/arm/mps2_an385/dts.fixup b/arch/arm/soc/arm/mps2/dts.fixup similarity index 97% rename from boards/arm/mps2_an385/dts.fixup rename to arch/arm/soc/arm/mps2/dts.fixup index 96b75d95db4..5b2f78815d1 100644 --- a/boards/arm/mps2_an385/dts.fixup +++ b/arch/arm/soc/arm/mps2/dts.fixup @@ -1,3 +1,5 @@ +/* SoC level DTS fixup file */ + #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS /* CMSDK APB Timers */ @@ -62,3 +64,5 @@ #define CMSDK_AHB_GPIO3 ARM_CMSDK_GPIO_40013000_BASE_ADDRESS_0 #define IRQ_PORT3_ALL ARM_CMSDK_GPIO_40013000_IRQ_0 + +/* End of SoC Level DTS fixup file */ diff --git a/boards/arm/efm32wg_stk3800/dts.fixup b/arch/arm/soc/silabs_exx32/efm32wg/dts.fixup similarity index 89% rename from boards/arm/efm32wg_stk3800/dts.fixup rename to arch/arm/soc/silabs_exx32/efm32wg/dts.fixup index e9355a15fed..7e47ee78e26 100644 --- a/boards/arm/efm32wg_stk3800/dts.fixup +++ b/arch/arm/soc/silabs_exx32/efm32wg/dts.fixup @@ -4,9 +4,12 @@ * generated data matches the driver definitions. */ +/* SoC level DTS fixup file */ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS #define CONFIG_UART_GECKO_0_NAME SILABS_EFM32_USART_4000C000_LABEL #define CONFIG_UART_GECKO_0_BAUD_RATE SILABS_EFM32_USART_4000C000_CURRENT_SPEED #define CONFIG_UART_GECKO_0_IRQ_PRI SILABS_EFM32_USART_4000C000_IRQ_0_PRIORITY + +/* End of SoC Level DTS fixup file */ diff --git a/boards/arm/qemu_cortex_m3/dts.fixup b/arch/arm/soc/ti_lm3s6965/dts.fixup similarity index 53% rename from boards/arm/qemu_cortex_m3/dts.fixup rename to arch/arm/soc/ti_lm3s6965/dts.fixup index af1312e9de4..c98ac9fd42e 100644 --- a/boards/arm/qemu_cortex_m3/dts.fixup +++ b/arch/arm/soc/ti_lm3s6965/dts.fixup @@ -1 +1,5 @@ +/* SoC level DTS fixup file */ + #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS + +/* End of SoC Level DTS fixup file */