dts: arm: sam0: move contents samd21 to samd

samd21.dtsi includes now the same content need for SAMD20, move it to samd.dtsi and include it from samd21.dtsi. Then later USB support can be added to the samd21.dtsi seperatly from the samd20 etc. Signed-off-by: Sean Nyekjaer <sean@nyekjaer.dk>
zephyrproject-rtos · Jul 10, 2018 · 5a1bcc7 · 5a1bcc7
1 parent 31aaf07
commit 5a1bcc7
Show file tree

Hide file tree

Showing 2 changed files with 138 additions and 131 deletions.
diff --git a/dts/arm/atmel/samd.dtsi b/dts/arm/atmel/samd.dtsi
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2017 Google LLC.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <arm/armv6-m.dtsi>
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-m0";
+			reg = <0>;
+		};
+	};
+
+	sram0: memory@20000000 {
+		device_type = "memory";
+		compatible = "mmio-sram";
+		reg = <0x20000000 0x8000>;
+	};
+
+	soc {
+		nvmctrl: nvmctrl@41004000  {
+			compatible = "atmel,sam0-nvmctrl";
+			label = "FLASH_CTRL";
+			reg = <0x40022000 0x22>;
+			interrupts = <5 0>;
+
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			flash0: flash@0 {
+				compatible = "soc-nv-flash";
+				label = "FLASH_0";
+				reg = <0 0x40000>;
+				write-block-size = <64>;
+			};
+		};
+
+		pinmux_a: pinmux@41004400 {
+			compatible = "atmel,sam0-pinmux";
+			reg = <0x41004400 0x80>;
+			label = "PINMUX_A";
+		};
+
+		pinmux_b: pinmux@41004480 {
+			compatible = "atmel,sam0-pinmux";
+			reg = <0x41004480 0x80>;
+			label = "PINMUX_B";
+		};
+
+		wdog: watchdog@40001000 {
+			compatible = "atmel,sam0-watchdog";
+			reg = <0x40001000 9>;
+			interrupts = <2 0>;
+			label = "WATCHDOG_0";
+		};
+
+		sercom0: sercom@42000800 {
+			compatible = "atmel,sam0-sercom";
+			reg = <0x42000800 0x40>;
+			interrupts = <9 0>;
+			status = "disabled";
+			label = "SERCOM0";
+		};
+
+		sercom1: sercom@42000c00 {
+			compatible = "atmel,sam0-sercom";
+			reg = <0x42000c00 0x40>;
+			interrupts = <10 0>;
+			status = "disabled";
+			label = "SERCOM1";
+		};
+
+		sercom2: sercom@42001000 {
+			compatible = "atmel,sam0-sercom";
+			reg = <0x42001000 0x40>;
+			interrupts = <11 0>;
+			status = "disabled";
+			label = "SERCOM2";
+		};
+
+		sercom3: sercom@42001400 {
+			compatible = "atmel,sam0-sercom";
+			reg = <0x42001400 0x40>;
+			interrupts = <12 0>;
+			status = "disabled";
+			label = "SERCOM3";
+		};
+
+		sercom4: sercom@42001800 {
+			compatible = "atmel,sam0-sercom";
+			reg = <0x42001800 0x40>;
+			interrupts = <13 0>;
+			status = "disabled";
+			label = "SERCOM4";
+		};
+
+		sercom5: sercom@42001C00 {
+			compatible = "atmel,sam0-sercom";
+			reg = <0x42001C00 0x40>;
+			interrupts = <14 0>;
+			status = "disabled";
+			label = "SERCOM5";
+		};
+
+		porta: gpio@41004400 {
+			compatible = "atmel,sam0-gpio";
+			reg = <0x41004400 0x80>;
+			label = "PORTA";
+		};
+
+		portb: gpio@41004480 {
+			compatible = "atmel,sam0-gpio";
+			reg = <0x41004480 0x80>;
+			label = "PORTB";
+		};
+
+		usb0: usb@41005000 {
+			compatible = "atmel,sam0-usb";
+			status = "disabled";
+			reg = <0x41005000 0x1000>;
+			interrupts = <7 0>;
+			num-bidir-endpoints = <8>;
+			label = "USB0";
+		};
+	};
+};
+
+&nvic {
+	arm,num-irq-priority-bits = <2>;
+};
diff --git a/dts/arm/atmel/samd21.dtsi b/dts/arm/atmel/samd21.dtsi
@@ -4,134 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arm/armv6-m.dtsi>
-
-/ {
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			device_type = "cpu";
-			compatible = "arm,cortex-m0";
-			reg = <0>;
-		};
-	};
-
-	sram0: memory@20000000 {
-		device_type = "memory";
-		compatible = "mmio-sram";
-		reg = <0x20000000 0x8000>;
-	};
-
-	soc {
-		nvmctrl: nvmctrl@41004000  {
-			compatible = "atmel,sam0-nvmctrl";
-			label = "FLASH_CTRL";
-			reg = <0x40022000 0x22>;
-			interrupts = <5 0>;
-
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			flash0: flash@0 {
-				compatible = "soc-nv-flash";
-				label = "FLASH_0";
-				reg = <0 0x40000>;
-				write-block-size = <64>;
-			};
-		};
-
-		pinmux_a: pinmux@41004400 {
-			compatible = "atmel,sam0-pinmux";
-			reg = <0x41004400 0x80>;
-			label = "PINMUX_A";
-		};
-
-		pinmux_b: pinmux@41004480 {
-			compatible = "atmel,sam0-pinmux";
-			reg = <0x41004480 0x80>;
-			label = "PINMUX_B";
-		};
-
-		wdog: watchdog@40001000 {
-			compatible = "atmel,sam0-watchdog";
-			reg = <0x40001000 9>;
-			interrupts = <2 0>;
-			label = "WATCHDOG_0";
-		};
-
-		sercom0: sercom@42000800 {
-			compatible = "atmel,sam0-sercom";
-			reg = <0x42000800 0x40>;
-			interrupts = <9 0>;
-			status = "disabled";
-			label = "SERCOM0";
-		};
-
-		sercom1: sercom@42000c00 {
-			compatible = "atmel,sam0-sercom";
-			reg = <0x42000c00 0x40>;
-			interrupts = <10 0>;
-			status = "disabled";
-			label = "SERCOM1";
-		};
-
-		sercom2: sercom@42001000 {
-			compatible = "atmel,sam0-sercom";
-			reg = <0x42001000 0x40>;
-			interrupts = <11 0>;
-			status = "disabled";
-			label = "SERCOM2";
-		};
-
-		sercom3: sercom@42001400 {
-			compatible = "atmel,sam0-sercom";
-			reg = <0x42001400 0x40>;
-			interrupts = <12 0>;
-			status = "disabled";
-			label = "SERCOM3";
-		};
-
-		sercom4: sercom@42001800 {
-			compatible = "atmel,sam0-sercom";
-			reg = <0x42001800 0x40>;
-			interrupts = <13 0>;
-			status = "disabled";
-			label = "SERCOM4";
-		};
-
-		sercom5: sercom@42001C00 {
-			compatible = "atmel,sam0-sercom";
-			reg = <0x42001C00 0x40>;
-			interrupts = <14 0>;
-			status = "disabled";
-			label = "SERCOM5";
-		};
-
-		porta: gpio@41004400 {
-			compatible = "atmel,sam0-gpio";
-			reg = <0x41004400 0x80>;
-			label = "PORTA";
-		};
-
-		portb: gpio@41004480 {
-			compatible = "atmel,sam0-gpio";
-			reg = <0x41004480 0x80>;
-			label = "PORTB";
-		};
-
-		usb0: usb@41005000 {
-			compatible = "atmel,sam0-usb";
-			status = "disabled";
-			reg = <0x41005000 0x1000>;
-			interrupts = <7 0>;
-			num-bidir-endpoints = <8>;
-			label = "USB0";
-		};
-	};
-};
-
-&nvic {
-	arm,num-irq-priority-bits = <2>;
-};
+#include <atmel/samd.dtsi>