aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-11-26 15:46:14 +0100
committerMathias Kresin <dev@kresin.me>2018-11-27 21:11:54 +0100
commit757478133743d2d573ee2d5eb78be37aa544e11e (patch)
tree0a289fe9fd9ef39c09d710f3c32cb2d1a91ef603 /target
parent68d77241cdb979eebb66549c242d5362adaaecdc (diff)
downloadupstream-757478133743d2d573ee2d5eb78be37aa544e11e.tar.gz
upstream-757478133743d2d573ee2d5eb78be37aa544e11e.tar.bz2
upstream-757478133743d2d573ee2d5eb78be37aa544e11e.zip
ath79: merge glinet gl-x750 dtsi and dts
The board doesn't come in different flash type flavours, hence there is no need to keep a dtsi + dts for this purpose. While at it, fix some whitespace issues. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ath79/dts/qca9533_glinet_gl-x750.dts103
-rw-r--r--target/linux/ath79/dts/qca9533_glinet_x750.dtsi95
2 files changed, 97 insertions, 101 deletions
diff --git a/target/linux/ath79/dts/qca9533_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9533_glinet_gl-x750.dts
index 7313f96d51..14bad8aab6 100644
--- a/target/linux/ath79/dts/qca9533_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9533_glinet_gl-x750.dts
@@ -4,7 +4,83 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
-#include "qca9533_glinet_x750.dtsi"
+#include "qca9533.dtsi"
+
+/ {
+ compatible = "glinet,gl-x750", "qca,qca9533";
+ model = "GL.iNet GL-X750";
+
+ keys {
+ compatible = "gpio-keys-polled";
+
+ poll-interval = <20>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&jtag_disable_pins>;
+
+ button0 {
+ label = "reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ power {
+ label = "gl-x750:green:power";
+ gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+ default-state = "on";
+ };
+
+ wlan2g {
+ label = "gl-x750:green:wlan2g";
+ gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "phy1tpt";
+ };
+
+ wlan5g {
+ label = "gl-x750:green:wlan5g";
+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "phy0tpt";
+ };
+
+ wan {
+ label = "gl-x750:green:wan";
+ gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+
+ 4g {
+ label = "gl-x750:green:4g";
+ gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+ default-state = "off";
+ };
+ };
+};
+
+&pcie0 {
+ status = "okay";
+};
+
+&uart {
+ status = "okay";
+};
+
+&usb0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+
+ hub_port: port@1 {
+ reg = <1>;
+ #trigger-source-cells = <0>;
+ };
+};
+
+&usb_phy {
+ status = "okay";
+};
&spi {
status = "okay";
@@ -31,16 +107,31 @@
reg = <0x040000 0x010000>;
};
- art: partition@50000 {
- label = "art";
- reg = <0x050000 0x010000>;
- };
+ art: partition@50000 {
+ label = "art";
+ reg = <0x050000 0x010000>;
+ };
partition@60000 {
label = "firmware";
reg = <0x060000 0xfa0000>;
};
-
};
};
};
+
+&eth0 {
+ status = "okay";
+ mtd-mac-address = <&art 0x0>;
+ phy-handle = <&swphy4>;
+};
+
+&eth1 {
+ mtd-mac-address = <&art 0x6>;
+};
+
+&wmac {
+ status = "okay";
+ mtd-cal-data = <&art 0x1000>;
+ mtd-mac-address = <&art 0x1002>;
+};
diff --git a/target/linux/ath79/dts/qca9533_glinet_x750.dtsi b/target/linux/ath79/dts/qca9533_glinet_x750.dtsi
deleted file mode 100644
index e1f95d5f04..0000000000
--- a/target/linux/ath79/dts/qca9533_glinet_x750.dtsi
+++ /dev/null
@@ -1,95 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include "qca9533.dtsi"
-
-/ {
- compatible = "glinet,gl-x750", "qca,qca9533";
- model = "GL.iNet GL-X750";
-
- keys {
- compatible = "gpio-keys-polled";
- poll-interval = <20>;
- pinctrl-names = "default";
- pinctrl-0 = <&jtag_disable_pins>;
-
- button0 {
- label = "reset";
- linux,code = <KEY_RESTART>;
- gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
- };
-
- };
-
- leds {
- compatible = "gpio-leds";
-
- power {
- label = "gl-x750:green:power";
- gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
- default-state = "on";
- };
-
- wlan2g {
- label = "gl-x750:green:wlan2g";
- gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy1tpt";
- };
-
- wlan5g {
- label = "gl-x750:green:wlan5g";
- gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy0tpt";
- };
-
- wan {
- label = "gl-x750:green:wan";
- gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
- default-state = "off";
- };
- 4g {
- label = "gl-x750:green:4g";
- gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
- default-state = "off";
- };
- };
-};
-
-&pcie0 {
- status = "okay";
-};
-
-&uart {
- status = "okay";
-};
-
-&usb0 {
- #address-cells = <1>;
- #size-cells = <0>;
- status = "okay";
-
- hub_port: port@1 {
- reg = <1>;
- #trigger-source-cells = <0>;
- };
-};
-
-&usb_phy {
- status = "okay";
-};
-
-&eth0 {
- status = "okay";
- mtd-mac-address = <&art 0x0>;
- phy-handle = <&swphy4>;
-};
-
-&eth1 {
- mtd-mac-address = <&art 0x6>;
-};
-
-&wmac {
- status = "okay";
- mtd-cal-data = <&art 0x1000>;
- mtd-mac-address = <&art 0x1002>;
-};