dts: optimize the dts for em_starterkit
eliminate unnecessary duplication
Signed-off-by: Wayne Ren <wei.ren@synopsys.com>
diff --git a/boards/arc/em_starterkit/em_starterkit.dts b/boards/arc/em_starterkit/em_starterkit.dts
index 89c44f8..1a81f5a 100644
--- a/boards/arc/em_starterkit/em_starterkit.dts
+++ b/boards/arc/em_starterkit/em_starterkit.dts
@@ -1,6 +1,38 @@
/dts-v1/;
-#include <em9d.dtsi>
+#include <emsk.dtsi>
+
+/ {
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu@0 {
+ device_type = "cpu";
+ compatible = "snps,arcem9d";
+ reg = <1>;
+ };
+
+ intc: arcv2-intc@0 {
+ compatible = "snps,arcv2-intc";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+
+ iccm0: iccm@0 {
+ device_type = "memory";
+ compatible = "arc,iccm";
+ reg = <0x0 0x40000>;
+ };
+
+ dccm0: dccm@80000000 {
+ device_type = "memory";
+ compatible = "arc,dccm";
+ reg = <0x80000000 0x20000>;
+ };
+};
+
/ {
model = "em_starterkit-em9d";
diff --git a/boards/arc/em_starterkit/em_starterkit_em11d.dts b/boards/arc/em_starterkit/em_starterkit_em11d.dts
index 5d14767..9c1d694 100644
--- a/boards/arc/em_starterkit/em_starterkit_em11d.dts
+++ b/boards/arc/em_starterkit/em_starterkit_em11d.dts
@@ -1,6 +1,37 @@
/dts-v1/;
-#include <em11d.dtsi>
+#include <emsk.dtsi>
+
+/ {
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu@0 {
+ device_type = "cpu";
+ compatible = "snps,arcem11d";
+ reg = <1>;
+ };
+
+ intc: arcv2-intc@0 {
+ compatible = "snps,arcv2-intc";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+
+ iccm0: iccm@0 {
+ device_type = "memory";
+ compatible = "arc,iccm";
+ reg = <0x0 0x10000>;
+ };
+
+ dccm0: dccm@80000000 {
+ device_type = "memory";
+ compatible = "arc,dccm";
+ reg = <0x80000000 0x10000>;
+ };
+};
/ {
model = "em_starterkit-em11d";
diff --git a/boards/arc/em_starterkit/em_starterkit_em7d.dts b/boards/arc/em_starterkit/em_starterkit_em7d.dts
index 253e2cb..faa6d3d 100644
--- a/boards/arc/em_starterkit/em_starterkit_em7d.dts
+++ b/boards/arc/em_starterkit/em_starterkit_em7d.dts
@@ -1,9 +1,40 @@
/dts-v1/;
-#include <em7d.dtsi>
+#include <emsk.dtsi>
/ {
- model = "em_starterkit-em7";
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu@0 {
+ device_type = "cpu";
+ compatible = "snps,arcem7d";
+ reg = <1>;
+ };
+
+ intc: arcv2-intc@0 {
+ compatible = "snps,arcv2-intc";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+
+ iccm0: iccm@0 {
+ device_type = "memory";
+ compatible = "arc,iccm";
+ reg = <0x0 0x40000>;
+ };
+
+ dccm0: dccm@80000000 {
+ device_type = "memory";
+ compatible = "arc,dccm";
+ reg = <0x80000000 0x20000>;
+ };
+};
+
+/ {
+ model = "em_starterkit-em7d";
compatible = "snps,em_starterkit-em7d", "snps,em_starterkit";
aliases {
diff --git a/dts/arc/em11d.dtsi b/dts/arc/em11d.dtsi
deleted file mode 100644
index f9489bc..0000000
--- a/dts/arc/em11d.dtsi
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <emsk.dtsi>
-
-/ {
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu@0 {
- device_type = "cpu";
- compatible = "snps,arcem11d";
- reg = <1>;
- };
-
- intc: arcv2-intc@0 {
- compatible = "snps,arcv2-intc";
- interrupt-controller;
- #interrupt-cells = <2>;
- };
- };
-
- iccm0: iccm@0 {
- device_type = "memory";
- compatible = "arc,iccm";
- reg = <0x0 0x10000>;
- };
-
- sram0: memory@10000000 {
- device_type = "memory";
- compatible = "mmio-sram";
- reg = <0x10000000 0x8000000>;
- };
-
- dccm0: dccm@80000000 {
- device_type = "memory";
- compatible = "arc,dccm";
- reg = <0x80000000 0x10000>;
- };
-};
diff --git a/dts/arc/em7d.dtsi b/dts/arc/em7d.dtsi
deleted file mode 100644
index ce10d42..0000000
--- a/dts/arc/em7d.dtsi
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <emsk.dtsi>
-
-/ {
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu@0 {
- device_type = "cpu";
- compatible = "snps,arcem7d";
- reg = <1>;
- };
-
- intc: arcv2-intc@0 {
- compatible = "snps,arcv2-intc";
- interrupt-controller;
- #interrupt-cells = <2>;
- };
- };
-
- iccm0: iccm@0 {
- device_type = "memory";
- compatible = "arc,iccm";
- reg = <0x0 0x40000>;
- };
-
- sram0: memory@10000000 {
- device_type = "memory";
- compatible = "mmio-sram";
- reg = <0x10000000 0x8000000>;
- };
-
- dccm0: dccm@80000000 {
- device_type = "memory";
- compatible = "arc,dccm";
- reg = <0x80000000 0x20000>;
- };
-};
diff --git a/dts/arc/em9d.dtsi b/dts/arc/em9d.dtsi
deleted file mode 100644
index 72f76f0..0000000
--- a/dts/arc/em9d.dtsi
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <emsk.dtsi>
-
-/ {
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu@0 {
- device_type = "cpu";
- compatible = "snps,arcem9d";
- reg = <1>;
- };
-
- intc: arcv2-intc@0 {
- compatible = "snps,arcv2-intc";
- interrupt-controller;
- #interrupt-cells = <2>;
- };
- };
-
- iccm0: iccm@0 {
- device_type = "memory";
- compatible = "arc,iccm";
- reg = <0x0 0x40000>;
- };
-
- dccm0: dccm@80000000 {
- device_type = "memory";
- compatible = "arc,dccm";
- reg = <0x80000000 0x20000>;
- };
-};
diff --git a/dts/arc/emsk.dtsi b/dts/arc/emsk.dtsi
index 38ceac4..9196fad 100644
--- a/dts/arc/emsk.dtsi
+++ b/dts/arc/emsk.dtsi
@@ -8,6 +8,12 @@
compatible = "simple-bus";
ranges;
+ sram0: memory@10000000 {
+ device_type = "memory";
+ compatible = "mmio-sram";
+ reg = <0x10000000 0x8000000>;
+ };
+
i2c0: i2c@f0004000 {
compatible = "snps,designware-i2c";
clock-frequency = <I2C_BITRATE_STANDARD>;
