From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sat, 22 Feb 2020 18:26:17 +0000 (+0100)
Subject: ramips: remove redundant includes in DTS files
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=963f572ead0acb7460908d3c89307db64d831d3c;p=openwrt%2Fstaging%2Fzorun.git

ramips: remove redundant includes in DTS files

Many DTS files contain the same includes again that are already
present in the DTSI files they are derived from.

Remove those redundant includes in the DTS files. For vocore, the
include is moved to the parent DTSI file.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts
index 06f887a37e..4715cecb61 100644
--- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts
+++ b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts
@@ -2,8 +2,6 @@
 
 #include "mt7621_ubiquiti_edgerouterx.dtsi"
 
-#include <dt-bindings/gpio/gpio.h>
-
 / {
 	model = "UBNT-ERX-SFP";
 	compatible = "ubiquiti,edgerouterx-sfp", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/mt7621_unielec_u7621-06-16m.dts b/target/linux/ramips/dts/mt7621_unielec_u7621-06-16m.dts
index 603e2dd2d8..dc8f88a460 100644
--- a/target/linux/ramips/dts/mt7621_unielec_u7621-06-16m.dts
+++ b/target/linux/ramips/dts/mt7621_unielec_u7621-06-16m.dts
@@ -36,9 +36,6 @@
 
 #include "mt7621_unielec_u7621-06.dtsi"
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 / {
 	compatible = "unielec,u7621-06-16m", "unielec,u7621-06", "mediatek,mt7621-soc";
 	model = "UniElec U7621-06 (16M flash)";
diff --git a/target/linux/ramips/dts/mt7621_unielec_u7621-06-64m.dts b/target/linux/ramips/dts/mt7621_unielec_u7621-06-64m.dts
index 3498be044a..511739b6c7 100644
--- a/target/linux/ramips/dts/mt7621_unielec_u7621-06-64m.dts
+++ b/target/linux/ramips/dts/mt7621_unielec_u7621-06-64m.dts
@@ -37,9 +37,6 @@
 
 #include "mt7621_unielec_u7621-06.dtsi"
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 / {
 	compatible = "unielec,u7621-06-64m", "unielec,u7621-06", "mediatek,mt7621-soc";
 	model = "UniElec U7621-06 (64M flash)";
diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
index fc8fc89b71..12e45be574 100644
--- a/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2-lite.dts
@@ -2,8 +2,6 @@
 
 #include "mt7628an_vocore_vocore2.dtsi"
 
-#include <dt-bindings/gpio/gpio.h>
-
 / {
 	compatible = "vocore,vocore2-lite", "vocore,vocore2", "mediatek,mt7628an-soc";
 	model = "VoCore2-Lite";
diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts
index 939bb0b761..2630f5261e 100644
--- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dts
@@ -2,8 +2,6 @@
 
 #include "mt7628an_vocore_vocore2.dtsi"
 
-#include <dt-bindings/gpio/gpio.h>
-
 / {
 	compatible = "vocore,vocore2", "mediatek,mt7628an-soc";
 	model = "VoCore2";
diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
index a0056dcedb..34664bde94 100644
--- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
@@ -1,5 +1,7 @@
 #include "mt7628an.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+
 / {
 	compatible = "vocore,vocore2", "mediatek,mt7628an-soc";
 
diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts
index 98c099cecc..0b4cf699b5 100644
--- a/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts
+++ b/target/linux/ramips/dts/rt3883_belkin_f9k1109v1.dts
@@ -3,9 +3,6 @@
 
 #include "rt3883_belkin_f9k110x.dtsi"
 
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
 / {
 	compatible = "belkin,f9k1109v1", "ralink,rt3883-soc";
 	model = "Belkin F9K1109 Version 1.0";