Skip to content

Commit a1b084d

Browse files
rob-robinson-14nordic-piks
authored andcommitted
nrf: boards: nordic: nrf7120pdk Remove UART00 as chosen uart
Remove uart00 as default for nRF7120, use uart20 instead. This change is required to make the SPI loopback test pass since they make use of spi00 and spi00 and uart00 make use of shared resourses so cannot be enabled at the same time. https://github.com/nrfconnect/sdk-nrf/pull/22326/commits Signed-off-by: Robert Robinson <[email protected]>
1 parent fe1a92f commit a1b084d

4 files changed

+9
-16
lines changed

boards/nordic/nrf7120pdk/nrf7120pdk_nrf7120-common.dtsi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,13 @@
8787
};
8888
};
8989

90+
&uart00 {
91+
current-speed = <115200>;
92+
pinctrl-0 = <&uart00_default>;
93+
pinctrl-1 = <&uart00_sleep>;
94+
pinctrl-names = "default", "sleep";
95+
};
96+
9097
&uart20 {
9198
current-speed = <115200>;
9299
pinctrl-0 = <&uart20_default>;

boards/nordic/nrf7120pdk/nrf7120pdk_nrf7120-emu-pinctrl.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
&pinctrl {
7-
uart00_default: uart00_default {
7+
/omit-if-no-ref/ uart00_default: uart00_default {
88
group1 {
99
psels = <NRF_PSEL(UART_TX, 2, 2)>,
1010
<NRF_PSEL(UART_RTS, 2, 5)>;
@@ -17,7 +17,7 @@
1717
};
1818
};
1919

20-
uart00_sleep: uart00_sleep {
20+
/omit-if-no-ref/ uart00_sleep: uart00_sleep {
2121
group1 {
2222
psels = <NRF_PSEL(UART_TX, 2, 2)>,
2323
<NRF_PSEL(UART_RX, 2, 0)>,

boards/nordic/nrf7120pdk/nrf7120pdk_nrf7120_cpuapp.dts

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,5 @@
1414

1515
chosen {
1616
zephyr,sram = &cpuapp_sram;
17-
zephyr,console = &uart00;
18-
zephyr,shell-uart = &uart00;
1917
};
2018
};
21-
22-
&uart00 {
23-
status = "okay";
24-
current-speed = <115200>;
25-
pinctrl-0 = <&uart00_default>;
26-
pinctrl-1 = <&uart00_sleep>;
27-
pinctrl-names = "default", "sleep";
28-
};

boards/nordic/nrf7120pdk/nrf7120pdk_nrf7120_cpuapp_emu.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222

2323
&uart00 {
2424
status = "okay";
25-
current-speed = <115200>;
26-
pinctrl-0 = <&uart00_default>;
27-
pinctrl-1 = <&uart00_sleep>;
28-
pinctrl-names = "default", "sleep";
2925
};
3026

3127
&grtc {

0 commit comments

Comments
 (0)