diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi b/target/linux/ath79/dts/ar7240_tplink.dtsi similarity index 71% rename from target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi rename to target/linux/ath79/dts/ar7240_tplink.dtsi index 147fcad66639eb5edb628fd0943ebb2f2799da70..de0b36bbf8ea6bd7a2955d8ff494d8daf612ea63 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr74xn-v1.dtsi +++ b/target/linux/ath79/dts/ar7240_tplink.dtsi @@ -32,10 +32,11 @@ }; }; - leds { + leds: leds { compatible = "gpio-leds"; + pinctrl-names = "default"; - pinctrl-0 = <&switch_led_pins>; + pinctrl-0 = <&pinmux_switch_led_pins>; led_system: system { label = "tp-link:green:system"; @@ -46,31 +47,6 @@ label = "tp-link:green:qss"; gpios = <&gpio 0 GPIO_ACTIVE_LOW>; }; - - lan1 { - label = "tp-link:green:lan1"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - }; - - lan2 { - label = "tp-link:green:lan2"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - }; - - lan3 { - label = "tp-link:green:lan3"; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - }; - - lan4 { - label = "tp-link:green:lan4"; - gpios = <&gpio 16 GPIO_ACTIVE_LOW>; - }; - - wan { - label = "tp-link:green:wan"; - gpios = <&gpio 17 GPIO_ACTIVE_LOW>; - }; }; ath9k-leds { @@ -105,7 +81,7 @@ read-only; }; - firmware: partition@20000 { + partition@20000 { compatible = "tplink,firmware"; reg = <0x20000 0x3d0000>; label = "firmware"; @@ -120,25 +96,14 @@ }; }; -ð0 { - status = "okay"; - - mtd-mac-address = <&uboot 0x1fc00>; - mtd-mac-address-increment = <(-1)>; -}; - ð1 { status = "okay"; - - mtd-mac-address = <&uboot 0x1fc00>; - mtd-mac-address-increment = <1>; }; &pcie { status = "okay"; ath9k: wifi@0,0 { - compatible = "pci168c,002b"; reg = <0x0000 0 0 0 0>; qca,no-eeprom; mtd-mac-address = <&uboot 0x1fc00>; @@ -148,7 +113,7 @@ }; &pinmux { - switch_led_pins: pinmux_switch_led_pins { + pinmux_switch_led_pins: switch_led_pins { pinctrl-single,bits = <0x0 0x0 0xf8>; }; }; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi new file mode 100644 index 0000000000000000000000000000000000000000..7621b1d53cecbd7c7359a97aac4793d6549d8055 --- /dev/null +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "ar7240_tplink.dtsi" + +&leds { + lan1 { + label = "tp-link:green:lan1"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + lan2 { + label = "tp-link:green:lan2"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + lan3 { + label = "tp-link:green:lan3"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + + lan4 { + label = "tp-link:green:lan4"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + + wan { + label = "tp-link:green:wan"; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; +}; + +ð0 { + status = "okay"; + + mtd-mac-address = <&uboot 0x1fc00>; + mtd-mac-address-increment = <(-1)>; +}; + +ð1 { + mtd-mac-address = <&uboot 0x1fc00>; + mtd-mac-address-increment = <1>; +}; + +&ath9k { + compatible = "pci168c,002b"; +}; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts index be18fdd052bba2b634159cf89a993a8e078cff72..c49272bcb97e65965c3823caa552e39e73feb722 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v1.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar7240_tplink_tl-wr74xn-v1.dtsi" +#include "ar7240_tplink_tl-wr.dtsi" / { model = "TP-Link TL-WR740N v1/v2"; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts index d0addda44a27ee8ee384f0bc37c1e04f4359b431..23867a252137691f92fe1c84ab6918c63422d343 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr740n-v3.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar7240_tplink_tl-wr74xn-v1.dtsi" +#include "ar7240_tplink_tl-wr.dtsi" / { model = "TP-Link TL-WR740N v3"; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts index af9c90755914f6fad6095b918c052a6758840299..38d7f2af600be708fafe5d396619d4b13c2ffcda 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr741-v1.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar7240_tplink_tl-wr74xn-v1.dtsi" +#include "ar7240_tplink_tl-wr.dtsi" / { model = "TP-Link TL-WR741N/ND v1/v2"; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts index 2c55dff97e3d258ebe9a2230c852ec736a7e9c4d..6cfaa9905c88bd85acd0bd9818cd52bbadfee576 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr743nd-v1.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar7240_tplink_tl-wr74xn-v1.dtsi" +#include "ar7240_tplink_tl-wr.dtsi" / { model = "TP-Link TL-WR743ND v1"; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts index e881821d6c60b82d47ef741ce477bec493053132..c030342d22679f0a606d0502679d4faea79448a9 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr841-v5.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar7240_tplink_tl-wr74xn-v1.dtsi" +#include "ar7240_tplink_tl-wr.dtsi" / { model = "TP-Link TL-WR841N/ND v5/v6"; diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts b/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts index 8d844d54f7bdd23b06549670349ba7d44bf520d2..c8fe835e7eb22d824ad9846fc7acf1db68d001de 100644 --- a/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts +++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr941-v4.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar7240_tplink_tl-wr74xn-v1.dtsi" +#include "ar7240_tplink_tl-wr.dtsi" / { model = "TP-Link TL-WR941N/ND v4";