ath79: keep DTSI files for D-Link SoC-specific
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Sun, 3 Jan 2021 23:56:57 +0000 (00:56 +0100)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Mon, 4 Jan 2021 00:09:32 +0000 (01:09 +0100)
It is good practice to define device tree files based on specific
SoCs. Thus, let's not start to create files that are used across
different architectures.

Duplicate the DTSI file for D-Link DAP-2xxx in order to have one
for qca953x and one for qca955x, respectively.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
target/linux/ath79/dts/qca9533_dlink_dap-2230-a1.dts
target/linux/ath79/dts/qca9533_dlink_dap-3320-a1.dts
target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi [new file with mode: 0644]
target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts
target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts
target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi [new file with mode: 0644]
target/linux/ath79/dts/qca95xx_dlink_dap-2xxx.dtsi [deleted file]

index 61b6453842a6ab2ed31afdcb0f3c3dd21a5b5651..3717a35ae30ce109f8cd235ca06470bcbd00a48d 100644 (file)
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca953x.dtsi"
-#include "qca95xx_dlink_dap-2xxx.dtsi"
+#include "qca953x_dlink_dap-2xxx.dtsi"
 
 / {
        compatible = "dlink,dap-2230-a1", "qca,qca9533";
index 97f2f62b4a80d57578571d1037a5e11c31a6f457..c186a7ee442d005c98a8a43abdfa26b0c0278015 100644 (file)
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca953x.dtsi"
-#include "qca95xx_dlink_dap-2xxx.dtsi"
+#include "qca953x_dlink_dap-2xxx.dtsi"
 
 / {
        compatible = "dlink,dap-3320-a1", "qca,qca9533";
diff --git a/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi
new file mode 100644 (file)
index 0000000..aff6eb2
--- /dev/null
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qca953x.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+&spi {
+       status = "okay";
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <50000000>;
+
+               partitions: partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               label = "bdcfg";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               label = "rgdb";
+                               reg = <0x50000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@60000 {
+                               label = "unused";
+                               reg = <0x60000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&uart {
+       status = "okay";
+};
+
+&wmac {
+       status = "okay";
+
+       mtd-cal-data = <&art 0x1000>;
+};
index 8ef07e42e8bc9180cad569ab24259a721b594d05..622f4410b33f95a285b09014a272052b3bf76e0f 100644 (file)
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca955x.dtsi"
-#include "qca95xx_dlink_dap-2xxx.dtsi"
+#include "qca955x_dlink_dap-2xxx.dtsi"
 
 / {
        compatible = "dlink,dap-2660-a1", "qca,qca9557";
index c3c82937a84b271f8344e450afe938e89aafb369..7549c0a6970d165d00ea4f7d2d7d0fb2b894eeb9 100644 (file)
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qca955x.dtsi"
-#include "qca95xx_dlink_dap-2xxx.dtsi"
+#include "qca955x_dlink_dap-2xxx.dtsi"
 
 / {
        compatible = "dlink,dap-2680-a1", "qca,qca9558";
diff --git a/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi
new file mode 100644 (file)
index 0000000..ac7a0c8
--- /dev/null
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qca955x.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+&spi {
+       status = "okay";
+
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <50000000>;
+
+               partitions: partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               label = "bdcfg";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               label = "rgdb";
+                               reg = <0x50000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@60000 {
+                               label = "unused";
+                               reg = <0x60000 0x10000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&uart {
+       status = "okay";
+};
+
+&wmac {
+       status = "okay";
+
+       mtd-cal-data = <&art 0x1000>;
+};
diff --git a/target/linux/ath79/dts/qca95xx_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca95xx_dlink_dap-2xxx.dtsi
deleted file mode 100644 (file)
index 82d50b8..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-&spi {
-       status = "okay";
-
-       flash@0 {
-               compatible = "jedec,spi-nor";
-               reg = <0>;
-               spi-max-frequency = <50000000>;
-
-               partitions: partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x0 0x40000>;
-                               read-only;
-                       };
-
-                       partition@40000 {
-                               label = "bdcfg";
-                               reg = <0x40000 0x10000>;
-                               read-only;
-                       };
-
-                       partition@50000 {
-                               label = "rgdb";
-                               reg = <0x50000 0x10000>;
-                               read-only;
-                       };
-
-                       partition@60000 {
-                               label = "unused";
-                               reg = <0x60000 0x10000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&uart {
-       status = "okay";
-};
-
-&wmac {
-       status = "okay";
-
-       mtd-cal-data = <&art 0x1000>;
-};