aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Kletsky <git-commits@allycomm.com>2019-10-02 12:06:18 -0700
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-11-03 14:02:25 +0100
commite539dc2daa42a4c927a21c178db96da21117d806 (patch)
treef16a2cc5584a22c5a006049fa24446f955babfb0
parent8f0deedc11f1036c88d9fdd23cdedc2ebc8c7942 (diff)
downloadupstream-e539dc2daa42a4c927a21c178db96da21117d806.tar.gz
upstream-e539dc2daa42a4c927a21c178db96da21117d806.tar.bz2
upstream-e539dc2daa42a4c927a21c178db96da21117d806.zip
ath79: Clean up GL-AR300M DTS/DTSI inclusions
Modify GL-AR300M-Lite and GL-AR300M (NOR): * Include qca9531_glinet_gl-ar300m.dtsi directly rather than qca9531_glinet_gl-ar300m-nor.dts * Remove redundant inclusion of gpio.h and input.h Signed-off-by: Jeff Kletsky <git-commits@allycomm.com> Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit f5c7fe2ff0deb20f76b4d65195434e35cbb4e08a)
-rw-r--r--target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts2
-rw-r--r--target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts3
2 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
index e29af5411d..b2cb5bc261 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-lite.dts
@@ -1,6 +1,6 @@
/dts-v1/;
-#include "qca9531_glinet_gl-ar300m-nor.dts"
+#include "qca9531_glinet_gl-ar300m.dtsi"
/ {
compatible = "glinet,gl-ar300m-lite", "qca,qca9531";
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts
index 02196cf9c4..22e5ae4e74 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m-nor.dts
@@ -1,8 +1,5 @@
/dts-v1/;
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
#include "qca9531_glinet_gl-ar300m.dtsi"
/ {