From 1173719817796415acafa1c9dc09384e8808aa64 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sat, 22 Feb 2020 19:33:41 +0100
Subject: [PATCH] ramips: move includes to DTSI for mt7628an_tplink_8m*
All devices inherited from mt7628an_tplink_8m.dtsi and
mt7628an_tplink_8m-split-uboot.dtsi contain the same additional
includes in the DTS files.
Move them to the DTSI files instead.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 3 +++
target/linux/ramips/dts/mt7628an_tplink_8m.dtsi | 3 +++
target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts | 3 ---
target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts | 3 ---
target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts | 3 ---
target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts | 3 ---
target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts | 3 ---
target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts | 3 ---
target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts | 3 ---
target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts | 3 ---
target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts | 3 ---
target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts | 3 ---
target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts | 3 ---
13 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
index 22290603478..157136bd09c 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
@@ -1,6 +1,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "mt7628an.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
/ {
chosen {
bootargs = "console=ttyS0,115200";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
index 5269fd668b9..666ff49a90d 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
@@ -1,5 +1,8 @@
#include "mt7628an.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
/ {
chosen {
bootargs = "console=ttyS0,115200";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
index 3f02b7af3c8..9d0f6563c31 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -2,9 +2,6 @@
#include "mt7628an_tplink_8m.dtsi"
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
-
/ {
compatible = "tplink,archer-c20-v4", "mediatek,mt7628an-soc";
model = "TP-Link Archer C20 v4";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
index e01826841d8..9aca8429b41 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
@@ -3,9 +3,6 @@
#include "mt7628an_tplink_8m-split-uboot.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
/ {
compatible = "tplink,archer-c20-v5", "mediatek,mt7628an-soc";
model = "TP-Link Archer C20 v5";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
index 92f581d1ef8..360466d56f2 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -2,9 +2,6 @@
#include "mt7628an_tplink_8m.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
/ {
compatible = "tplink,archer-c50-v3", "mediatek,mt7628an-soc";
model = "TP-Link Archer C50 v3";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
index f7a559918c3..8db4f219877 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
@@ -3,9 +3,6 @@
#include "mt7628an_tplink_8m-split-uboot.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
/ {
compatible = "tplink,archer-c50-v4", "mediatek,mt7628an-soc";
model = "TP-Link Archer C50 v4";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
index 76cf0ca2495..ad60548678b 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3420-v5.dts
@@ -2,9 +2,6 @@
#include "mt7628an_tplink_8m.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
/ {
compatible = "tplink,tl-mr3420-v5", "mediatek,mt7628an-soc";
model = "TP-Link TL-MR3420 v5";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
index 7b9033202c7..5485a04119f 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wa801nd-v5.dts
@@ -2,9 +2,6 @@
#include "mt7628an_tplink_8m.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
/ {
compatible = "tplink,tl-wa801nd-v5", "mediatek,mt7628an-soc";
model = "TP-Link TL-WA801ND v5";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
index 3c615e60611..25444b1d3de 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
@@ -3,9 +3,6 @@
#include "mt7628an_tplink_8m.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
/ {
compatible = "tplink,tl-wr802n-v4", "mediatek,mt7628an-soc";
model = "TP-Link TL-WR802N v4";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
index 3f901d3a7c8..5d7035bba40 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v4.dts
@@ -2,9 +2,6 @@
#include "mt7628an_tplink_8m.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
/ {
compatible = "tplink,tl-wr840n-v4", "mediatek,mt7628an-soc";
model = "TP-Link TL-WR840N v4";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
index 89e2923c9c3..ca25ce643de 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v13.dts
@@ -2,9 +2,6 @@
#include "mt7628an_tplink_8m.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
/ {
compatible = "tplink,tl-wr841n-v13", "mediatek,mt7628an-soc";
model = "TP-Link TL-WR841N v13";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
index a0adb160d3a..50974fafe7f 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr842n-v5.dts
@@ -2,9 +2,6 @@
#include "mt7628an_tplink_8m.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
/ {
compatible = "tplink,tl-wr842n-v5", "mediatek,mt7628an-soc";
model = "TP-Link TL-WR842N v5";
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
index f4b50a37ff9..9d5dddbe4b8 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
@@ -2,9 +2,6 @@
#include "mt7628an_tplink_8m.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
/ {
compatible = "tplink,tl-wr902ac-v3", "mediatek,mt7628an-soc";
model = "TP-Link TL-WR902AC v3";
--
GitLab