michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: silabs: use 'aliases' to remove dts_fixup defines

Browse source 
By adding 'aliases' node in SoC .dtsi file it is possible to generate
DT_ defines which specify a logical name rather than relay on module
location on APB bus. E.g. DT_SILABS_GECKO_USART_40010000_LABEL becomes
DT_SILABS_GECKO_USART_USART_0_LABEL. Thus it is possible to remove
dts_fixup.h defines.

Signed-off-by: Piotr Mienkowski <piotr.mienkowski@gmail.com>
This commit is contained in:
Piotr Mienkowski 2018-11-28 13:07:44 +01:00 • committed by Kumar Gala
commit 973af2c8d7
23 changed files with 188 additions and 379 deletions
Download patch file Download diff file Expand all files Collapse all files

38
drivers/serial/leuart_gecko.c
View file

@ -316,12 +316,12 @@ static void leuart_gecko_config_func_0(struct device *dev);
#endif
static const struct leuart_gecko_config leuart_gecko_0_config = {
.base = (LEUART_TypeDef *)DT_LEUART_GECKO_0_BASE_ADDRESS,
.base = (LEUART_TypeDef *)DT_SILABS_GECKO_LEUART_LEUART_0_BASE_ADDRESS,
.clock = cmuClock_LEUART0,
.baud_rate = DT_LEUART_GECKO_0_CURRENT_SPEED,
.baud_rate = DT_SILABS_GECKO_LEUART_LEUART_0_CURRENT_SPEED,
.pin_rx = PIN_LEUART0_RXD,
.pin_tx = PIN_LEUART0_TXD,
.loc = DT_LEUART_GECKO_0_LOCATION,
.loc = DT_SILABS_GECKO_LEUART_LEUART_0_LOCATION,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = leuart_gecko_config_func_0,
#endif
@ -329,19 +329,20 @@ static const struct leuart_gecko_config leuart_gecko_0_config = {
static struct leuart_gecko_data leuart_gecko_0_data;
DEVICE_AND_API_INIT(leuart_0, DT_LEUART_GECKO_0_LABEL, &leuart_gecko_init,
&leuart_gecko_0_data, &leuart_gecko_0_config, PRE_KERNEL_1,
DEVICE_AND_API_INIT(leuart_0, DT_SILABS_GECKO_LEUART_LEUART_0_LABEL,
&leuart_gecko_init, &leuart_gecko_0_data,
&leuart_gecko_0_config, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&leuart_gecko_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void leuart_gecko_config_func_0(struct device *dev)
{
IRQ_CONNECT(DT_LEUART_GECKO_0_IRQ,
DT_LEUART_GECKO_0_IRQ_PRIORITY, leuart_gecko_isr,
DEVICE_GET(leuart_0), 0);
IRQ_CONNECT(DT_SILABS_GECKO_LEUART_LEUART_0_IRQ,
DT_SILABS_GECKO_LEUART_LEUART_0_IRQ_PRIORITY,
leuart_gecko_isr, DEVICE_GET(leuart_0), 0);
irq_enable(DT_LEUART_GECKO_0_IRQ);
irq_enable(DT_SILABS_GECKO_LEUART_LEUART_0_IRQ);
}
#endif
@ -354,12 +355,12 @@ static void leuart_gecko_config_func_1(struct device *dev);
#endif
static const struct leuart_gecko_config leuart_gecko_1_config = {
.base = (LEUART_TypeDef *)CONFIG_LEUART_GECKO_1_BASE_ADDRESS,
.base = (LEUART_TypeDef *)DT_SILABS_GECKO_LEUART_LEUART_1_BASE_ADDRESS,
.clock = cmuClock_LEUART0,
.baud_rate = CONFIG_LEUART_GECKO_1_CURRENT_SPEED,
.baud_rate = DT_SILABS_GECKO_LEUART_LEUART_1_CURRENT_SPEED,
.pin_rx = PIN_LEUART1_RXD,
.pin_tx = PIN_LEUART1_TXD,
.loc = CONFIG_LEUART_GECKO_1_LOCATION,
.loc = DT_SILABS_GECKO_LEUART_LEUART_1_LOCATION,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = leuart_gecko_config_func_1,
#endif
@ -367,19 +368,20 @@ static const struct leuart_gecko_config leuart_gecko_1_config = {
static struct leuart_gecko_data leuart_gecko_1_data;
DEVICE_AND_API_INIT(leuart_1, CONFIG_LEUART_GECKO_1_LABEL, &leuart_gecko_init,
&leuart_gecko_1_data, &leuart_gecko_1_config, PRE_KERNEL_1,
DEVICE_AND_API_INIT(leuart_1, DT_SILABS_GECKO_LEUART_LEUART_1_LABEL,
&leuart_gecko_init, &leuart_gecko_1_data,
&leuart_gecko_1_config, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&leuart_gecko_driver_api);
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void leuart_gecko_config_func_1(struct device *dev)
{
IRQ_CONNECT(CONFIG_LEUART_GECKO_1_IRQ,
CONFIG_LEUART_GECKO_1_IRQ_PRIORITY, leuart_gecko_isr,
DEVICE_GET(leuart_1), 0);
IRQ_CONNECT(DT_SILABS_GECKO_LEUART_LEUART_1_IRQ,
DT_SILABS_GECKO_LEUART_LEUART_1_IRQ_PRIORITY,
leuart_gecko_isr, DEVICE_GET(leuart_1), 0);
irq_enable(CONFIG_LEUART_GECKO_1_IRQ);
irq_enable(DT_SILABS_GECKO_LEUART_LEUART_1_IRQ);
}
#endif