From d815e1f67c9f5cf8f36212ea475c9c9020f60a6d Mon Sep 17 00:00:00 2001 From: Henrik Riomar Date: Tue, 31 May 2022 19:49:49 +0200 Subject: mediatek: new target ubnt_unifi-6-lr-v1-ubootmod based on current ubnt_unifi-6-lr-ubootmod Signed-off-by: Daniel Golle [added SUPPORTED_DEVICES for compatibility with existing setups] Signed-off-by: Henrik Riomar (cherry picked from commit 5c8d3893a78fd81454930de30d90efaef99f8734) --- .../dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts | 84 ---------------------- .../dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts | 84 ++++++++++++++++++++++ target/linux/mediatek/image/mt7622.mk | 9 +-- 3 files changed, 89 insertions(+), 88 deletions(-) delete mode 100644 target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts create mode 100644 target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts (limited to 'target/linux/mediatek') 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 deleted file mode 100644 index 8a9d0a1887..0000000000 --- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts +++ /dev/null @@ -1,84 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "mt7622-ubnt-unifi-6-lr-v1.dtsi" - -/ { - model = "Ubiquiti UniFi 6 LR (U-Boot mod)"; - compatible = "ubnt,unifi-6-lr-ubootmod", "mediatek,mt7622"; -}; - -&nor_partitions { - partition@0 { - label = "bl2"; - reg = <0x0 0x20000>; - }; - - partition@20000 { - label = "fip"; - reg = <0x20000 0xa0000>; - }; - - 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 = "recovery"; - reg = <0x120000 0xee0000>; - }; - - partition@1000000 { - compatible = "denx,fit"; - label = "firmware"; - reg = <0x1000000 0x3000000>; - }; -}; - -&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-ubootmod.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts new file mode 100644 index 0000000000..a22bc70180 --- /dev/null +++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts @@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7622-ubnt-unifi-6-lr-v1.dtsi" + +/ { + model = "Ubiquiti UniFi 6 LR v1 (U-Boot mod)"; + compatible = "ubnt,unifi-6-lr-ubootmod", "mediatek,mt7622"; +}; + +&nor_partitions { + partition@0 { + label = "bl2"; + reg = <0x0 0x20000>; + }; + + partition@20000 { + label = "fip"; + reg = <0x20000 0xa0000>; + }; + + 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 = "recovery"; + reg = <0x120000 0xee0000>; + }; + + partition@1000000 { + compatible = "denx,fit"; + label = "firmware"; + reg = <0x1000000 0x3000000>; + }; +}; + +&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/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index ea5ebdd410..d6ffa4d3ad 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -234,11 +234,11 @@ define Device/ubnt_unifi-6-lr-v1 endef TARGET_DEVICES += ubnt_unifi-6-lr-v1 -define Device/ubnt_unifi-6-lr-ubootmod +define Device/ubnt_unifi-6-lr-v1-ubootmod DEVICE_VENDOR := Ubiquiti DEVICE_MODEL := UniFi 6 LR - DEVICE_VARIANT := U-Boot mod - DEVICE_DTS := mt7622-ubnt-unifi-6-lr-ubootmod + DEVICE_VARIANT := v1 U-Boot mod + DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v1-ubootmod DEVICE_DTS_DIR := ../dts DEVICE_PACKAGES := kmod-mt7915e kmod-leds-ubnt-ledbar KERNEL := kernel-bin | lzma @@ -249,8 +249,9 @@ define Device/ubnt_unifi-6-lr-ubootmod ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := bl2 nor-2ddr ARTIFACT/bl31-uboot.fip := bl31-uboot ubnt_unifi-6-lr + SUPPORTED_DEVICES += ubnt,unifi-6-lr-ubootmod endef -TARGET_DEVICES += ubnt_unifi-6-lr-ubootmod +TARGET_DEVICES += ubnt_unifi-6-lr-v1-ubootmod define Device/xiaomi_redmi-router-ax6s DEVICE_VENDOR := Xiaomi -- cgit v1.2.3