From 0acc0fdd4bf6a03d06030e066531c2aa22f7daa6 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 10 Oct 2018 12:14:24 -0500 Subject: [PATCH] soc: silabs: efm32hg: Move USART fixups from board to SoC The USART fixup in the board dir really are SoC level fixup's. So move them there and remove the board fixup file since there isn't anything in it now. Signed-off-by: Kumar Gala --- boards/arm/efm32hg_slstk3400a/dts_fixup.h | 15 --------------- soc/arm/silabs_exx32/efm32hg/dts_fixup.h | 11 ++++++++--- 2 files changed, 8 insertions(+), 18 deletions(-) delete mode 100644 boards/arm/efm32hg_slstk3400a/dts_fixup.h diff --git a/boards/arm/efm32hg_slstk3400a/dts_fixup.h b/boards/arm/efm32hg_slstk3400a/dts_fixup.h deleted file mode 100644 index a5aee8d17fc..00000000000 --- a/boards/arm/efm32hg_slstk3400a/dts_fixup.h +++ /dev/null @@ -1,15 +0,0 @@ -/* This file is a temporary workaround for mapping of the generated information - * to the current driver definitions. This will be removed when the drivers - * are modified to handle the generated information, or the mapping of - * generated data matches the driver definitions. - */ - - -#define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_USART_GECKO_0_NAME SILABS_EFM32_USART_4000C000_LABEL -#define CONFIG_USART_GECKO_1_NAME SILABS_EFM32_USART_4000C400_LABEL - -#define CONFIG_USART_GECKO_0_BAUD_RATE SILABS_EFM32_USART_4000C000_CURRENT_SPEED -#define CONFIG_USART_GECKO_0_IRQ_PRI SILABS_EFM32_USART_4000C000_IRQ_0_PRIORITY -#define CONFIG_USART_GECKO_1_BAUD_RATE SILABS_EFM32_USART_4000C400_CURRENT_SPEED -#define CONFIG_USART_GECKO_1_IRQ_PRI SILABS_EFM32_USART_4000C400_IRQ_0_PRIORITY diff --git a/soc/arm/silabs_exx32/efm32hg/dts_fixup.h b/soc/arm/silabs_exx32/efm32hg/dts_fixup.h index 2fe989a3121..83c9f46b10c 100644 --- a/soc/arm/silabs_exx32/efm32hg/dts_fixup.h +++ b/soc/arm/silabs_exx32/efm32hg/dts_fixup.h @@ -7,10 +7,15 @@ /* SoC level DTS fixup file */ #define CONFIG_NUM_IRQ_PRIO_BITS ARM_V6M_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 +#define CONFIG_USART_GECKO_0_NAME SILABS_EFM32_USART_4000C000_LABEL +#define CONFIG_USART_GECKO_0_BAUD_RATE SILABS_EFM32_USART_4000C000_CURRENT_SPEED +#define CONFIG_USART_GECKO_0_IRQ_PRI SILABS_EFM32_USART_4000C000_IRQ_0_PRIORITY + +#define CONFIG_USART_GECKO_1_NAME SILABS_EFM32_USART_4000C400_LABEL +#define CONFIG_USART_GECKO_1_BAUD_RATE SILABS_EFM32_USART_4000C400_CURRENT_SPEED +#define CONFIG_USART_GECKO_1_IRQ_PRI SILABS_EFM32_USART_4000C400_IRQ_0_PRIORITY + #define CONFIG_GPIO_GECKO_COMMON_NAME SILABS_EFM32_GPIO_40006100_LABEL #define CONFIG_GPIO_GECKO_COMMON_EVEN_IRQ SILABS_EFM32_GPIO_40006100_IRQ_GPIO_EVEN