Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 8, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion boards/arm/efm32hg_slstk3400a/efm32hg_slstk3400a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
led1 = &led1;
sw0 = &button0;
sw1 = &button1;
usart-1 = &usart1;
};

leds {
Expand Down
3 changes: 0 additions & 3 deletions boards/arm/efm32pg_stk3402a/efm32pg_stk3402a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@

/* These aliases are provided for compatibility with samples */
aliases {
i2c-0 = &i2c0;
usart-0 = &usart0;
leuart-0 = &leuart0;
led0 = &led0;
led1 = &led1;
sw0 = &button0;
Expand Down
4 changes: 0 additions & 4 deletions boards/arm/efm32wg_stk3800/efm32wg_stk3800.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
model = "Silicon Labs EFM32WG STK3800 board";
compatible = "silabs,efm32wg_stk3800", "silabs,efm32wg";

aliases {
uart-0 = &uart0;
};

chosen {
zephyr,console = &uart0;
zephyr,sram = &sram0;
Expand Down
4 changes: 0 additions & 4 deletions boards/arm/efr32_slwstk6061a/efr32_slwstk6061a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
model = "Silicon Labs EFR32 SLWSTK6061A board";
compatible = "silabs,efr32_slwstk6061a", "silabs,efr32fg1p";

aliases {
usart-0 = &usart0;
};

chosen {
zephyr,console = &usart0;
zephyr,sram = &sram0;
Expand Down
4 changes: 0 additions & 4 deletions boards/arm/efr32mg_sltb004a/efr32mg_sltb004a.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
compatible = "silabs,efr32mg_sltb004a", "silabs,efr32mg";

aliases {
i2c-0 = &i2c0;
i2c-1 = &i2c1;
usart-0 = &usart0;
leuart-0 = &leuart0;
led0 = &led0;
led1 = &led1;
sw0 = &button0;
Expand Down
28 changes: 14 additions & 14 deletions drivers/i2c/i2c_gecko.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,38 +180,38 @@ static const struct i2c_driver_api i2c_gecko_driver_api = {

#ifdef CONFIG_I2C_0
static struct i2c_gecko_config i2c_gecko_config_0 = {
.base = (I2C_TypeDef *)DT_I2C_GECKO_0_BASE_ADDRESS,
.base = (I2C_TypeDef *)DT_SILABS_GECKO_I2C_I2C_0_BASE_ADDRESS,
.clock = cmuClock_I2C0,
.i2cInit = I2C_INIT_DEFAULT,
.pin_sda = PIN_I2C0_SDA,
.pin_scl = PIN_I2C0_SCL,
.loc = DT_I2C_GECKO_0_LOCATION,
.bitrate = DT_I2C_GECKO_0_CLOCK_FREQUENCY,
.loc = DT_SILABS_GECKO_I2C_I2C_0_LOCATION,
.bitrate = DT_SILABS_GECKO_I2C_I2C_0_CLOCK_FREQUENCY,
};

static struct i2c_gecko_data i2c_gecko_data_0;

DEVICE_AND_API_INIT(i2c_gecko_0, DT_I2C_GECKO_0_LABEL, &i2c_gecko_init,
&i2c_gecko_data_0, &i2c_gecko_config_0,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&i2c_gecko_driver_api);
DEVICE_AND_API_INIT(i2c_gecko_0, DT_SILABS_GECKO_I2C_I2C_0_LABEL,
&i2c_gecko_init, &i2c_gecko_data_0, &i2c_gecko_config_0,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&i2c_gecko_driver_api);
#endif /* CONFIG_I2C_0 */

#ifdef CONFIG_I2C_1
static struct i2c_gecko_config i2c_gecko_config_1 = {
.base = (I2C_TypeDef *)DT_I2C_GECKO_1_BASE_ADDRESS,
.base = (I2C_TypeDef *)DT_SILABS_GECKO_I2C_I2C_1_BASE_ADDRESS,
.clock = cmuClock_I2C1,
.i2cInit = I2C_INIT_DEFAULT,
.pin_sda = PIN_I2C1_SDA,
.pin_scl = PIN_I2C1_SCL,
.loc = DT_I2C_GECKO_1_LOCATION,
.bitrate = DT_I2C_GECKO_1_CLOCK_FREQUENCY,
.loc = DT_SILABS_GECKO_I2C_I2C_1_LOCATION,
.bitrate = DT_SILABS_GECKO_I2C_I2C_1_CLOCK_FREQUENCY,
};

static struct i2c_gecko_data i2c_gecko_data_1;

DEVICE_AND_API_INIT(i2c_gecko_1, DT_I2C_GECKO_1_LABEL, &i2c_gecko_init,
&i2c_gecko_data_1, &i2c_gecko_config_1,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&i2c_gecko_driver_api);
DEVICE_AND_API_INIT(i2c_gecko_1, DT_SILABS_GECKO_I2C_I2C_1_LABEL,
&i2c_gecko_init, &i2c_gecko_data_1, &i2c_gecko_config_1,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&i2c_gecko_driver_api);
#endif /* CONFIG_I2C_1 */
38 changes: 20 additions & 18 deletions drivers/serial/leuart_gecko.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,32 +318,33 @@ 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
};

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

Expand All @@ -356,32 +357,33 @@ 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
};

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

Expand Down
Loading