michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: esp32: UART Fix yaml/dts binding name

Browse source 
replace "xtensa" with "espressif", as the latter is the correct
vendor name.

Signed-off-by: Mohamed ElShahawi <ExtremeGTX@hotmail.com>
This commit is contained in:
Mohamed ElShahawi 2019-08-22 21:52:54 +02:00 • committed by Kumar Gala
commit 0705be344c
4 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/serial/uart_esp32.c
View file

@ -476,7 +476,7 @@ static const struct uart_driver_api uart_esp32_api = {
ESP32_UART_IRQ_HANDLER_DECL(idx); \ ESP32_UART_IRQ_HANDLER_DECL(idx); \
static const struct uart_esp32_config uart_esp32_cfg_port_##idx = { \ static const struct uart_esp32_config uart_esp32_cfg_port_##idx = { \
.dev_conf = { \ .dev_conf = { \
.base = (u8_t *)DT_INST_##idx##_XTENSA_ESP32_UART_BASE_ADDRESS, \ .base = (u8_t *)DT_INST_##idx##_ESPRESSIF_ESP32_UART_BASE_ADDRESS, \
.sys_clk_freq = DT_INST_0_CADENCE_TENSILICA_XTENSA_LX6_CLOCK_FREQUENCY, \ .sys_clk_freq = DT_INST_0_CADENCE_TENSILICA_XTENSA_LX6_CLOCK_FREQUENCY, \
ESP32_UART_IRQ_HANDLER_FUNC(idx) \ ESP32_UART_IRQ_HANDLER_FUNC(idx) \
}, \ }, \
@ -494,10 +494,10 @@ static const struct uart_esp32_config uart_esp32_cfg_port_##idx = { \
}, \ }, \
\ \
.pins = { \ .pins = { \
.tx = DT_INST_##idx##_XTENSA_ESP32_UART_TX_PIN, \ .tx = DT_INST_##idx##_ESPRESSIF_ESP32_UART_TX_PIN, \
.rx = DT_INST_##idx##_XTENSA_ESP32_UART_RX_PIN, \ .rx = DT_INST_##idx##_ESPRESSIF_ESP32_UART_RX_PIN, \
.rts = DT_INST_##idx##_XTENSA_ESP32_UART_RTS_PIN, \ .rts = DT_INST_##idx##_ESPRESSIF_ESP32_UART_RTS_PIN, \
.cts = DT_INST_##idx##_XTENSA_ESP32_UART_CTS_PIN, \ .cts = DT_INST_##idx##_ESPRESSIF_ESP32_UART_CTS_PIN, \
}, \ }, \
\ \
.irq = { \ .irq = { \
@ -508,7 +508,7 @@ static const struct uart_esp32_config uart_esp32_cfg_port_##idx = { \
\ \
static struct uart_esp32_data uart_esp32_data_##idx = { \ static struct uart_esp32_data uart_esp32_data_##idx = { \
.uart_config = { \ .uart_config = { \
.baudrate = DT_INST_##idx##_XTENSA_ESP32_UART_CURRENT_SPEED, \ .baudrate = DT_INST_##idx##_ESPRESSIF_ESP32_UART_CURRENT_SPEED, \
.parity = UART_CFG_PARITY_NONE, \ .parity = UART_CFG_PARITY_NONE, \
.stop_bits = UART_CFG_STOP_BITS_1, \ .stop_bits = UART_CFG_STOP_BITS_1, \
.data_bits = UART_CFG_DATA_BITS_8, \ .data_bits = UART_CFG_DATA_BITS_8, \
@ -517,7 +517,7 @@ static struct uart_esp32_data uart_esp32_data_##idx = { \
}; \ }; \
\ \
DEVICE_AND_API_INIT(uart_esp32_##idx, \ DEVICE_AND_API_INIT(uart_esp32_##idx, \
DT_INST_##idx##_XTENSA_ESP32_UART_LABEL, \ DT_INST_##idx##_ESPRESSIF_ESP32_UART_LABEL, \
uart_esp32_init, \ uart_esp32_init, \
&uart_esp32_data_##idx, \ &uart_esp32_data_##idx, \
&uart_esp32_cfg_port_##idx, \ &uart_esp32_cfg_port_##idx, \
@ -527,14 +527,14 @@ DEVICE_AND_API_INIT(uart_esp32_##idx, \
\ \
ESP32_UART_IRQ_HANDLER(idx) ESP32_UART_IRQ_HANDLER(idx)
#ifdef DT_INST_0_XTENSA_ESP32_UART #ifdef DT_INST_0_ESPRESSIF_ESP32_UART
ESP32_UART_INIT(0); ESP32_UART_INIT(0);
#endif #endif
#ifdef DT_INST_1_XTENSA_ESP32_UART #ifdef DT_INST_1_ESPRESSIF_ESP32_UART
ESP32_UART_INIT(1); ESP32_UART_INIT(1);
#endif #endif
#ifdef DT_INST_2_XTENSA_ESP32_UART #ifdef DT_INST_2_ESPRESSIF_ESP32_UART
ESP32_UART_INIT(2); ESP32_UART_INIT(2);
#endif #endif

15
dts/bindings/serial/xtensa,esp32-uart.yaml → dts/bindings/serial/espressif,esp32-uart.yaml
View file

@ -3,7 +3,7 @@ title: ESP32 Uart
description: > description: >
This binding gives a base representation of the ESP32 UART This binding gives a base representation of the ESP32 UART
compatible: "xtensa,esp32-uart" compatible: "espressif,esp32-uart"
include: uart-controller.yaml include: uart-controller.yaml
@ -12,27 +12,24 @@ properties:
required: true required: true
interrupts: interrupts:
category: optional required: false
clocks:
category: required
tx-pin: tx-pin:
type: int type: int
description: TX pin description: TX pin
category: required required: true
rx-pin: rx-pin:
type: int type: int
description: RX pin description: RX pin
category: required required: true
rts-pin: rts-pin:
type: int type: int
description: RTS pin description: RTS pin
category: optional required: false
cts-pin: cts-pin:
type: int type: int
description: CTS pin description: CTS pin
category: optional required: false

1
dts/bindings/vendor-prefixes.txt
View file

@ -454,7 +454,6 @@ x-powers X-Powers
xes Extreme Engineering Solutions (X-ES) xes Extreme Engineering Solutions (X-ES)
xillybus Xillybus Ltd. xillybus Xillybus Ltd.
xlnx Xilinx xlnx Xilinx
xtensa The Tensilica Xtensa processor architecture
xunlong Shenzhen Xunlong Software CO.,Limited xunlong Shenzhen Xunlong Software CO.,Limited
ysoft Y Soft Corporation a.s. ysoft Y Soft Corporation a.s.
zarlink Zarlink Semiconductor zarlink Zarlink Semiconductor

6
dts/xtensa/espressif/esp32.dtsi
View file

@ -32,7 +32,7 @@
soc { soc {
uart0: uart@3ff40000 { uart0: uart@3ff40000 {
compatible = "xtensa,esp32-uart"; compatible = "espressif,esp32-uart";
reg = <0x3ff40000 0x400>; reg = <0x3ff40000 0x400>;
/* interrupts = <12>; - FIXME: Enable interrupts when interrupt-controller got supported in device tree */ /* interrupts = <12>; - FIXME: Enable interrupts when interrupt-controller got supported in device tree */
label = "UART_0"; label = "UART_0";
@ -40,7 +40,7 @@
}; };
uart1: uart@3ff50000 { uart1: uart@3ff50000 {
compatible = "xtensa,esp32-uart"; compatible = "espressif,esp32-uart";
reg = <0x3ff50000 0x400>; reg = <0x3ff50000 0x400>;
/* interrupts = <17>; - FIXME: Enable interrupts when interrupt-controller got supported in device tree */ /* interrupts = <17>; - FIXME: Enable interrupts when interrupt-controller got supported in device tree */
label = "UART_1"; label = "UART_1";
@ -48,7 +48,7 @@
}; };
uart2: uart@3ff6e000 { uart2: uart@3ff6e000 {
compatible = "xtensa,esp32-uart"; compatible = "espressif,esp32-uart";
reg = <0x3ff6E000 0x400>; reg = <0x3ff6E000 0x400>;
/* interrupts = <18>; - FIXME: Enable interrupts when interrupt-controller got supported in device tree */ /* interrupts = <18>; - FIXME: Enable interrupts when interrupt-controller got supported in device tree */
label = "UART_2"; label = "UART_2";