From 8f0d8869d536f1a9c1dce25f37753900d253df3c Mon Sep 17 00:00:00 2001 From: Henrik Riomar Date: Tue, 31 May 2022 19:18:06 +0200 Subject: mediatek: new target mt7622-ubnt-unifi-6-lr-v1 Based on current mt7622-ubnt-unifi-6-lr, this is a preparation for adding a v2 version of this target * v1 - with led-bar * v2 - two simple GPIO connected LEDs (in later commits) Signed-off-by: Daniel Golle [added SUPPORTED_DEVICES for compatibility with existing setups] Signed-off-by: Henrik Riomar (cherry picked from commit 15a02471bb854245f8f94398c1e1d9ce29c2c341) --- .../dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts | 2 +- .../mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts | 100 +++++++++++++++++++++ .../mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dtsi | 27 ++++++ .../linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts | 100 --------------------- .../linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi | 25 ------ target/linux/mediatek/image/mt7622.mk | 8 +- 6 files changed, 133 insertions(+), 129 deletions(-) create mode 100644 target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts create mode 100644 target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dtsi delete mode 100644 target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts index e573d30912..8a9d0a1887 100644 --- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts +++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT -#include "mt7622-ubnt-unifi-6-lr.dtsi" +#include "mt7622-ubnt-unifi-6-lr-v1.dtsi" / { model = "Ubiquiti UniFi 6 LR (U-Boot mod)"; diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts new file mode 100644 index 0000000000..d0048d4715 --- /dev/null +++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts @@ -0,0 +1,100 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7622-ubnt-unifi-6-lr-v1.dtsi" + +/ { + model = "Ubiquiti UniFi 6 LR v1"; + compatible = "ubnt,unifi-6-lr", "mediatek,mt7622"; +}; + +&nor_partitions { + partition@0 { + label = "preloader"; + reg = <0x0 0x40000>; + }; + + partition@40000 { + label = "atf"; + reg = <0x40000 0x20000>; + }; + + partition@60000 { + label = "u-boot"; + reg = <0x60000 0x60000>; + }; + + partition@c0000 { + label = "u-boot-env"; + reg = <0xc0000 0x10000>; + }; + + factory: partition@d0000 { + label = "factory"; + reg = <0xd0000 0x40000>; + read-only; + }; + + eeprom: partition@110000 { + label = "eeprom"; + reg = <0x110000 0x10000>; + read-only; + }; + + partition@120000 { + label = "bs"; + reg = <0x120000 0x10000>; + }; + + partition@130000 { + label = "cfg"; + reg = <0x130000 0x100000>; + read-only; + }; + + partition@230000 { + compatible = "denx,fit"; + label = "firmware"; + reg = <0x230000 0x1ee0000>; + }; + + partition@2110000 { + label = "kernel1"; + reg = <0x2110000 0x1ee0000>; + }; +}; + +&wmac { + mediatek,mtd-eeprom = <&factory 0x0>; + nvmem-cells = <&macaddr_eeprom_0>; + nvmem-cell-names = "mac-address"; + status = "okay"; +}; + +&slot0 { + wifi@0,0 { + reg = <0x0 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x20000>; + nvmem-cells = <&macaddr_eeprom_6>; + nvmem-cell-names = "mac-address"; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; + +&gmac0 { + nvmem-cells = <&macaddr_eeprom_0>; + nvmem-cell-names = "mac-address"; +}; + +&eeprom { + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_eeprom_0: macaddr@0 { + reg = <0x0 0x6>; + }; + + macaddr_eeprom_6: macaddr@6 { + reg = <0x6 0x6>; + }; +}; diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dtsi b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dtsi new file mode 100644 index 0000000000..8f15d3f110 --- /dev/null +++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dtsi @@ -0,0 +1,27 @@ +#include "mt7622-ubnt-unifi-6-lr.dtsi" + +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + status = "okay"; + + led-controller@30 { + compatible = "ubnt,ledbar"; + reg = <0x30>; + + enable-gpio = <&pio 59 0>; + + red { + label = "red"; + }; + + green { + label = "green"; + }; + + led_blue: blue { + label = "blue"; + }; + }; +}; + diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts deleted file mode 100644 index 9b676b43c1..0000000000 --- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts +++ /dev/null @@ -1,100 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "mt7622-ubnt-unifi-6-lr.dtsi" - -/ { - model = "Ubiquiti UniFi 6 LR"; - compatible = "ubnt,unifi-6-lr", "mediatek,mt7622"; -}; - -&nor_partitions { - partition@0 { - label = "preloader"; - reg = <0x0 0x40000>; - }; - - partition@40000 { - label = "atf"; - reg = <0x40000 0x20000>; - }; - - partition@60000 { - label = "u-boot"; - reg = <0x60000 0x60000>; - }; - - partition@c0000 { - label = "u-boot-env"; - reg = <0xc0000 0x10000>; - }; - - factory: partition@d0000 { - label = "factory"; - reg = <0xd0000 0x40000>; - read-only; - }; - - eeprom: partition@110000 { - label = "eeprom"; - reg = <0x110000 0x10000>; - read-only; - }; - - partition@120000 { - label = "bs"; - reg = <0x120000 0x10000>; - }; - - partition@130000 { - label = "cfg"; - reg = <0x130000 0x100000>; - read-only; - }; - - partition@230000 { - compatible = "denx,fit"; - label = "firmware"; - reg = <0x230000 0x1ee0000>; - }; - - partition@2110000 { - label = "kernel1"; - reg = <0x2110000 0x1ee0000>; - }; -}; - -&wmac { - mediatek,mtd-eeprom = <&factory 0x0>; - nvmem-cells = <&macaddr_eeprom_0>; - nvmem-cell-names = "mac-address"; - status = "okay"; -}; - -&slot0 { - wifi@0,0 { - reg = <0x0 0 0 0 0>; - mediatek,mtd-eeprom = <&factory 0x20000>; - nvmem-cells = <&macaddr_eeprom_6>; - nvmem-cell-names = "mac-address"; - ieee80211-freq-limit = <5000000 6000000>; - }; -}; - -&gmac0 { - nvmem-cells = <&macaddr_eeprom_0>; - nvmem-cell-names = "mac-address"; -}; - -&eeprom { - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_eeprom_0: macaddr@0 { - reg = <0x0 0x6>; - }; - - macaddr_eeprom_6: macaddr@6 { - reg = <0x6 0x6>; - }; -}; diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi index f7881af624..4231cc1f79 100644 --- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi +++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi @@ -223,31 +223,6 @@ /* MT7915 Bluetooth */ }; -&i2c0 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins>; - status = "okay"; - - led-controller@30 { - compatible = "ubnt,ledbar"; - reg = <0x30>; - - enable-gpio = <&pio 59 0>; - - red { - label = "red"; - }; - - green { - label = "green"; - }; - - led_blue: blue { - label = "blue"; - }; - }; -}; - &watchdog { pinctrl-names = "default"; pinctrl-0 = <&watchdog_pins>; diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index 39bc7bc2ea..ea5ebdd410 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -222,15 +222,17 @@ define Device/totolink_a8000ru endef TARGET_DEVICES += totolink_a8000ru -define Device/ubnt_unifi-6-lr +define Device/ubnt_unifi-6-lr-v1 DEVICE_VENDOR := Ubiquiti DEVICE_MODEL := UniFi 6 LR + DEVICE_VARIANT := v1 DEVICE_DTS_CONFIG := config@1 - DEVICE_DTS := mt7622-ubnt-unifi-6-lr + DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v1 DEVICE_DTS_DIR := ../dts DEVICE_PACKAGES := kmod-mt7915e kmod-leds-ubnt-ledbar + SUPPORTED_DEVICES += ubnt,unifi-6-lr endef -TARGET_DEVICES += ubnt_unifi-6-lr +TARGET_DEVICES += ubnt_unifi-6-lr-v1 define Device/ubnt_unifi-6-lr-ubootmod DEVICE_VENDOR := Ubiquiti -- cgit v1.2.3