michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: drivers: uart: use pinctrl for nrf board overlay

Browse source 
nRF boards now require usage of pinctrl, migrate them.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-03-17 15:39:45 +01:00 • committed by Carles Cufí
commit 31f0610edc
7 changed files with 172 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

50
tests/drivers/uart/uart_async_api/boards/nrf52840dk_nrf52840.overlay
View file

@ -1,5 +1,41 @@
/* SPDX-License-Identifier: Apache-2.0 */
&pinctrl {
uart1_default_alt: uart1_default_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 0, 6)>,
<NRF_PSEL(UART_RX, 0, 8)>;
};
};
uart1_sleep_alt: uart1_sleep_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 0, 6)>,
<NRF_PSEL(UART_RX, 0, 8)>;
low-power-enable;
};
};
uart0_default_alt: uart0_default_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 1, 1)>,
<NRF_PSEL(UART_RX, 1, 2)>,
<NRF_PSEL(UART_RTS, 0, 5)>,
<NRF_PSEL(UART_CTS, 0, 7)>;
};
};
uart0_sleep_alt: uart0_sleep_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 1, 1)>,
<NRF_PSEL(UART_RX, 1, 2)>,
<NRF_PSEL(UART_RTS, 0, 5)>,
<NRF_PSEL(UART_CTS, 0, 7)>;
low-power-enable;
};
};
};
/ {
chosen {
zephyr,console = &uart1;
@ -9,18 +45,16 @@
&uart1 {
current-speed = <115200>;
status = "okay";
tx-pin = <6>;
rx-pin = <8>;
rts-pin = <0>;
cts-pin = <0>;
pinctrl-0 = <&uart1_default_alt>;
pinctrl-1 = <&uart1_sleep_alt>;
pinctrl-names = "default", "sleep";
};
&uart0 {
compatible = "nordic,nrf-uarte";
current-speed = <115200>;
status = "okay";
tx-pin = <33>;
rx-pin = <34>;
rts-pin = <5>;
cts-pin = <7>;
pinctrl-0 = <&uart0_default_alt>;
pinctrl-1 = <&uart0_sleep_alt>;
pinctrl-names = "default", "sleep";
};

22
tests/drivers/uart/uart_async_api/boards/nrf9160dk_nrf9160.overlay
View file

@ -1,9 +1,27 @@
/* SPDX-License-Identifier: Apache-2.0 */
&pinctrl {
uart1_default_alt: uart1_default_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 0, 10)>,
<NRF_PSEL(UART_RX, 0, 11)>;
};
};
uart1_sleep_alt: uart1_sleep_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 0, 10)>,
<NRF_PSEL(UART_RX, 0, 11)>;
low-power-enable;
};
};
};
&uart1 {
current-speed = <115200>;
compatible = "nordic,nrf-uarte";
status = "okay";
tx-pin = <10>;
rx-pin = <11>;
pinctrl-0 = <&uart1_default_alt>;
pinctrl-1 = <&uart1_sleep_alt>;
pinctrl-names = "default", "sleep";
};

48
tests/drivers/uart/uart_mix_fifo_poll/boards/nrf52840dk_nrf52840.overlay
View file

@ -1,5 +1,41 @@
/* SPDX-License-Identifier: Apache-2.0 */
&pinctrl {
uart1_default_alt: uart1_default_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 0, 6)>,
<NRF_PSEL(UART_RX, 0, 8)>;
};
};
uart1_sleep_alt: uart1_sleep_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 0, 6)>,
<NRF_PSEL(UART_RX, 0, 8)>;
low-power-enable;
};
};
uart0_default_alt: uart0_default_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 1, 12)>,
<NRF_PSEL(UART_RX, 1, 13)>,
<NRF_PSEL(UART_RTS, 1, 14)>,
<NRF_PSEL(UART_CTS, 1, 15)>;
};
};
uart0_sleep_alt: uart0_sleep_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 1, 12)>,
<NRF_PSEL(UART_RX, 1, 13)>,
<NRF_PSEL(UART_RTS, 1, 14)>,
<NRF_PSEL(UART_CTS, 1, 15)>;
low-power-enable;
};
};
};
/ {
chosen {
zephyr,console = &uart1;
@ -9,18 +45,18 @@
&uart1 {
current-speed = <115200>;
status = "okay";
tx-pin = <6>;
rx-pin = <8>;
pinctrl-0 = <&uart1_default_alt>;
pinctrl-1 = <&uart1_sleep_alt>;
pinctrl-names = "default", "sleep";
};
&uart0 {
compatible = "nordic,nrf-uarte";
current-speed = <115200>;
status = "okay";
tx-pin = <44>;
rx-pin = <45>;
rts-pin = <46>;
cts-pin = <47>;
pinctrl-0 = <&uart0_default_alt>;
pinctrl-1 = <&uart0_sleep_alt>;
pinctrl-names = "default", "sleep";
hw-flow-control;
};

28
tests/drivers/uart/uart_mix_fifo_poll/boards/nrf9160dk_nrf9160.overlay
View file

@ -1,13 +1,33 @@
/* SPDX-License-Identifier: Apache-2.0 */
&pinctrl {
uart1_default_alt: uart1_default_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 0, 10)>,
<NRF_PSEL(UART_RX, 0, 11)>,
<NRF_PSEL(UART_RTS, 0, 12)>,
<NRF_PSEL(UART_CTS, 0, 13)>;
};
};
uart1_sleep_alt: uart1_sleep_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 0, 10)>,
<NRF_PSEL(UART_RX, 0, 11)>,
<NRF_PSEL(UART_RTS, 0, 12)>,
<NRF_PSEL(UART_CTS, 0, 13)>;
low-power-enable;
};
};
};
&uart1 {
current-speed = <115200>;
compatible = "nordic,nrf-uarte";
status = "okay";
tx-pin = <10>;
rx-pin = <11>;
rts-pin = <12>;
cts-pin = <13>;
pinctrl-0 = <&uart1_default_alt>;
pinctrl-1 = <&uart1_sleep_alt>;
pinctrl-names = "default", "sleep";
hw-flow-control;
};

50
tests/drivers/uart/uart_pm/boards/nrf52840dk_nrf52840.overlay
View file

@ -1,5 +1,41 @@
/* SPDX-License-Identifier: Apache-2.0 */
&pinctrl {
uart1_default_alt: uart1_default_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 0, 6)>,
<NRF_PSEL(UART_RX, 0, 8)>;
};
};
uart1_sleep_alt: uart1_sleep_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 0, 6)>,
<NRF_PSEL(UART_RX, 0, 8)>;
low-power-enable;
};
};
uart0_default_alt: uart0_default_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 1, 1)>,
<NRF_PSEL(UART_RX, 1, 2)>,
<NRF_PSEL(UART_RTS, 0, 5)>,
<NRF_PSEL(UART_CTS, 0, 7)>;
};
};
uart0_sleep_alt: uart0_sleep_alt {
group1 {
psels = <NRF_PSEL(UART_TX, 1, 1)>,
<NRF_PSEL(UART_RX, 1, 2)>,
<NRF_PSEL(UART_RTS, 0, 5)>,
<NRF_PSEL(UART_CTS, 0, 7)>;
low-power-enable;
};
};
};
/ {
chosen {
zephyr,console = &uart1;
@ -9,18 +45,16 @@
&uart1 {
current-speed = <115200>;
status = "okay";
tx-pin = <6>;
rx-pin = <8>;
rts-pin = <0>;
cts-pin = <0>;
pinctrl-0 = <&uart1_default_alt>;
pinctrl-1 = <&uart1_sleep_alt>;
pinctrl-names = "default", "sleep";
};
&uart0 {
compatible = "nordic,nrf-uarte";
current-speed = <115200>;
status = "okay";
tx-pin = <33>;
rx-pin = <34>;
rts-pin = <5>;
cts-pin = <7>;
pinctrl-0 = <&uart0_default_alt>;
pinctrl-1 = <&uart0_sleep_alt>;
pinctrl-names = "default", "sleep";
};

2
tests/drivers/uart/uart_pm/nrf_no_rx_pin.overlay → tests/drivers/uart/uart_pm/nrf_rx_disable.overlay
View file

@ -1,5 +1,5 @@
/* SPDX-License-Identifier: Apache-2.0 */
&uart0 {
/delete-property/rx-pin;
disable-rx;
};

2
tests/drivers/uart/uart_pm/testcase.yaml
View file

@ -18,7 +18,7 @@ tests:
- CONFIG_UART_INTERRUPT_DRIVEN=n
- CONFIG_UART_ASYNC_API=n
- CONFIG_UART_0_ENHANCED_POLL_OUT=n
extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;nrf_no_rx_pin.overlay"
extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;nrf_rx_disable.overlay"
drivers.uart_enhanced_poll:
tags: drivers