diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi index e487dac4..0ae76154 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod.dtsi @@ -26,20 +26,12 @@ , <12 0 &gpio1 8 0> /* D1 - P1.08 , MicroMod pad pad 18 */ , <13 0 &gpio1 6 0> /* PWM0 - P0.06 , MicroMod pad pad 32 */ , <14 0 &gpio1 16 0> /* PWM1 - P0.16 , MicroMod pad pad 47 */ + , <15 0 &gpio0 4 0> /* A0 - ADC0/P0.04 , MicroMod pad 34 (Input Only!) */ + , <16 0 &gpio0 5 0> /* A1 - ADC1/P0.05 , MicroMod pad pad 38 (Input Only!) */ ; }; - sparkfun_micromod_a: connector_a { - compatible = "sparkfun,micromod-gpio"; - #gpio-cells = <2>; - gpio-map-mask = <0xffffffff 0xffffffc0>; - gpio-map-pass-thru = <0 0x3f>; - gpio-map - = <0 0 &gpio0 4 0> /* A0 - ADC0/P0.04 , MicroMod pad 34 (Input Only!) */ - , <1 0 &gpio0 5 0> /* A1 - ADC1/P0.05 , MicroMod pad pad 38 (Input Only!) */ - ; - }; }; diff --git a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts index 3f2b75c2..5e5e37f0 100644 --- a/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts +++ b/app/boards/arm/sparkfun_micromod_nrf52840/sparkfun_micromod_nrf52840.dts @@ -14,10 +14,10 @@ compatible = "sparkfun,micromod-gpio"; chosen { + zephyr,console = &cdc_acm_uart; zephyr,code-partition = &code_partition; zephyr,sram = &sram0; zephyr,flash = &flash0; - zephyr,console = &cdc_acm_uart; }; leds { @@ -45,14 +45,19 @@ status = "okay"; }; + +&uart0 { + compatible = "nordic,nrf-uarte"; + tx-pin = <35>; + rx-pin = <42>; +}; &usbd { status = "okay"; cdc_acm_uart: cdc_acm_uart { - compatible = "zephyr,cdc-acm-uart"; - label = "CDC_ACM_0"; - }; - -}; + compatible = "zephyr,cdc-acm-uart"; + label = "CDC_ACM_0"; + }; + }; /** @@ -95,11 +100,7 @@ **/ -&uart0 { - compatible = "nordic,nrf-uarte"; - tx-pin = <35>; - rx-pin = <42>; -}; + &flash0 { /*