From f63adc369bd1bb50a5600ab8f0465f5f0e395348 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 25 Oct 2020 12:58:30 +0100 Subject: [PATCH] ath79: create DTSI files for ubnt WA 1-/2-port devices The ar9342 Ubiquiti WA devices appear to only have two different network setups, based on the number of ethernet ports. Create DTSI files for them to consolidate duplicate definitions. Signed-off-by: Nick Hainke [rephrase commit message/title] Signed-off-by: Adrian Schmutzler Signed-off-by: maurerr --- .../linux/ath79/dts/ar9342_ubnt_lap-120.dts | 29 +------------- .../dts/ar9342_ubnt_litebeam-ac-gen2.dts | 29 +------------- .../ath79/dts/ar9342_ubnt_nanobeam-ac.dts | 29 +------------- .../dts/ar9342_ubnt_nanostation-ac-loco.dts | 29 +------------- .../ath79/dts/ar9342_ubnt_nanostation-ac.dts | 37 +----------------- .../dts/ar9342_ubnt_powerbeam-5ac-gen2.dts | 29 +------------- .../linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi | 31 +++++++++++++++ .../linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi | 39 +++++++++++++++++++ 8 files changed, 76 insertions(+), 176 deletions(-) create mode 100644 target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi create mode 100644 target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi diff --git a/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts b/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts index 4055bbd5235..db639fcd7cd 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_lap-120.dts @@ -1,39 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-only -#include "ar9342_ubnt_wa.dtsi" +#include "ar9342_ubnt_wa_1port.dtsi" / { compatible = "ubnt,lap-120", "ubnt,wa", "qca,ar9342"; model = "Ubiquiti LiteAP ac (LAP-120)"; }; -&mdio0 { - status = "okay"; - - phy-mask = <4>; - phy4: ethernet-phy@4 { - reg = <4>; - }; -}; - -ð0 { - status = "okay"; - - /* default for ar934x, except for 1000M and 10M */ - pll-data = <0x02000000 0x00000101 0x00001313>; - - mtd-mac-address = <&art 0x0>; - - phy-mode = "rgmii-id"; - phy-handle = <&phy4>; - - gmac-config { - device = <&gmac>; - rxd-delay = <3>; - rxdv-delay = <3>; - }; -}; - &wmac { status = "disabled"; }; diff --git a/target/linux/ath79/dts/ar9342_ubnt_litebeam-ac-gen2.dts b/target/linux/ath79/dts/ar9342_ubnt_litebeam-ac-gen2.dts index 1affbb2994c..d031aa8786a 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_litebeam-ac-gen2.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_litebeam-ac-gen2.dts @@ -1,39 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-only -#include "ar9342_ubnt_wa.dtsi" +#include "ar9342_ubnt_wa_1port.dtsi" / { compatible = "ubnt,litebeam-ac-gen2", "ubnt,wa", "qca,ar9342"; model = "Ubiquiti LiteBeam AC Gen2"; }; -&mdio0 { - status = "okay"; - - phy-mask = <4>; - phy4: ethernet-phy@4 { - reg = <4>; - }; -}; - -ð0 { - status = "okay"; - - /* default for ar934x, except for 1000M and 10M */ - pll-data = <0x02000000 0x00000101 0x00001313>; - - mtd-mac-address = <&art 0x0>; - - phy-mode = "rgmii-id"; - phy-handle = <&phy4>; - - gmac-config { - device = <&gmac>; - rxd-delay = <3>; - rxdv-delay = <3>; - }; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts index 3dd1ba4532f..dc2537a77e3 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -#include "ar9342_ubnt_wa.dtsi" +#include "ar9342_ubnt_wa_1port.dtsi" / { compatible = "ubnt,nanobeam-ac", "ubnt,wa", "qca,ar9342"; @@ -36,30 +36,3 @@ }; }; }; - -&mdio0 { - status = "okay"; - - phy-mask = <4>; - phy4: ethernet-phy@4 { - reg = <4>; - }; -}; - -ð0 { - status = "okay"; - - /* default for ar934x, except for 1000M and 10M */ - pll-data = <0x02000000 0x00000101 0x00001313>; - - mtd-mac-address = <&art 0x0>; - - phy-mode = "rgmii-id"; - phy-handle = <&phy4>; - - gmac-config { - device = <&gmac>; - rxd-delay = <3>; - rxdv-delay = <3>; - }; -}; diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts index 7f689e0fe33..96d37752332 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts @@ -1,39 +1,12 @@ // SPDX-License-Identifier: GPL-2.0-only -#include "ar9342_ubnt_wa.dtsi" +#include "ar9342_ubnt_wa_1port.dtsi" / { compatible = "ubnt,nanostation-ac-loco", "ubnt,wa", "qca,ar9342"; model = "Ubiquiti Nanostation AC loco (WA)"; }; -&mdio0 { - status = "okay"; - - phy-mask = <4>; - phy4: ethernet-phy@4 { - reg = <4>; - }; -}; - -ð0 { - status = "okay"; - - /* default for ar934x, except for 1000M and 10M */ - pll-data = <0x02000000 0x00000101 0x00001313>; - - mtd-mac-address = <&art 0x0>; - - phy-mode = "rgmii-id"; - phy-handle = <&phy4>; - - gmac-config { - device = <&gmac>; - rxd-delay = <3>; - rxdv-delay = <3>; - }; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts index 6114650ac54..2d903513312 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -#include "ar9342_ubnt_wa.dtsi" +#include "ar9342_ubnt_wa_2port.dtsi" / { compatible = "ubnt,nanostation-ac","ubnt,wa", "qca,ar9342"; @@ -37,41 +37,6 @@ }; }; -&mdio0 { - status = "okay"; - - phy-mask = <4>; - phy0: ethernet-phy@0 { - phy-mode = "rgmii"; - reg = <0>; - - qca,ar8327-initvals = < - 0x04 0x07600000 /* PORT0 PAD MODE CTRL */ - 0x58 0xffb7ffb7 /* LED_CTRL2 */ - 0x5c 0x03ffff00 /* LED_CTRL3 */ - 0x7c 0x0000007e /* PORT0_STATUS */ - >; - }; -}; - -ð0 { - status = "okay"; - - /* default for ar934x, except for 1000M and 10M */ - pll-data = <0x06000000 0x00000101 0x00001313>; - - mtd-mac-address = <&art 0x0>; - - phy-mode = "rgmii"; - phy-handle = <&phy0>; - - gmac-config { - device = <&gmac>; - rxd-delay = <2>; - rxdv-delay = <2>; - }; -}; - &wmac { status = "okay"; diff --git a/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts b/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts index 7e4b9cd415d..446c9908462 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts +++ b/target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -#include "ar9342_ubnt_wa.dtsi" +#include "ar9342_ubnt_wa_1port.dtsi" / { compatible = "ubnt,powerbeam-5ac-gen2", "ubnt,wa", "qca,ar9342"; @@ -36,30 +36,3 @@ }; }; }; - -&mdio0 { - status = "okay"; - - phy-mask = <4>; - phy4: ethernet-phy@4 { - reg = <4>; - }; -}; - -ð0 { - status = "okay"; - - /* default for ar934x, except for 1000M and 10M */ - pll-data = <0x02000000 0x00000101 0x00001313>; - - mtd-mac-address = <&art 0x0>; - - phy-mode = "rgmii-id"; - phy-handle = <&phy4>; - - gmac-config { - device = <&gmac>; - rxd-delay = <3>; - rxdv-delay = <3>; - }; -}; diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi new file mode 100644 index 00000000000..918b69c1dad --- /dev/null +++ b/target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "ar9342_ubnt_wa.dtsi" + +&mdio0 { + status = "okay"; + + phy-mask = <4>; + + phy4: ethernet-phy@4 { + reg = <4>; + }; +}; + +ð0 { + status = "okay"; + + /* default for ar934x, except for 1000M and 10M */ + pll-data = <0x02000000 0x00000101 0x00001313>; + + mtd-mac-address = <&art 0x0>; + + phy-mode = "rgmii-id"; + phy-handle = <&phy4>; + + gmac-config { + device = <&gmac>; + rxd-delay = <3>; + rxdv-delay = <3>; + }; +}; diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi new file mode 100644 index 00000000000..f2e936bcc40 --- /dev/null +++ b/target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include "ar9342_ubnt_wa.dtsi" + +&mdio0 { + status = "okay"; + + phy-mask = <4>; + + phy0: ethernet-phy@0 { + phy-mode = "rgmii"; + reg = <0>; + + qca,ar8327-initvals = < + 0x04 0x07600000 /* PORT0 PAD MODE CTRL */ + 0x58 0xffb7ffb7 /* LED_CTRL2 */ + 0x5c 0x03ffff00 /* LED_CTRL3 */ + 0x7c 0x0000007e /* PORT0_STATUS */ + >; + }; +}; + +ð0 { + status = "okay"; + + /* default for ar934x, except for 1000M and 10M */ + pll-data = <0x06000000 0x00000101 0x00001313>; + + mtd-mac-address = <&art 0x0>; + + phy-mode = "rgmii"; + phy-handle = <&phy0>; + + gmac-config { + device = <&gmac>; + rxd-delay = <2>; + rxdv-delay = <2>; + }; +};