aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-08-12 15:12:02 +0200
committerChuanhong Guo <gch981213@gmail.com>2019-08-17 23:52:34 +0800
commit95dfeabf268a9eafed70c5dfa67a7a744921ac42 (patch)
tree913ac32a47fbffe89352987f5c14eb663c87540b
parente7ab1b517397fdf6613f4682b7a752649841f7cd (diff)
downloadupstream-95dfeabf268a9eafed70c5dfa67a7a744921ac42.tar.gz
upstream-95dfeabf268a9eafed70c5dfa67a7a744921ac42.tar.bz2
upstream-95dfeabf268a9eafed70c5dfa67a7a744921ac42.zip
ath79: create DTSI for ar9341 TP-Link devices
This patch creates a shared DTSI for the TP-Link devices based on ar9341 as those share a lot of definitions. While at it, change from gpio-keys-polled to gpio-keys, remove unused pll-data and remove some inherited stuff, too. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/ath79/dts/ar9341_tplink.dtsi114
-rw-r--r--target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts133
-rw-r--r--target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts126
-rw-r--r--target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts135
4 files changed, 152 insertions, 356 deletions
diff --git a/target/linux/ath79/dts/ar9341_tplink.dtsi b/target/linux/ath79/dts/ar9341_tplink.dtsi
new file mode 100644
index 0000000000..e472481936
--- /dev/null
+++ b/target/linux/ath79/dts/ar9341_tplink.dtsi
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "ar9341.dtsi"
+
+/ {
+ aliases {
+ serial0 = &uart;
+ led-boot = &system;
+ led-failsafe = &system;
+ led-running = &system;
+ led-upgrade = &system;
+ };
+
+ keys: keys {
+ compatible = "gpio-keys";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&jtag_disable_pins>;
+
+ rfkill {
+ label = "WiFi";
+ linux,code = <KEY_RFKILL>;
+ gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
+ debounce-interval = <60>;
+ };
+ };
+
+ leds: leds {
+ compatible = "gpio-leds";
+
+ system: power {
+ label = "tp-link:green:power";
+ gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+ default-state = "on";
+ };
+
+ wlan {
+ label = "tp-link:green:wlan";
+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "phy0tpt";
+ };
+
+ qss {
+ label = "tp-link:green:qss";
+ gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+ };
+
+ wan {
+ label = "tp-link:green:wan";
+ gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
+ };
+
+ lan1 {
+ label = "tp-link:green:lan1";
+ gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
+ };
+
+ lan2 {
+ label = "tp-link:green:lan2";
+ gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
+ };
+
+ lan3 {
+ label = "tp-link:green:lan3";
+ gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
+ };
+
+ lan4 {
+ label = "tp-link:green:lan4";
+ gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+ };
+ };
+};
+
+&ref {
+ clock-frequency = <25000000>;
+};
+
+&uart {
+ status = "okay";
+};
+
+&gpio {
+ status = "okay";
+};
+
+&eth0 {
+ status = "okay";
+
+ phy-handle = <&swphy0>;
+
+ mtd-mac-address = <&uboot 0x1fc00>;
+ mtd-mac-address-increment = <(-1)>;
+};
+
+&eth1 {
+ mtd-mac-address = <&uboot 0x1fc00>;
+
+ gmac-config {
+ device = <&gmac>;
+ switch-phy-swap = <1>;
+ };
+};
+
+&wmac {
+ status = "okay";
+
+ mtd-cal-data = <&art 0x1000>;
+ mtd-mac-address = <&uboot 0x1fc00>;
+};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
index 48d936b194..f864381520 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-mr3420-v2.dts
@@ -1,109 +1,32 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "ar9341.dtsi"
+#include "ar9341_tplink.dtsi"
/ {
model = "TP-Link TL-MR3420 v2";
compatible = "tplink,tl-mr3420-v2", "qca,ar9341";
-
- aliases {
- serial0 = &uart;
- led-boot = &system;
- led-failsafe = &system;
- led-running = &system;
- led-upgrade = &system;
- };
-
- keys {
- compatible = "gpio-keys";
-
- pinctrl-names = "default";
- pinctrl-0 = <&jtag_disable_pins>;
-
- reset {
- label = "Reset";
- linux,code = <KEY_RESTART>;
- gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
- debounce-interval = <60>;
- };
-
- rfkill {
- label = "WiFi";
- linux,code = <KEY_RFKILL>;
- gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
- debounce-interval = <60>;
- };
- };
-
- leds {
- compatible = "gpio-leds";
-
- system: power {
- label = "tp-link:green:power";
- gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
- default-state = "on";
- };
-
- wlan {
- label = "tp-link:green:wlan";
- gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy0tpt";
- };
-
- qss {
- label = "tp-link:green:qss";
- gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
- };
-
- wan {
- label = "tp-link:green:wan";
- gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
- };
-
- lan1 {
- label = "tp-link:green:lan1";
- gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
- };
-
- lan2 {
- label = "tp-link:green:lan2";
- gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
- };
-
- lan3 {
- label = "tp-link:green:lan3";
- gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
- };
-
- lan4 {
- label = "tp-link:green:lan4";
- gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
- };
-
- usb {
- label = "tp-link:green:usb";
- gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
- trigger-sources = <&hub_port>;
- linux,default-trigger = "usbport";
- };
- };
};
-&ref {
- clock-frequency = <25000000>;
+&keys {
+ reset {
+ label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+ debounce-interval = <60>;
+ };
};
-&uart {
- status = "okay";
+&leds {
+ usb {
+ label = "tp-link:green:usb";
+ gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&hub_port>;
+ linux,default-trigger = "usbport";
+ };
};
&gpio {
- status = "okay";
-
usb_power {
gpio-hog;
gpios = <4 GPIO_ACTIVE_HIGH>;
@@ -148,32 +71,6 @@
};
};
-&eth0 {
- status = "okay";
-
- phy-handle = <&swphy0>;
- mtd-mac-address = <&uboot 0x1fc00>;
- mtd-mac-address-increment = <(-1)>;
-};
-
-&eth1 {
- status = "okay";
-
- mtd-mac-address = <&uboot 0x1fc00>;
-
- gmac-config {
- device = <&gmac>;
- switch-phy-swap = <1>;
- };
-};
-
-&wmac {
- status = "okay";
-
- mtd-cal-data = <&art 0x1000>;
- mtd-mac-address = <&uboot 0x1fc00>;
-};
-
&usb {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
index ec89be5318..3577e4994f 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr841-v8.dts
@@ -1,102 +1,20 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "ar9341.dtsi"
+#include "ar9341_tplink.dtsi"
/ {
model = "TP-Link TL-WR841N/ND v8";
compatible = "tplink,tl-wr841-v8", "qca,ar9341";
-
- aliases {
- serial0 = &uart;
- led-boot = &system;
- led-failsafe = &system;
- led-running = &system;
- led-upgrade = &system;
- };
-
- keys {
- compatible = "gpio-keys-polled";
- poll-interval = <20>;
-
- pinctrl-names = "default";
- pinctrl-0 = <&jtag_disable_pins>;
-
- reset {
- label = "Reset";
- linux,code = <KEY_RESTART>;
- gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
- debounce-interval = <60>;
- };
-
- rfkill {
- label = "WiFi";
- linux,code = <KEY_RFKILL>;
- gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
- debounce-interval = <60>;
- };
- };
-
- leds {
- compatible = "gpio-leds";
-
- system: power {
- label = "tp-link:green:power";
- gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
- default-state = "on";
- };
-
- wlan {
- label = "tp-link:green:wlan";
- gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy0tpt";
- };
-
- qss {
- label = "tp-link:green:qss";
- gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
- };
-
- wan {
- label = "tp-link:green:wan";
- gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
- };
-
- lan1 {
- label = "tp-link:green:lan1";
- gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
- };
-
- lan2 {
- label = "tp-link:green:lan2";
- gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
- };
-
- lan3 {
- label = "tp-link:green:lan3";
- gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
- };
-
- lan4 {
- label = "tp-link:green:lan4";
- gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
- };
- };
};
-&ref {
- clock-frequency = <25000000>;
-};
-
-&uart {
- status = "okay";
-};
-
-&gpio {
- status = "okay";
+&keys {
+ reset {
+ label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+ debounce-interval = <60>;
+ };
};
&spi {
@@ -134,31 +52,3 @@
};
};
};
-
-&eth0 {
- status = "okay";
-
- phy-handle = <&swphy0>;
- mtd-mac-address = <&uboot 0x1fc00>;
- mtd-mac-address-increment = <(-1)>;
-};
-
-&eth1 {
- status = "okay";
-
- mtd-mac-address = <&uboot 0x1fc00>;
-
- pll-data = <0x06000000 0x00000101 0x00001616>;
-
- gmac-config {
- device = <&gmac>;
- switch-phy-swap = <1>;
- };
-};
-
-&wmac {
- status = "okay";
-
- mtd-cal-data = <&art 0x1000>;
- mtd-mac-address = <&uboot 0x1fc00>;
-};
diff --git a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
index c7a251cbf1..86a316b518 100644
--- a/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
+++ b/target/linux/ath79/dts/ar9341_tplink_tl-wr842n-v2.dts
@@ -1,98 +1,12 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "ar9341.dtsi"
+#include "ar9341_tplink.dtsi"
/ {
model = "TP-Link TL-WR842N/ND v2";
compatible = "tplink,tl-wr842n-v2", "qca,ar9341";
- aliases {
- serial0 = &uart;
- led-boot = &system;
- led-failsafe = &system;
- led-running = &system;
- led-upgrade = &system;
- };
-
- keys {
- compatible = "gpio-keys-polled";
- poll-interval = <20>;
-
- pinctrl-names = "default";
- pinctrl-0 = <&jtag_disable_pins>;
-
- reset {
- label = "Reset";
- linux,code = <KEY_RESTART>;
- gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
- debounce-interval = <60>;
- };
-
- rfkill {
- label = "WiFi";
- linux,code = <KEY_RFKILL>;
- gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
- debounce-interval = <60>;
- };
- };
-
- leds {
- compatible = "gpio-leds";
-
- system: power {
- label = "tp-link:green:power";
- gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
- default-state = "on";
- };
-
- wlan {
- label = "tp-link:green:wlan";
- gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
- linux,default-trigger = "phy0tpt";
- };
-
- qss {
- label = "tp-link:green:qss";
- gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
- };
-
- wan {
- label = "tp-link:green:wan";
- gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
- };
-
- lan1 {
- label = "tp-link:green:lan1";
- gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
- };
-
- lan2 {
- label = "tp-link:green:lan2";
- gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
- };
-
- lan3 {
- label = "tp-link:green:lan3";
- gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
- };
-
- lan4 {
- label = "tp-link:green:lan4";
- gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
- };
-
- usb {
- label = "tp-link:green:usb";
- gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
- trigger-sources = <&hub_port>;
- linux,default-trigger = "usbport";
- };
- };
-
gpio-export {
compatible = "gpio-export";
@@ -104,16 +18,22 @@
};
};
-&ref {
- clock-frequency = <25000000>;
-};
-
-&uart {
- status = "okay";
+&keys {
+ reset {
+ label = "Reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+ debounce-interval = <60>;
+ };
};
-&gpio {
- status = "okay";
+&leds {
+ usb {
+ label = "tp-link:green:usb";
+ gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&hub_port>;
+ linux,default-trigger = "usbport";
+ };
};
&spi {
@@ -167,31 +87,6 @@
status = "okay";
};
-&eth0 {
- status = "okay";
-
- phy-handle = <&swphy0>;
- mtd-mac-address = <&uboot 0x1fc00>;
- mtd-mac-address-increment = <(-1)>;
-};
-
&eth1 {
- status = "okay";
-
phy-handle = <&swphy4>;
- mtd-mac-address = <&uboot 0x1fc00>;
- phy-mode = "gmii";
- pll-data = <0x06000000 0x00000101 0x00001616>;
-
- gmac-config {
- device = <&gmac>;
- switch-phy-swap = <1>;
- };
-};
-
-&wmac {
- status = "okay";
-
- mtd-cal-data = <&art 0x1000>;
- mtd-mac-address = <&uboot 0x1fc00>;
};