dts: arm: nrf: Remove use of CONFIG_SOC_* from Nordic dts files

To move forward and remove use of Kconfig in dts files lets just create SoC specific dtsi files that the boards can include. This lets us remove: CONFIG_SOC_NRF51822_QFAA CONFIG_SOC_NRF51822_QFAB CONFIG_SOC_NRF51822_QFAC CONFIG_SOC_NRF52810_QFAA CONFIG_SOC_NRF52832_QFAA CONFIG_SOC_NRF52832_CIAA CONFIG_SOC_NRF52832_QFAB CONFIG_SOC_NRF52840_QIAA Signed-off-by: Kumar Gala <[email protected]>
chrta · Sep 15, 2018 · 236a2d6 · 236a2d6
1 parent 8461217
commit 236a2d6
Show file tree

Hide file tree

Showing 33 changed files with 180 additions and 71 deletions.
diff --git a/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51.dts b/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf51822.dtsi>
+#include <nordic/nrf51822_qfac.dtsi>
 
 / {
 	model = "Seeed Studio Carbon nRF51 96board";

diff --git a/boards/arm/96b_nitrogen/96b_nitrogen.dts b/boards/arm/96b_nitrogen/96b_nitrogen.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52832.dtsi>
+#include <nordic/nrf52832_qfaa.dtsi>
 
 / {
 	model = "Seeed Studio Nitrogen 96board";

diff --git a/boards/arm/bbc_microbit/bbc_microbit.dts b/boards/arm/bbc_microbit/bbc_microbit.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf51822.dtsi>
+#include <nordic/nrf51822_qfaa.dtsi>
 
 / {
 	model = "BBC Micro:bit";

diff --git a/boards/arm/curie_ble/curie_ble.dts b/boards/arm/curie_ble/curie_ble.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf51822.dtsi>
+#include <nordic/nrf51822_qfaa.dtsi>
 
 / {
 	model = "Intel Curie BLE";

diff --git a/boards/arm/nrf51_ble400/nrf51_ble400.dts b/boards/arm/nrf51_ble400/nrf51_ble400.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf51822.dtsi>
+#include <nordic/nrf51822_qfaa.dtsi>
 
 / {
 	model = "Waveshare BLE400";

diff --git a/boards/arm/nrf51_blenano/nrf51_blenano.dts b/boards/arm/nrf51_blenano/nrf51_blenano.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf51822.dtsi>
+#include <nordic/nrf51822_qfaa.dtsi>
 
 / {
 	model = "Redbear BLE Nano";

diff --git a/boards/arm/nrf51_pca10028/nrf51_pca10028.dts b/boards/arm/nrf51_pca10028/nrf51_pca10028.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf51822.dtsi>
+#include <nordic/nrf51822_qfac.dtsi>
 
 / {
 	model = "Nordic PCA10028 Dev Kit";

diff --git a/boards/arm/nrf51_vbluno51/nrf51_vbluno51.dts b/boards/arm/nrf51_vbluno51/nrf51_vbluno51.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf51822.dtsi>
+#include <nordic/nrf51822_qfac.dtsi>
 
 / {
 	model = "VNG VBLUno51 BLE board";

diff --git a/boards/arm/nrf52810_pca10040/nrf52810_pca10040.dts b/boards/arm/nrf52810_pca10040/nrf52810_pca10040.dts
@@ -7,7 +7,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52810.dtsi>
+#include <nordic/nrf52810_qfaa.dtsi>
 
 / {
 	model = "Nordic PCA10040 Dev Kit";

diff --git a/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts b/boards/arm/nrf52840_pca10056/nrf52840_pca10056.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52840.dtsi>
+#include <nordic/nrf52840_qiaa.dtsi>
 
 / {
 	model = "Nordic PCA10056 Dev Kit";

diff --git a/boards/arm/nrf52840_pca10059/nrf52840_pca10059.dts b/boards/arm/nrf52840_pca10059/nrf52840_pca10059.dts
@@ -6,7 +6,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52840.dtsi>
+#include <nordic/nrf52840_qiaa.dtsi>
 
 / {
 	model = "Nordic PCA10059 Dev Kit";

diff --git a/boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.dts b/boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.dts
@@ -6,7 +6,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52832.dtsi>
+#include <nordic/nrf52832_qfaa.dtsi>
 
 / {
 	model = "nRF52 Adafruit Feather";

diff --git a/boards/arm/nrf52_blenano2/nrf52_blenano2.dts b/boards/arm/nrf52_blenano2/nrf52_blenano2.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52832.dtsi>
+#include <nordic/nrf52832_qfaa.dtsi>
 
 / {
 	model = "Redbear BLE Nano 2";

diff --git a/boards/arm/nrf52_pca10040/nrf52_pca10040.dts b/boards/arm/nrf52_pca10040/nrf52_pca10040.dts
@@ -6,7 +6,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52832.dtsi>
+#include <nordic/nrf52832_qfaa.dtsi>
 
 / {
 	model = "Nordic PCA10040 Dev Kit";

diff --git a/boards/arm/nrf52_pca20020/nrf52_pca20020.dts b/boards/arm/nrf52_pca20020/nrf52_pca20020.dts
@@ -7,7 +7,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52832.dtsi>
+#include <nordic/nrf52832_qfaa.dtsi>
 
 / {
 	model = "Nordic PCA20020 Dev Kit";

diff --git a/boards/arm/nrf52_sparkfun/nrf52_sparkfun.dts b/boards/arm/nrf52_sparkfun/nrf52_sparkfun.dts
@@ -6,7 +6,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52832.dtsi>
+#include <nordic/nrf52832_qfaa.dtsi>
 
 / {
 	model = "Sparkfun nRF52832 Breakout";

diff --git a/boards/arm/nrf52_vbluno52/nrf52_vbluno52.dts b/boards/arm/nrf52_vbluno52/nrf52_vbluno52.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52832.dtsi>
+#include <nordic/nrf52832_qfaa.dtsi>
 
 / {
 	model = "VNG VBLUno52 BLE 5.0 board";

diff --git a/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble.dts b/boards/arm/quark_se_c1000_ble/quark_se_c1000_ble.dts
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf51822.dtsi>
+#include <nordic/nrf51822_qfaa.dtsi>
 
 / {
 	model = "Intel Quark SE C1000 BLE";

diff --git a/boards/arm/reel_board/reel_board.dts b/boards/arm/reel_board/reel_board.dts
@@ -6,7 +6,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf52840.dtsi>
+#include <nordic/nrf52840_qiaa.dtsi>
 
 / {
 	model = "reel board";

diff --git a/dts/arm/nordic/mem.h b/dts/arm/nordic/mem.h
diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi
@@ -1,7 +1,6 @@
 #include <arm/armv6-m.dtsi>
 #include <dt-bindings/i2c/i2c.h>
 #include <dt-bindings/gpio/gpio.h>
-#include <nordic/mem.h>
 
 / {
 	cpus {
@@ -27,7 +26,6 @@
 			flash0: flash@0 {
 				compatible = "soc-nv-flash";
 				label = "NRF_FLASH";
-				reg = <0x00000000 DT_FLASH_SIZE>;
 				erase-block-size = <1024>;
 				write-block-size = <4>;
 			};
@@ -36,7 +34,6 @@
 	sram0: memory@20000000 {
 		device_type = "memory";
 		compatible = "mmio-sram";
-		reg = <0x20000000 DT_SRAM_SIZE>;
 	};
 
 	soc {

diff --git a/dts/arm/nordic/nrf51822_qfaa.dtsi b/dts/arm/nordic/nrf51822_qfaa.dtsi
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018 Linaro Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <nordic/nrf51822.dtsi>
+
+/ {
+	flash-controller@4001E000 {
+		flash0: flash@0 {
+			reg = <0x00000000 DT_SIZE_K(256)>;
+		};
+	};
+
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(16)>;
+	};
+};
diff --git a/dts/arm/nordic/nrf51822_qfab.dtsi b/dts/arm/nordic/nrf51822_qfab.dtsi
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018 Linaro Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <nordic/nrf51822.dtsi>
+
+/ {
+	flash-controller@4001E000 {
+		flash0: flash@0 {
+			reg = <0x00000000 DT_SIZE_K(128)>;
+		};
+	};
+
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(16)>;
+	};
+};
diff --git a/dts/arm/nordic/nrf51822_qfac.dtsi b/dts/arm/nordic/nrf51822_qfac.dtsi
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018 Linaro Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <nordic/nrf51822.dtsi>
+
+/ {
+	flash-controller@4001E000 {
+		flash0: flash@0 {
+			reg = <0x00000000 DT_SIZE_K(256)>;
+		};
+	};
+
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(32)>;
+	};
+};
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
@@ -1,7 +1,6 @@
 #include <arm/armv7-m.dtsi>
 #include <dt-bindings/i2c/i2c.h>
 #include <dt-bindings/gpio/gpio.h>
-#include <nordic/mem.h>
 
 / {
 	cpus {
@@ -27,15 +26,13 @@
 			flash0: flash@0 {
 				compatible = "soc-nv-flash";
 				label = "NRF_FLASH";
-				reg = <0x00000000 DT_FLASH_SIZE>;
 				write-block-size = <4>;
 			};
 	};
 
 	sram0: memory@20000000 {
 		device_type = "memory";
 		compatible = "mmio-sram";
-		reg = <0x20000000 DT_SRAM_SIZE>;
 	};
 
 	soc {

diff --git a/dts/arm/nordic/nrf52810_qfaa.dtsi b/dts/arm/nordic/nrf52810_qfaa.dtsi
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018 Linaro Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <nordic/nrf52810.dtsi>
+
+/ {
+	flash-controller@4001E000 {
+		flash0: flash@0 {
+			reg = <0x00000000 DT_SIZE_K(192)>;
+		};
+	};
+
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(24)>;
+	};
+};
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
@@ -1,7 +1,6 @@
 #include <arm/armv7-m.dtsi>
 #include <dt-bindings/i2c/i2c.h>
 #include <dt-bindings/gpio/gpio.h>
-#include <nordic/mem.h>
 
 / {
 	cpus {
@@ -27,7 +26,6 @@
 			flash0: flash@0 {
 				compatible = "soc-nv-flash";
 				label = "NRF_FLASH";
-				reg = <0x00000000 DT_FLASH_SIZE>;
 				erase-block-size = <4096>;
 				write-block-size = <4>;
 			};
@@ -36,7 +34,6 @@
 	sram0: memory@20000000 {
 		device_type = "memory";
 		compatible = "mmio-sram";
-		reg = <0x20000000 DT_SRAM_SIZE>;
 	};
 
 	soc {

diff --git a/dts/arm/nordic/nrf52832_ciaa.dtsi b/dts/arm/nordic/nrf52832_ciaa.dtsi
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018 Linaro Limited
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <mem.h>
+#include <nordic/nrf52832.dtsi>
+
+/ {
+	flash-controller@4001E000 {
+		flash0: flash@0 {
+			reg = <0x00000000 DT_SIZE_K(512)>;
+		};
+	};
+
+	sram0: memory@20000000 {
+		reg = <0x20000000 DT_SIZE_K(64)>;
+	};
+};