diff --git a/boards/arm/96b_nitrogen/96b_nitrogen_defconfig b/boards/arm/96b_nitrogen/96b_nitrogen_defconfig index 11612ee6513..b0f571dff42 100644 --- a/boards/arm/96b_nitrogen/96b_nitrogen_defconfig +++ b/boards/arm/96b_nitrogen/96b_nitrogen_defconfig @@ -17,3 +17,6 @@ CONFIG_GPIO_AS_PINRESET=y # bluetooth CONFIG_BLUETOOTH=y CONFIG_BLUETOOTH_CONTROLLER=y + +#enable DTS +CONFIG_HAS_DTS=y diff --git a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig index 71fe9bd1a39..f4bb1cc67f8 100644 --- a/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig +++ b/boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig @@ -15,3 +15,6 @@ CONFIG_UART_CONSOLE=y # bluetooth CONFIG_BLUETOOTH=y CONFIG_BLUETOOTH_CONTROLLER=y + +#enable DTS +CONFIG_HAS_DTS=y diff --git a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig b/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig index c8519fe923c..c3e26a0df46 100644 --- a/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig +++ b/boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig @@ -18,3 +18,6 @@ CONFIG_GPIO_AS_PINRESET=y # bluetooth CONFIG_BLUETOOTH=y CONFIG_BLUETOOTH_CONTROLLER=y + +#enable DTS +CONFIG_HAS_DTS=y diff --git a/dts/arm/96b_nitrogen.dts b/dts/arm/96b_nitrogen.dts new file mode 100644 index 00000000000..927432a07f4 --- /dev/null +++ b/dts/arm/96b_nitrogen.dts @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2017 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/dts-v1/; +#include + +/ { + model = "Seeed Studio Nitrogen 96board"; + compatible = "seeed,nitrogen", "nordic,nrf52832-qfaa", + "nordic,nrf52832"; + + chosen { + zephyr,console = &uart0; + zephyr,sram = &sram0; + zephyr,flash = &flash0; + }; +}; + +&uart0 { + compatible = "nordic,nrf-uart"; + current-speed = <115200>; + status = "ok"; +}; diff --git a/dts/arm/96b_nitrogen.fixup b/dts/arm/96b_nitrogen.fixup new file mode 100644 index 00000000000..239d39e760d --- /dev/null +++ b/dts/arm/96b_nitrogen.fixup @@ -0,0 +1,3 @@ +#define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS +#define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY +#define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED diff --git a/dts/arm/Makefile b/dts/arm/Makefile index e190276a923..2fd1467f4bf 100644 --- a/dts/arm/Makefile +++ b/dts/arm/Makefile @@ -18,6 +18,9 @@ dtb-$(CONFIG_BOARD_STM3210C_EVAL) = stm3210c_eval.dts_compiled dtb-$(CONFIG_BOARD_STM32_MINI_A15) = stm32_mini_a15.dts_compiled dtb-$(CONFIG_BOARD_NUCLEO_F334R8) = nucleo_f334r8.dts_compiled dtb-$(CONFIG_BOARD_STM32373C_EVAL) = stm32373c_eval.dts_compiled +dtb-$(CONFIG_BOARD_96B_NITROGEN) = 96b_nitrogen.dts_compiled +dtb-$(CONFIG_BOARD_NRF52_PCA10040) = nrf52_pca10040.dts_compiled +dtb-$(CONFIG_BOARD_NRF52_BLENANO2) = nrf52_blenano2.dts_compiled always := $(dtb-y) endif diff --git a/dts/arm/nrf52_blenano2.dts b/dts/arm/nrf52_blenano2.dts new file mode 100644 index 00000000000..c58a85e4884 --- /dev/null +++ b/dts/arm/nrf52_blenano2.dts @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2017 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/dts-v1/; +#include + +/ { + model = "Redbear BLE Nano 2"; + compatible = "redbear,blenano2", "nordic,nrf52832-qfaa", + "nordic,nrf52832"; + + chosen { + zephyr,console = &uart0; + zephyr,sram = &sram0; + zephyr,flash = &flash0; + }; +}; + +&uart0 { + compatible = "nordic,nrf-uart"; + current-speed = <115200>; + status = "ok"; +}; diff --git a/dts/arm/nrf52_blenano2.fixup b/dts/arm/nrf52_blenano2.fixup new file mode 100644 index 00000000000..239d39e760d --- /dev/null +++ b/dts/arm/nrf52_blenano2.fixup @@ -0,0 +1,3 @@ +#define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS +#define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY +#define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED diff --git a/dts/arm/nrf52_pca10040.dts b/dts/arm/nrf52_pca10040.dts new file mode 100644 index 00000000000..80e14736149 --- /dev/null +++ b/dts/arm/nrf52_pca10040.dts @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2017 Linaro Limited + * + * SPDX-License-Identifier: Apache-2.0 + */ + +/dts-v1/; +#include + +/ { + model = "Nordic PCA10040 Dev Kit"; + compatible = "nordic,pca10040-dk", "nordic,nrf52832-qfaa", + "nordic,nrf52832"; + + chosen { + zephyr,console = &uart0; + zephyr,sram = &sram0; + zephyr,flash = &flash0; + }; +}; + +&uart0 { + status = "ok"; + compatible = "nordic,nrf-uart"; + current-speed = <115200>; +}; diff --git a/dts/arm/nrf52_pca10040.fixup b/dts/arm/nrf52_pca10040.fixup new file mode 100644 index 00000000000..239d39e760d --- /dev/null +++ b/dts/arm/nrf52_pca10040.fixup @@ -0,0 +1,3 @@ +#define CONFIG_NUM_IRQ_PRIO_BITS ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS +#define CONFIG_UART_NRF5_IRQ_PRI NORDIC_NRF_UART_40002000_IRQ_0_PRIORITY +#define CONFIG_UART_NRF5_BAUD_RATE NORDIC_NRF_UART_40002000_CURRENT_SPEED