aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMarkus Stockhausen <markus.stockhausen@gmx.de>2022-09-17 19:03:13 +0200
committerSander Vanheule <sander@svanheule.net>2022-09-17 21:28:21 +0200
commit307e5cfc6ec2f03dd603953e3727fd765ffb3989 (patch)
tree2e7a5bd314c306854f026cdf9e4db330cbcb4dce /target
parentb201462c8999754b8ddd07de1cfb5d497503113f (diff)
downloadupstream-307e5cfc6ec2f03dd603953e3727fd765ffb3989.tar.gz
upstream-307e5cfc6ec2f03dd603953e3727fd765ffb3989.tar.bz2
upstream-307e5cfc6ec2f03dd603953e3727fd765ffb3989.zip
realtek: D-Link make common DT include generic
The D-Link DGS device tree was reorganized to better reflect the common DT parts. The common include is named SOC specific (838X) and it seemed like a good choice to add another common include in the future for the RTL839X devices. From the current point of view this option is not really needed. 1. The common part only includes data that matches RTL839X devices too. 2. The Panasonic DT structure avoids including the basic DTSI inside the common DTSI. Taking simplicity of the Panasonic include logic and in perparation to provide DGS-1210-52 support it makes sense to harmonize this. - rename common include to reflect its content - move the link to the root DTSI directly to the device specific DTS Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Diffstat (limited to 'target')
-rw-r--r--target/linux/realtek/dts-5.10/rtl8380_d-link_dgs-1210-10mp-f.dts3
-rw-r--r--target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts3
-rw-r--r--target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-16.dts3
-rw-r--r--target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-20.dts3
-rw-r--r--target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-28.dts3
-rw-r--r--target/linux/realtek/dts-5.10/rtl83xx_d-link_dgs-1210_common.dtsi (renamed from target/linux/realtek/dts-5.10/rtl838x_d-link_dgs-1210_common.dtsi)2
6 files changed, 10 insertions, 7 deletions
diff --git a/target/linux/realtek/dts-5.10/rtl8380_d-link_dgs-1210-10mp-f.dts b/target/linux/realtek/dts-5.10/rtl8380_d-link_dgs-1210-10mp-f.dts
index 3e8e97986c..e7db688ad5 100644
--- a/target/linux/realtek/dts-5.10/rtl8380_d-link_dgs-1210-10mp-f.dts
+++ b/target/linux/realtek/dts-5.10/rtl8380_d-link_dgs-1210-10mp-f.dts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "rtl838x_d-link_dgs-1210_common.dtsi"
+#include "rtl838x.dtsi"
+#include "rtl83xx_d-link_dgs-1210_common.dtsi"
#include "rtl83xx_d-link_dgs-1210_gpio.dtsi"
/ {
diff --git a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts
index e57197d55c..7ab37aaa9f 100644
--- a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts
+++ b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "rtl838x_d-link_dgs-1210_common.dtsi"
+#include "rtl838x.dtsi"
+#include "rtl83xx_d-link_dgs-1210_common.dtsi"
/ {
compatible = "d-link,dgs-1210-10p", "realtek,rtl838x-soc";
diff --git a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-16.dts b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-16.dts
index 28c64c2ab4..35f41b9e4d 100644
--- a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-16.dts
+++ b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-16.dts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "rtl838x_d-link_dgs-1210_common.dtsi"
+#include "rtl838x.dtsi"
+#include "rtl83xx_d-link_dgs-1210_common.dtsi"
/ {
compatible = "d-link,dgs-1210-16", "realtek,rtl838x-soc";
diff --git a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-20.dts b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-20.dts
index f96f08db29..dacc50676d 100644
--- a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-20.dts
+++ b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-20.dts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "rtl838x_d-link_dgs-1210_common.dtsi"
+#include "rtl838x.dtsi"
+#include "rtl83xx_d-link_dgs-1210_common.dtsi"
#include "rtl83xx_d-link_dgs-1210_gpio.dtsi"
/ {
diff --git a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-28.dts b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-28.dts
index a4a450cc09..cf7b888fc9 100644
--- a/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-28.dts
+++ b/target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-28.dts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "rtl838x_d-link_dgs-1210_common.dtsi"
+#include "rtl838x.dtsi"
+#include "rtl83xx_d-link_dgs-1210_common.dtsi"
#include "rtl83xx_d-link_dgs-1210_gpio.dtsi"
/ {
diff --git a/target/linux/realtek/dts-5.10/rtl838x_d-link_dgs-1210_common.dtsi b/target/linux/realtek/dts-5.10/rtl83xx_d-link_dgs-1210_common.dtsi
index c1deff4bba..1e3cafa938 100644
--- a/target/linux/realtek/dts-5.10/rtl838x_d-link_dgs-1210_common.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl83xx_d-link_dgs-1210_common.dtsi
@@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "rtl838x.dtsi"
-
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>