From: Adrian Schmutzler Date: Fri, 22 Nov 2019 10:50:00 +0000 (+0100) Subject: ath79: improve TP-Link CPE DTSI names for ar9344 SOC X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=226bc91109c814b3577b1b126f4ab420c868d5a8;p=openwrt%2Fstaging%2Flinusw.git ath79: improve TP-Link CPE DTSI names for ar9344 SOC The initial DTSI names for the TP-Link CPE devices have become quite confusing, as several non-V1 devices now use the *-v1.dtsi, the *cpe510-v1.dts does not use the cpe510.dtsi, etc. This introduces a new naming scheme based on whether devices have one or two ports, which should be easier to grasp. Signed-off-by: Adrian Schmutzler --- diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi new file mode 100644 index 0000000000..d002dfeb3c --- /dev/null +++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi @@ -0,0 +1,113 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include +#include + +#include "ar9344.dtsi" + +/ { + aliases { + label-mac-device = &wmac; + }; + + keys { + compatible = "gpio-keys"; + + reset { + linux,code = ; + gpios = <&gpio 4 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; +}; + +&ref { + clock-frequency = <40000000>; +}; + +&uart { + status = "okay"; +}; + +&spi { + status = "okay"; + + num-cs = <1>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <25000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + label = "u-boot"; + reg = <0x000000 0x020000>; + read-only; + }; + + partition@20000 { + label = "partition-table"; + reg = <0x020000 0x010000>; + read-only; + }; + + info: partition@30000 { + label = "info"; + reg = <0x030000 0x010000>; + read-only; + }; + + partition@40000 { + label = "firmware"; + reg = <0x040000 0x780000>; + + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "kernel"; + reg = <0x000000 0x200000>; + }; + + partition@200000 { + label = "rootfs"; + reg = <0x200000 0x580000>; + }; + }; + + partition@7c0000 { + label = "config"; + reg = <0x7c0000 0x030000>; + read-only; + }; + + art: partition@7f0000 { + label = "art"; + reg = <0x7f0000 0x010000>; + read-only; + }; + }; + }; +}; + +&wmac { + status = "okay"; + + mtd-cal-data = <&art 0x1000>; + mtd-mac-address = <&info 0x08>; +}; + +ð0 { + status = "okay"; + + phy-handle = <&swphy4>; + + mtd-mac-address = <&info 0x8>; +}; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe210-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe210-v1.dts index e82fd4a32f..95604f07c1 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe210-v1.dts +++ b/target/linux/ath79/dts/ar9344_tplink_cpe210-v1.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9344_tplink_cpexxx-v1.dtsi" +#include "ar9344_tplink_cpe_2port.dtsi" / { compatible = "tplink,cpe210-v1", "qca,ar9344"; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe220-v2.dts b/target/linux/ath79/dts/ar9344_tplink_cpe220-v2.dts index 7e8822710f..4a737378b0 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe220-v2.dts +++ b/target/linux/ath79/dts/ar9344_tplink_cpe220-v2.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9344_tplink_cpexxx-v1.dtsi" +#include "ar9344_tplink_cpe_2port.dtsi" / { compatible = "tplink,cpe220-v2", "qca,ar9344"; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe510-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe510-v1.dts index 34b83c944e..483fdf4e6c 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe510-v1.dts +++ b/target/linux/ath79/dts/ar9344_tplink_cpe510-v1.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9344_tplink_cpexxx-v1.dtsi" +#include "ar9344_tplink_cpe_2port.dtsi" / { compatible = "tplink,cpe510-v1", "qca,ar9344"; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe510-v2.dts b/target/linux/ath79/dts/ar9344_tplink_cpe510-v2.dts index 758d0c02f0..7348bf7553 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe510-v2.dts +++ b/target/linux/ath79/dts/ar9344_tplink_cpe510-v2.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9344_tplink_cpe510.dtsi" +#include "ar9344_tplink_cpe_1port.dtsi" / { compatible = "tplink,cpe510-v2", "qca,ar9344"; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe510-v3.dts b/target/linux/ath79/dts/ar9344_tplink_cpe510-v3.dts index 0909fcfa73..20a16c3d3e 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe510-v3.dts +++ b/target/linux/ath79/dts/ar9344_tplink_cpe510-v3.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9344_tplink_cpe510.dtsi" +#include "ar9344_tplink_cpe_1port.dtsi" / { compatible = "tplink,cpe510-v3", "qca,ar9344"; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi deleted file mode 100644 index 41a9443740..0000000000 --- a/target/linux/ath79/dts/ar9344_tplink_cpe510.dtsi +++ /dev/null @@ -1,48 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; - -#include "ar9344_tplink_cpexxx.dtsi" - -/ { - aliases { - led-boot = &led_system; - led-failsafe = &led_system; - led-running = &led_system; - led-upgrade = &led_system; - }; - - leds { - compatible = "gpio-leds"; - - lan { - label = "tp-link:green:lan"; - gpios = <&gpio 11 GPIO_ACTIVE_LOW>; - }; - - link1 { - label = "tp-link:green:link1"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - }; - - link2 { - label = "tp-link:green:link2"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - }; - - link3 { - label = "tp-link:green:link3"; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - }; - - led_system: link4 { - label = "tp-link:green:link4"; - gpios = <&gpio 16 GPIO_ACTIVE_LOW>; - }; - }; -}; - -ð1 { - status = "okay"; - - compatible = "syscon", "simple-mfd"; -}; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts index cb614a9dfb..54ea399b74 100644 --- a/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts +++ b/target/linux/ath79/dts/ar9344_tplink_cpe610-v1.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9344_tplink_cpexxx.dtsi" +#include "ar9344_tplink_cpe.dtsi" / { model = "TP-Link CPE610 v1"; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi new file mode 100644 index 0000000000..653efdee17 --- /dev/null +++ b/target/linux/ath79/dts/ar9344_tplink_cpe_1port.dtsi @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar9344_tplink_cpe.dtsi" + +/ { + aliases { + led-boot = &led_system; + led-failsafe = &led_system; + led-running = &led_system; + led-upgrade = &led_system; + }; + + leds { + compatible = "gpio-leds"; + + lan { + label = "tp-link:green:lan"; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + }; + + link1 { + label = "tp-link:green:link1"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + link2 { + label = "tp-link:green:link2"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + link3 { + label = "tp-link:green:link3"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + + led_system: link4 { + label = "tp-link:green:link4"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + }; +}; + +ð1 { + status = "okay"; + + compatible = "syscon", "simple-mfd"; +}; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi new file mode 100644 index 0000000000..e97e49d718 --- /dev/null +++ b/target/linux/ath79/dts/ar9344_tplink_cpe_2port.dtsi @@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar9344_tplink_cpe.dtsi" + +/ { + aliases { + led-boot = &led_link4; + led-failsafe = &led_link4; + led-running = &led_link4; + led-upgrade = &led_link4; + }; + + leds { + compatible = "gpio-leds"; + + lan0 { + label = "tp-link:green:lan0"; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + }; + + lan1 { + label = "tp-link:green:lan1"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + }; + + link1 { + label = "tp-link:green:link1"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + }; + + link2 { + label = "tp-link:green:link2"; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + link3 { + label = "tp-link:green:link3"; + gpios = <&gpio 15 GPIO_ACTIVE_LOW>; + }; + + led_link4: link4 { + label = "tp-link:green:link4"; + }; + }; +}; + +&gpio { + gpio_ext_lna0 { + gpio-hog; + gpios = <18 0>; + output-high; + line-name = "tp-link:ext:lna0"; + }; + + gpio_ext_lna1 { + gpio-hog; + gpios = <19 0>; + output-high; + line-name = "tp-link:ext:lna1"; + }; +}; + +ð1 { + status = "okay"; + + mtd-mac-address = <&info 0x8>; + + gmac-config { + device = <&gmac>; + switch-phy-swap = <0>; + switch-only-mode = <1>; + }; +}; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi deleted file mode 100644 index 440ba8a8b3..0000000000 --- a/target/linux/ath79/dts/ar9344_tplink_cpexxx-v1.dtsi +++ /dev/null @@ -1,74 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; - -#include "ar9344_tplink_cpexxx.dtsi" - -/ { - aliases { - led-boot = &led_link4; - led-failsafe = &led_link4; - led-running = &led_link4; - led-upgrade = &led_link4; - }; - - leds { - compatible = "gpio-leds"; - - lan0 { - label = "tp-link:green:lan0"; - gpios = <&gpio 11 GPIO_ACTIVE_LOW>; - }; - - lan1 { - label = "tp-link:green:lan1"; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - }; - - link1 { - label = "tp-link:green:link1"; - gpios = <&gpio 13 GPIO_ACTIVE_LOW>; - }; - - link2 { - label = "tp-link:green:link2"; - gpios = <&gpio 14 GPIO_ACTIVE_LOW>; - }; - - link3 { - label = "tp-link:green:link3"; - gpios = <&gpio 15 GPIO_ACTIVE_LOW>; - }; - - led_link4: link4 { - label = "tp-link:green:link4"; - }; - }; -}; - -&gpio { - gpio_ext_lna0 { - gpio-hog; - gpios = <18 0>; - output-high; - line-name = "tp-link:ext:lna0"; - }; - - gpio_ext_lna1 { - gpio-hog; - gpios = <19 0>; - output-high; - line-name = "tp-link:ext:lna1"; - }; -}; - -ð1 { - status = "okay"; - - mtd-mac-address = <&info 0x8>; - - gmac-config { - device = <&gmac>; - switch-phy-swap = <0>; - switch-only-mode = <1>; - }; -}; diff --git a/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi deleted file mode 100644 index d002dfeb3c..0000000000 --- a/target/linux/ath79/dts/ar9344_tplink_cpexxx.dtsi +++ /dev/null @@ -1,113 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -/dts-v1/; - -#include -#include - -#include "ar9344.dtsi" - -/ { - aliases { - label-mac-device = &wmac; - }; - - keys { - compatible = "gpio-keys"; - - reset { - linux,code = ; - gpios = <&gpio 4 GPIO_ACTIVE_LOW>; - debounce-interval = <60>; - }; - }; -}; - -&ref { - clock-frequency = <40000000>; -}; - -&uart { - status = "okay"; -}; - -&spi { - status = "okay"; - - num-cs = <1>; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <25000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - uboot: partition@0 { - label = "u-boot"; - reg = <0x000000 0x020000>; - read-only; - }; - - partition@20000 { - label = "partition-table"; - reg = <0x020000 0x010000>; - read-only; - }; - - info: partition@30000 { - label = "info"; - reg = <0x030000 0x010000>; - read-only; - }; - - partition@40000 { - label = "firmware"; - reg = <0x040000 0x780000>; - - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "kernel"; - reg = <0x000000 0x200000>; - }; - - partition@200000 { - label = "rootfs"; - reg = <0x200000 0x580000>; - }; - }; - - partition@7c0000 { - label = "config"; - reg = <0x7c0000 0x030000>; - read-only; - }; - - art: partition@7f0000 { - label = "art"; - reg = <0x7f0000 0x010000>; - read-only; - }; - }; - }; -}; - -&wmac { - status = "okay"; - - mtd-cal-data = <&art 0x1000>; - mtd-mac-address = <&info 0x08>; -}; - -ð0 { - status = "okay"; - - phy-handle = <&swphy4>; - - mtd-mac-address = <&info 0x8>; -}; diff --git a/target/linux/ath79/dts/ar9344_tplink_wbs210-v2.dts b/target/linux/ath79/dts/ar9344_tplink_wbs210-v2.dts index dddf4aebda..8c5535754a 100644 --- a/target/linux/ath79/dts/ar9344_tplink_wbs210-v2.dts +++ b/target/linux/ath79/dts/ar9344_tplink_wbs210-v2.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9344_tplink_cpexxx-v1.dtsi" +#include "ar9344_tplink_cpe_2port.dtsi" / { compatible = "tplink,wbs210-v2", "qca,ar9344"; diff --git a/target/linux/ath79/dts/ar9344_tplink_wbs510-v1.dts b/target/linux/ath79/dts/ar9344_tplink_wbs510-v1.dts index ba6fab2c1a..28ea727b3d 100644 --- a/target/linux/ath79/dts/ar9344_tplink_wbs510-v1.dts +++ b/target/linux/ath79/dts/ar9344_tplink_wbs510-v1.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9344_tplink_cpexxx-v1.dtsi" +#include "ar9344_tplink_cpe_2port.dtsi" / { compatible = "tplink,wbs510-v1", "qca,ar9344"; diff --git a/target/linux/ath79/dts/ar9344_tplink_wbs510-v2.dts b/target/linux/ath79/dts/ar9344_tplink_wbs510-v2.dts index 5c55d78904..8ce47a5134 100644 --- a/target/linux/ath79/dts/ar9344_tplink_wbs510-v2.dts +++ b/target/linux/ath79/dts/ar9344_tplink_wbs510-v2.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar9344_tplink_cpexxx-v1.dtsi" +#include "ar9344_tplink_cpe_2port.dtsi" / { compatible = "tplink,wbs510-v2", "qca,ar9344";