From 969e5568afa10a15a4d0735bf161abc96afb75ca Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Wed, 13 Jan 2021 23:44:17 -0500 Subject: [PATCH] fix(boards): Define but don't enable uart0. * Set pro-micro TX/RX pins, but don't enable the UART by default. --- app/boards/arm/bluemicro840/bluemicro840_v1.dts | 8 ++------ app/boards/arm/nice_nano/nice_nano.dts | 8 ++------ app/boards/arm/nrf52840_m2/nrf52840_m2.dts | 10 ---------- app/boards/arm/nrfmicro/nrfmicro_11.dts | 8 ++------ app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts | 8 ++------ app/boards/arm/nrfmicro/nrfmicro_13.dts | 8 ++------ 6 files changed, 10 insertions(+), 40 deletions(-) diff --git a/app/boards/arm/bluemicro840/bluemicro840_v1.dts b/app/boards/arm/bluemicro840/bluemicro840_v1.dts index 18dff1af..31551f4f 100644 --- a/app/boards/arm/bluemicro840/bluemicro840_v1.dts +++ b/app/boards/arm/bluemicro840/bluemicro840_v1.dts @@ -66,12 +66,8 @@ &uart0 { compatible = "nordic,nrf-uarte"; - status = "okay"; - current-speed = <115200>; - tx-pin = <19>; - rx-pin = <21>; - rts-pin = <23>; - cts-pin = <25>; + tx-pin = <6>; + rx-pin = <8>; }; &usbd { diff --git a/app/boards/arm/nice_nano/nice_nano.dts b/app/boards/arm/nice_nano/nice_nano.dts index 01efb289..5efde4b2 100644 --- a/app/boards/arm/nice_nano/nice_nano.dts +++ b/app/boards/arm/nice_nano/nice_nano.dts @@ -65,12 +65,8 @@ &uart0 { compatible = "nordic,nrf-uarte"; - status = "okay"; - current-speed = <115200>; - tx-pin = <19>; - rx-pin = <21>; - rts-pin = <23>; - cts-pin = <25>; + tx-pin = <6>; + rx-pin = <8>; }; &usbd { diff --git a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts b/app/boards/arm/nrf52840_m2/nrf52840_m2.dts index e090842c..6b613a1c 100644 --- a/app/boards/arm/nrf52840_m2/nrf52840_m2.dts +++ b/app/boards/arm/nrf52840_m2/nrf52840_m2.dts @@ -51,16 +51,6 @@ status = "okay"; }; -&uart0 { - compatible = "nordic,nrf-uarte"; - status = "okay"; - current-speed = <115200>; - tx-pin = <19>; - rx-pin = <21>; - rts-pin = <23>; - cts-pin = <25>; -}; - &usbd { compatible = "nordic,nrf-usbd"; status = "okay"; diff --git a/app/boards/arm/nrfmicro/nrfmicro_11.dts b/app/boards/arm/nrfmicro/nrfmicro_11.dts index 164b66d2..0dd8e8eb 100644 --- a/app/boards/arm/nrfmicro/nrfmicro_11.dts +++ b/app/boards/arm/nrfmicro/nrfmicro_11.dts @@ -53,12 +53,8 @@ &uart0 { compatible = "nordic,nrf-uarte"; - status = "okay"; - current-speed = <115200>; - tx-pin = <19>; - rx-pin = <21>; - rts-pin = <23>; - cts-pin = <25>; + tx-pin = <6>; + rx-pin = <8>; }; &usbd { diff --git a/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts b/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts index fb558382..deea41fc 100644 --- a/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts +++ b/app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts @@ -53,12 +53,8 @@ &uart0 { compatible = "nordic,nrf-uarte"; - status = "okay"; - current-speed = <115200>; - tx-pin = <19>; - rx-pin = <21>; - rts-pin = <23>; - cts-pin = <25>; + tx-pin = <6>; + rx-pin = <8>; }; &usbd { diff --git a/app/boards/arm/nrfmicro/nrfmicro_13.dts b/app/boards/arm/nrfmicro/nrfmicro_13.dts index 1a05c7a1..bb40f3d0 100644 --- a/app/boards/arm/nrfmicro/nrfmicro_13.dts +++ b/app/boards/arm/nrfmicro/nrfmicro_13.dts @@ -65,12 +65,8 @@ &uart0 { compatible = "nordic,nrf-uarte"; - status = "okay"; - current-speed = <115200>; - tx-pin = <19>; - rx-pin = <21>; - rts-pin = <23>; - cts-pin = <25>; + tx-pin = <6>; + rx-pin = <8>; }; &usbd {