[openwrt/openwrt] ath79: keep DTSI files for D-Link SoC-specific

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/acdf07cd3eb3d4aff09e0908c492859127524ab5

commit acdf07cd3eb3d4aff09e0908c492859127524ab5
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Mon Jan 4 00:56:57 2021 +0100

    ath79: keep DTSI files for D-Link SoC-specific
    
    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 at adrianschmutzler.de>
---
 target/linux/ath79/dts/qca9533_dlink_dap-2230-a1.dts                   | 3 +--
 target/linux/ath79/dts/qca9533_dlink_dap-3320-a1.dts                   | 3 +--
 .../dts/{qca95xx_dlink_dap-2xxx.dtsi => qca953x_dlink_dap-2xxx.dtsi}   | 2 ++
 target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts                   | 3 +--
 target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts                   | 3 +--
 .../dts/{qca95xx_dlink_dap-2xxx.dtsi => qca955x_dlink_dap-2xxx.dtsi}   | 2 ++
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/target/linux/ath79/dts/qca9533_dlink_dap-2230-a1.dts b/target/linux/ath79/dts/qca9533_dlink_dap-2230-a1.dts
index 61b6453842..3717a35ae3 100644
--- a/target/linux/ath79/dts/qca9533_dlink_dap-2230-a1.dts
+++ b/target/linux/ath79/dts/qca9533_dlink_dap-2230-a1.dts
@@ -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";
diff --git a/target/linux/ath79/dts/qca9533_dlink_dap-3320-a1.dts b/target/linux/ath79/dts/qca9533_dlink_dap-3320-a1.dts
index 97f2f62b4a..c186a7ee44 100644
--- a/target/linux/ath79/dts/qca9533_dlink_dap-3320-a1.dts
+++ b/target/linux/ath79/dts/qca9533_dlink_dap-3320-a1.dts
@@ -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/qca95xx_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi
similarity index 97%
copy from target/linux/ath79/dts/qca95xx_dlink_dap-2xxx.dtsi
copy to target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi
index 82d50b85e8..aff6eb2871 100644
--- a/target/linux/ath79/dts/qca95xx_dlink_dap-2xxx.dtsi
+++ b/target/linux/ath79/dts/qca953x_dlink_dap-2xxx.dtsi
@@ -1,5 +1,7 @@
 // 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>
 
diff --git a/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts b/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts
index 8ef07e42e8..622f4410b3 100644
--- a/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts
+++ b/target/linux/ath79/dts/qca9557_dlink_dap-2660-a1.dts
@@ -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";
diff --git a/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts
index c3c82937a8..7549c0a697 100644
--- a/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts
+++ b/target/linux/ath79/dts/qca9558_dlink_dap-2680-a1.dts
@@ -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/qca95xx_dlink_dap-2xxx.dtsi b/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi
similarity index 97%
rename from target/linux/ath79/dts/qca95xx_dlink_dap-2xxx.dtsi
rename to target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi
index 82d50b85e8..ac7a0c85f0 100644
--- a/target/linux/ath79/dts/qca95xx_dlink_dap-2xxx.dtsi
+++ b/target/linux/ath79/dts/qca955x_dlink_dap-2xxx.dtsi
@@ -1,5 +1,7 @@
 // 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>