michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: leuart_gecko: use DT_<COMPAT>_<INSTANCE>_<PROP> defines

Browse source 
Use the new DT_<COMPAT>_<INSTANCE>_<PROP> defines to instantiate
devices. This commit adds also ability to define individual pin
locations on SoC series that support the feature. Definitions of GPIO
pins assigned to a given location have been moved from soc_pinmap.h file
to board DTS file.

Signed-off-by: Piotr Mienkowski <piotr.mienkowski@gmail.com>
This commit is contained in:
Piotr Mienkowski 2019-01-31 15:27:21 +01:00 • committed by Kumar Gala
commit 91786e96aa
14 changed files with 115 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

7
boards/arm/efm32pg_stk3402a/Kconfig.defconfig
View file

@ -38,13 +38,6 @@ config GPIO_GECKO_PORTF
endif # GPIO_GECKO
if LEUART_GECKO
config LEUART_GECKO_0
default y
endif # LEUART_GECKO
if I2C_GECKO
config I2C_0

3
boards/arm/efm32pg_stk3402a/efm32pg_stk3402a.dts
View file

@ -62,7 +62,8 @@
&leuart0 {
current-speed = <9600>;
location = <18>;
location-rx = <GECKO_LOCATION(18) GECKO_PORT_D GECKO_PIN(11)>;
location-tx = <GECKO_LOCATION(18) GECKO_PORT_D GECKO_PIN(10)>;
status = "ok";
};

7
boards/arm/efr32mg_sltb004a/Kconfig.defconfig
View file

@ -29,13 +29,6 @@ config GPIO_GECKO_PORTF
endif # GPIO_GECKO
if LEUART_GECKO
config LEUART_GECKO_0
default y
endif # LEUART_GECKO
if I2C_GECKO
config I2C_0

3
boards/arm/efr32mg_sltb004a/efr32mg_sltb004a.dts
View file

@ -61,7 +61,8 @@
&leuart0 {
current-speed = <9600>;
location = <27>;
location-rx = <GECKO_LOCATION(27) GECKO_PORT_F GECKO_PIN(4)>;
location-tx = <GECKO_LOCATION(27) GECKO_PORT_F GECKO_PIN(3)>;
status = "ok";
};

18
drivers/serial/Kconfig.leuart_gecko
View file

@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0
#
menuconfig LEUART_GECKO
config LEUART_GECKO
bool "Gecko leuart driver"
depends on HAS_SILABS_GECKO
depends on GPIO_GECKO
@ -14,19 +14,3 @@ menuconfig LEUART_GECKO
select SOC_GECKO_LEUART
help
Enable the Gecko leuart driver.
if LEUART_GECKO
config LEUART_GECKO_0
bool "Enable Gecko Low Energy UART 0"
help
Enable support for Gecko LEUART0 port in the driver. Say y here if you
want to use LEUART0 device.
config LEUART_GECKO_1
bool "Enable Gecko Low Energy UART 1"
help
Enable support for Gecko LEUART1 port in the driver. Say y here if you
want to use LEUART1 device.
endif # LEUART_GECKO

103
drivers/serial/leuart_gecko.c
View file

@ -22,11 +22,16 @@ struct leuart_gecko_config {
LEUART_TypeDef *base;
CMU_Clock_TypeDef clock;
u32_t baud_rate;
struct soc_gpio_pin pin_rx;
struct soc_gpio_pin pin_tx;
unsigned int loc;
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
void (*irq_config_func)(struct device *dev);
#endif
struct soc_gpio_pin pin_rx;
struct soc_gpio_pin pin_tx;
#ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION
u8_t loc_rx;
u8_t loc_tx;
#else
u8_t loc;
#endif
};
@ -238,18 +243,14 @@ static void leuart_gecko_init_pins(struct device *dev)
soc_gpio_configure(&config->pin_rx);
soc_gpio_configure(&config->pin_tx);
#ifdef _LEUART_ROUTEPEN_MASK
#ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION
base->ROUTEPEN = LEUART_ROUTEPEN_RXPEN | LEUART_ROUTEPEN_TXPEN;
base->ROUTELOC0 = (base->ROUTELOC0
& ~(_LEUART_ROUTELOC0_TXLOC_MASK
| _LEUART_ROUTELOC0_RXLOC_MASK))
| (config->loc <<
_LEUART_ROUTELOC0_TXLOC_SHIFT)
| (config->loc <<
_LEUART_ROUTELOC0_RXLOC_SHIFT);
base->ROUTELOC0 =
(config->loc_tx << _LEUART_ROUTELOC0_TXLOC_SHIFT) |
(config->loc_rx << _LEUART_ROUTELOC0_RXLOC_SHIFT);
#else
base->ROUTE = LEUART_ROUTE_RXPEN | LEUART_ROUTE_TXPEN
| (config->loc << 8);
| (config->loc << 8);
#endif
}
@ -265,15 +266,15 @@ static int leuart_gecko_init(struct device *dev)
leuartInit.baudrate = config->baud_rate;
/* Enable LEUART clock */
CMU_ClockEnable(config->clock, true);
/* Enable CORE LE clock in order to access LE modules */
CMU_ClockEnable(cmuClock_CORELE, true);
/* Select LFXO for LEUARTs (and wait for it to stabilize) */
CMU_ClockSelectSet(cmuClock_LFB, cmuSelect_LFXO);
/* Enable LEUART clock */
CMU_ClockEnable(config->clock, true);
/* Init LEUART */
LEUART_Init(base, &leuartInit);
@ -309,19 +310,33 @@ static const struct uart_driver_api leuart_gecko_driver_api = {
#endif
};
#ifdef CONFIG_LEUART_GECKO_0
#ifdef DT_SILABS_GECKO_LEUART_0
#define PIN_LEUART_0_RXD {DT_SILABS_GECKO_LEUART_0_LOCATION_RX_1, \
DT_SILABS_GECKO_LEUART_0_LOCATION_RX_2, gpioModeInput, 1}
#define PIN_LEUART_0_TXD {DT_SILABS_GECKO_LEUART_0_LOCATION_TX_1, \
DT_SILABS_GECKO_LEUART_0_LOCATION_TX_2, gpioModePushPull, 1}
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
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_SILABS_GECKO_LEUART_LEUART_0_BASE_ADDRESS,
.base = (LEUART_TypeDef *)DT_SILABS_GECKO_LEUART_0_BASE_ADDRESS,
.clock = cmuClock_LEUART0,
.baud_rate = DT_SILABS_GECKO_LEUART_LEUART_0_CURRENT_SPEED,
.pin_rx = PIN_LEUART0_RXD,
.pin_tx = PIN_LEUART0_TXD,
.loc = DT_SILABS_GECKO_LEUART_LEUART_0_LOCATION,
.baud_rate = DT_SILABS_GECKO_LEUART_0_CURRENT_SPEED,
.pin_rx = PIN_LEUART_0_RXD,
.pin_tx = PIN_LEUART_0_TXD,
#ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION
.loc_rx = DT_SILABS_GECKO_LEUART_0_LOCATION_RX_0,
.loc_tx = DT_SILABS_GECKO_LEUART_0_LOCATION_TX_0,
#else
#if DT_SILABS_GECKO_LEUART_0_LOCATION_RX_0 \
!= DT_SILABS_GECKO_LEUART_0_LOCATION_TX_0
#error LEUART_0 DTS location-* properties must have identical value
#endif
.loc = DT_SILABS_GECKO_LEUART_0_LOCATION_RX_0,
#endif
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = leuart_gecko_config_func_0,
#endif
@ -329,7 +344,7 @@ 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_SILABS_GECKO_LEUART_LEUART_0_LABEL,
DEVICE_AND_API_INIT(leuart_0, DT_SILABS_GECKO_LEUART_0_LABEL,
&leuart_gecko_init, &leuart_gecko_0_data,
&leuart_gecko_0_config, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -338,29 +353,43 @@ DEVICE_AND_API_INIT(leuart_0, DT_SILABS_GECKO_LEUART_LEUART_0_LABEL,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void leuart_gecko_config_func_0(struct device *dev)
{
IRQ_CONNECT(DT_SILABS_GECKO_LEUART_LEUART_0_IRQ,
DT_SILABS_GECKO_LEUART_LEUART_0_IRQ_PRIORITY,
IRQ_CONNECT(DT_SILABS_GECKO_LEUART_0_IRQ_0,
DT_SILABS_GECKO_LEUART_0_IRQ_0_PRIORITY,
leuart_gecko_isr, DEVICE_GET(leuart_0), 0);
irq_enable(DT_SILABS_GECKO_LEUART_LEUART_0_IRQ);
irq_enable(DT_SILABS_GECKO_LEUART_0_IRQ_0);
}
#endif
#endif /* CONFIG_LEUART_GECKO_0 */
#endif /* DT_SILABS_GECKO_LEUART_0 */
#ifdef CONFIG_LEUART_GECKO_1
#ifdef DT_SILABS_GECKO_LEUART_1
#define PIN_LEUART_1_RXD {DT_SILABS_GECKO_LEUART_1_LOCATION_RX_1, \
DT_SILABS_GECKO_LEUART_1_LOCATION_RX_2, gpioModeInput, 1}
#define PIN_LEUART_1_TXD {DT_SILABS_GECKO_LEUART_1_LOCATION_TX_1, \
DT_SILABS_GECKO_LEUART_1_LOCATION_TX_2, gpioModePushPull, 1}
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void leuart_gecko_config_func_1(struct device *dev);
#endif
static const struct leuart_gecko_config leuart_gecko_1_config = {
.base = (LEUART_TypeDef *)DT_SILABS_GECKO_LEUART_LEUART_1_BASE_ADDRESS,
.base = (LEUART_TypeDef *)DT_SILABS_GECKO_LEUART_1_BASE_ADDRESS,
.clock = cmuClock_LEUART0,
.baud_rate = DT_SILABS_GECKO_LEUART_LEUART_1_CURRENT_SPEED,
.pin_rx = PIN_LEUART1_RXD,
.pin_tx = PIN_LEUART1_TXD,
.loc = DT_SILABS_GECKO_LEUART_LEUART_1_LOCATION,
.baud_rate = DT_SILABS_GECKO_LEUART_1_CURRENT_SPEED,
.pin_rx = PIN_LEUART_1_RXD,
.pin_tx = PIN_LEUART_1_TXD,
#ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION
.loc_rx = DT_SILABS_GECKO_LEUART_1_LOCATION_RX_0,
.loc_tx = DT_SILABS_GECKO_LEUART_1_LOCATION_TX_0,
#else
#if DT_SILABS_GECKO_LEUART_1_LOCATION_RX_0 \
!= DT_SILABS_GECKO_LEUART_1_LOCATION_TX_0
#error LEUART_1 DTS location-* properties must have identical value
#endif
.loc = DT_SILABS_GECKO_LEUART_1_LOCATION_RX_0,
#endif
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
.irq_config_func = leuart_gecko_config_func_1,
#endif
@ -368,7 +397,7 @@ 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, DT_SILABS_GECKO_LEUART_LEUART_1_LABEL,
DEVICE_AND_API_INIT(leuart_1, DT_SILABS_GECKO_LEUART_1_LABEL,
&leuart_gecko_init, &leuart_gecko_1_data,
&leuart_gecko_1_config, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -377,12 +406,12 @@ DEVICE_AND_API_INIT(leuart_1, DT_SILABS_GECKO_LEUART_LEUART_1_LABEL,
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
static void leuart_gecko_config_func_1(struct device *dev)
{
IRQ_CONNECT(DT_SILABS_GECKO_LEUART_LEUART_1_IRQ,
DT_SILABS_GECKO_LEUART_LEUART_1_IRQ_PRIORITY,
IRQ_CONNECT(DT_SILABS_GECKO_LEUART_1_IRQ_0,
DT_SILABS_GECKO_LEUART_1_IRQ_0_PRIORITY,
leuart_gecko_isr, DEVICE_GET(leuart_1), 0);
irq_enable(DT_SILABS_GECKO_LEUART_LEUART_1_IRQ);
irq_enable(DT_SILABS_GECKO_LEUART_1_IRQ_0);
}
#endif
#endif /* CONFIG_LEUART_GECKO_1 */
#endif /* DT_SILABS_GECKO_LEUART_1 */

8
dts/arm/silabs/efm32hg.dtsi
View file

@ -53,6 +53,14 @@
label = "UART_1";
};
leuart0: leuart@40084000 { /* LEUART0 */
compatible = "silabs,gecko-leuart";
reg = <0x40084000 0x400>;
interrupts = <10 0>;
status = "disabled";
label = "LEUART_0";
};
gpio@40006100 {
compatible = "silabs,efm32-gpio";
reg = <0x40006100 0xf00>;

1
dts/arm/silabs/efm32pg12b.dtsi
View file

@ -26,7 +26,6 @@
};
aliases {
leuart-0 = &leuart0;
i2c-0 = &i2c0;
i2c-1 = &i2c1;
};

16
dts/arm/silabs/efm32wg.dtsi
View file

@ -80,6 +80,22 @@
label = "UART_4";
};
leuart0: leuart@40084000 { /* LEUART0 */
compatible = "silabs,gecko-leuart";
reg = <0x40084000 0x400>;
interrupts = <24 0>;
status = "disabled";
label = "LEUART_0";
};
leuart1: leuart@40084400 { /* LEUART1 */
compatible = "silabs,gecko-leuart";
reg = <0x40084400 0x400>;
interrupts = <25 0>;
status = "disabled";
label = "LEUART_1";
};
gpio@40006100 {
compatible = "silabs,efm32-gpio";
reg = <0x40006100 0xf00>;

8
dts/arm/silabs/efr32fg1p.dtsi
View file

@ -53,6 +53,14 @@
label = "USART_1";
};
leuart0: leuart@4004a000 { /* LEUART0 */
compatible = "silabs,gecko-leuart";
reg = <0x4004a000 0x400>;
interrupts = <21 0>;
status = "disabled";
label = "LEUART_0";
};
gpio: gpio@4000a400 {
compatible = "silabs,efr32xg1-gpio";
reg = <0x4000a400 0xc00>;

1
dts/arm/silabs/efr32mg.dtsi
View file

@ -20,7 +20,6 @@
};
aliases {
leuart-0 = &leuart0;
i2c-0 = &i2c0;
i2c-1 = &i2c1;
};

15
dts/bindings/serial/silabs,gecko-leuart.yaml
View file

@ -27,9 +27,18 @@ properties:
description: required interrupts
generation: define
location:
type: int
# Note: Not all SoC series support setting individual pin location. If this
# is a case all location-* properties need to have identical value.
location-rx:
type: array
category: required
description: PIN location
description: RX pin configuration defined as <location port pin>
generation: define
location-tx:
type: array
category: required
description: TX pin configuration defined as <location port pin>
generation: define
...

11
soc/arm/silabs_exx32/efm32pg12b/soc_pinmap.h
View file

@ -31,17 +31,6 @@
#endif
#endif /* CONFIG_GPIO_GECKO */
#ifdef CONFIG_LEUART_GECKO
#ifdef CONFIG_LEUART_GECKO_0
#if (DT_SILABS_GECKO_LEUART_LEUART_0_LOCATION == 18)
#define PIN_LEUART0_TXD {gpioPortD, 10, gpioModePushPull, 1}
#define PIN_LEUART0_RXD {gpioPortD, 11, gpioModeInput, 1}
#else
#error ("Serial Driver for Gecko MCUs not implemented for this location index")
#endif
#endif /* CONFIG_LEUART_GECKO_0 */
#endif /* CONFIG_LEUART_GECKO */
#ifdef CONFIG_I2C_GECKO
#ifdef CONFIG_I2C_0
#if (DT_SILABS_GECKO_I2C_I2C_0_LOCATION == 15)

11
soc/arm/silabs_exx32/efr32mg12p/soc_pinmap.h
View file

@ -30,17 +30,6 @@
#endif
#endif /* CONFIG_GPIO_GECKO */
#ifdef CONFIG_LEUART_GECKO
#ifdef CONFIG_LEUART_GECKO_0
#if (DT_SILABS_GECKO_LEUART_LEUART_0_LOCATION == 27)
#define PIN_LEUART0_TXD {gpioPortF, 3, gpioModePushPull, 1}
#define PIN_LEUART0_RXD {gpioPortF, 4, gpioModeInput, 1}
#else
#error ("Serial Driver for Gecko MCUs not implemented for this location index")
#endif
#endif /* CONFIG_LEUART_GECKO_0 */
#endif /* CONFIG_LEUART_GECKO */
#ifdef CONFIG_I2C_GECKO
#ifdef CONFIG_I2C_0
#if (DT_SILABS_GECKO_I2C_I2C_0_LOCATION == 15)