ipq40xx: refactor ZTE MF287 series
The ZTE MF287 requires a different board calibration file for ath10k than
the ZTE MF287+. The two devices receive their own DTS, thus the device tree
is slightly refactored.
Signed-off-by: Andreas Böhler <dev@aboehler.at>
(cherry picked from commit 9c7578d560)
This commit is contained in:
Andreas Böhler
Hauke Mehrtens
parent
2f30dec3cb
commit
a684b512e5
|
|
@ -41,6 +41,7 @@ ALLWIFIBOARDS:= \
|
|||
xiaomi_ax3600 \
|
||||
xiaomi_ax9000 \
|
||||
zte_mf289f \
|
||||
zte_mf287 \
|
||||
zte_mf287plus \
|
||||
zyxel_nbg7815
|
||||
|
||||
|
|
@ -129,6 +130,7 @@ $(eval $(call generate-ipq-wifi-package,wallys_dr40x9,Wallys DR40X9))
|
|||
$(eval $(call generate-ipq-wifi-package,xiaomi_ax3600,Xiaomi AX3600))
|
||||
$(eval $(call generate-ipq-wifi-package,xiaomi_ax9000,Xiaomi AX9000))
|
||||
$(eval $(call generate-ipq-wifi-package,zte_mf289f,ZTE MF289F))
|
||||
$(eval $(call generate-ipq-wifi-package,zte_mf287,ZTE MF287))
|
||||
$(eval $(call generate-ipq-wifi-package,zte_mf287plus,ZTE MF287Plus))
|
||||
$(eval $(call generate-ipq-wifi-package,zyxel_nbg7815,Zyxel NBG7815))
|
||||
|
||||
|
|
|
|||
|
|
@ -108,6 +108,7 @@ ipq40xx_setup_interfaces()
|
|||
zte,mf286d)
|
||||
ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" "wan"
|
||||
;;
|
||||
zte,mf287|\
|
||||
zte,mf287plus|\
|
||||
zte,mf287pro)
|
||||
ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ EOF
|
|||
;;
|
||||
zte,mf18a |\
|
||||
zte,mf286d |\
|
||||
zte,mf287|\
|
||||
zte,mf287plus |\
|
||||
zte,mf287pro |\
|
||||
zte,mf289f)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,226 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
||||
// Copyright (c) 2022, Pawel Dembicki <paweldembicki@gmail.com>.
|
||||
// Copyright (c) 2022, Giammarco Marzano <stich86@gmail.com>.
|
||||
// Copyright (c) 2023, Andreas Böhler <dev@aboehler.at>
|
||||
|
||||
#include "qcom-ipq4018-mf287_common.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ZTE MF287";
|
||||
compatible = "zte,mf287";
|
||||
|
||||
/*
|
||||
* This node is used to restart modem module to avoid anomalous
|
||||
* behaviours on initial communication.
|
||||
*/
|
||||
gpio-restart {
|
||||
compatible = "gpio-restart";
|
||||
gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
};
|
||||
|
||||
&key_reset {
|
||||
gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
&key_wps {
|
||||
gpios = <&tlmm 2 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
&led_status {
|
||||
gpios = <&tlmm 0 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
&blsp1_spi1 {
|
||||
pinctrl-0 = <&spi_0_pins>;
|
||||
pinctrl-names = "default";
|
||||
status = "okay";
|
||||
cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>,
|
||||
<&tlmm 59 GPIO_ACTIVE_HIGH>,
|
||||
<&tlmm 1 GPIO_ACTIVE_HIGH>;
|
||||
|
||||
flash@0 {
|
||||
compatible = "jedec,spi-nor";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
reg = <0>;
|
||||
spi-max-frequency = <24000000>;
|
||||
|
||||
partitions {
|
||||
compatible = "fixed-partitions";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
partition@0 {
|
||||
label = "0:SBL1";
|
||||
reg = <0x0 0x40000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@40000 {
|
||||
label = "0:MIBIB";
|
||||
reg = <0x40000 0x20000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@60000 {
|
||||
label = "0:QSEE";
|
||||
reg = <0x60000 0x60000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@c0000 {
|
||||
label = "0:CDT";
|
||||
reg = <0xc0000 0x10000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@d0000 {
|
||||
label = "0:DDRPARAMS";
|
||||
reg = <0xd0000 0x10000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@e0000 {
|
||||
label = "0:APPSBLENV";
|
||||
reg = <0xe0000 0x10000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@f0000 {
|
||||
label = "0:APPSBL";
|
||||
reg = <0xf0000 0xc0000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@1b0000 {
|
||||
label = "0:reserved1";
|
||||
reg = <0x1b0000 0x50000>;
|
||||
read-only;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
spi-nand@1 { /* flash@1 ? */
|
||||
compatible = "spi-nand";
|
||||
reg = <1>;
|
||||
spi-max-frequency = <24000000>;
|
||||
|
||||
partitions {
|
||||
compatible = "fixed-partitions";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
partition@0 {
|
||||
label = "fota-flag";
|
||||
reg = <0x0 0x140000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@140000 {
|
||||
label = "ART";
|
||||
reg = <0x140000 0x140000>;
|
||||
read-only;
|
||||
compatible = "nvmem-cells";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
precal_art_1000: precal@1000 {
|
||||
reg = <0x1000 0x2f20>;
|
||||
};
|
||||
|
||||
precal_art_5000: precal@5000 {
|
||||
reg = <0x5000 0x2f20>;
|
||||
};
|
||||
};
|
||||
|
||||
partition@280000 {
|
||||
label = "mac";
|
||||
reg = <0x280000 0x140000>;
|
||||
read-only;
|
||||
compatible = "nvmem-cells";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
macaddr_mac_0: macaddr@0 {
|
||||
reg = <0x0 0x6>;
|
||||
};
|
||||
};
|
||||
|
||||
partition@3c0000 {
|
||||
label = "cfg-param";
|
||||
reg = <0x3c0000 0x600000>;
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@9c0000 {
|
||||
label = "oops";
|
||||
reg = <0x9c0000 0x140000>;
|
||||
};
|
||||
|
||||
partition@b00000 {
|
||||
label = "web";
|
||||
reg = <0xb00000 0x800000>;
|
||||
};
|
||||
|
||||
partition@1300000 {
|
||||
label = "rootfs";
|
||||
reg = <0x1300000 0x2200000>;
|
||||
};
|
||||
|
||||
partition@3500000 {
|
||||
label = "data";
|
||||
reg = <0x3500000 0x1900000>;
|
||||
};
|
||||
|
||||
partition@4e00000 {
|
||||
label = "fota";
|
||||
reg = <0x4e00000 0x3200000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
zigbee@2 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
compatible = "silabs,em3581";
|
||||
reg = <2>;
|
||||
spi-max-frequency = <12000000>;
|
||||
};
|
||||
};
|
||||
|
||||
&tlmm {
|
||||
serial_pins: serial_pinmux {
|
||||
mux {
|
||||
pins = "gpio60", "gpio61";
|
||||
function = "blsp_uart0";
|
||||
bias-disable;
|
||||
};
|
||||
};
|
||||
|
||||
spi_0_pins: spi_0_pinmux {
|
||||
pinmux {
|
||||
function = "blsp_spi0";
|
||||
pins = "gpio55", "gpio56", "gpio57";
|
||||
drive-strength = <12>;
|
||||
bias-disable;
|
||||
};
|
||||
|
||||
pinmux_cs {
|
||||
function = "gpio";
|
||||
pins = "gpio54", "gpio59", "gpio1";
|
||||
drive-strength = <2>;
|
||||
bias-disable;
|
||||
output-high;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&wifi0 {
|
||||
qcom,ath10k-calibration-variant = "zte,mf287";
|
||||
};
|
||||
|
||||
&wifi1{
|
||||
qcom,ath10k-calibration-variant = "zte,mf287";
|
||||
};
|
||||
|
|
@ -171,7 +171,6 @@
|
|||
status = "okay";
|
||||
nvmem-cell-names = "pre-calibration", "mac-address";
|
||||
nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0>;
|
||||
qcom,ath10k-calibration-variant = "zte,mf287plus";
|
||||
};
|
||||
|
||||
&wifi1 {
|
||||
|
|
@ -179,5 +178,4 @@
|
|||
nvmem-cell-names = "pre-calibration", "mac-address";
|
||||
nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0>;
|
||||
mac-address-increment = <1>;
|
||||
qcom,ath10k-calibration-variant = "zte,mf287plus";
|
||||
};
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
// Copyright (c) 2022, Giammarco Marzano <stich86@gmail.com>.
|
||||
// Copyright (c) 2023, Andreas Böhler <dev@aboehler.at>
|
||||
|
||||
#include "qcom-ipq4018-mf287.dtsi"
|
||||
#include "qcom-ipq4018-mf287_common.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ZTE MF287Plus";
|
||||
|
|
@ -216,3 +216,11 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
&wifi0 {
|
||||
qcom,ath10k-calibration-variant = "zte,mf287plus";
|
||||
};
|
||||
|
||||
&wifi1{
|
||||
qcom,ath10k-calibration-variant = "zte,mf287plus";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
// Copyright (c) 2022, Giammarco Marzano <stich86@gmail.com>.
|
||||
// Copyright (c) 2023, Andreas Böhler <dev@aboehler.at>
|
||||
|
||||
#include "qcom-ipq4018-mf287.dtsi"
|
||||
#include "qcom-ipq4018-mf287_common.dtsi"
|
||||
|
||||
/ {
|
||||
model = "ZTE MF287Pro";
|
||||
|
|
@ -263,3 +263,13 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
/* The MF287Plus and MF287Pro share the same board data file */
|
||||
&wifi0 {
|
||||
qcom,ath10k-calibration-variant = "zte,mf287plus";
|
||||
};
|
||||
|
||||
/* The MF287Plus and MF287Pro share the same board data file */
|
||||
&wifi1{
|
||||
qcom,ath10k-calibration-variant = "zte,mf287plus";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1164,7 +1164,6 @@ TARGET_DEVICES += zte_mf286d
|
|||
|
||||
define Device/zte_mf287_common
|
||||
$(call Device/zte_mf28x_common)
|
||||
DEVICE_PACKAGES += ipq-wifi-zte_mf287plus
|
||||
SOC := qcom-ipq4018
|
||||
# The recovery image is used to return back to stock (an initramfs-based image
|
||||
# that can be flashed to the device via sysupgrade
|
||||
|
|
@ -1177,15 +1176,23 @@ endef
|
|||
|
||||
define Device/zte_mf287plus
|
||||
$(call Device/zte_mf287_common)
|
||||
DEVICE_PACKAGES += ipq-wifi-zte_mf287plus
|
||||
DEVICE_DTS_CONFIG := config@ap.dk01.1-c2
|
||||
DEVICE_MODEL := MF287Plus
|
||||
DEVICE_ALT0_VENDOR := ZTE
|
||||
DEVICE_ALT0_MODEL := MF287
|
||||
endef
|
||||
TARGET_DEVICES += zte_mf287plus
|
||||
|
||||
define Device/zte_mf287
|
||||
$(call Device/zte_mf287_common)
|
||||
DEVICE_PACKAGES += ipq-wifi-zte_mf287
|
||||
DEVICE_DTS_CONFIG := config@ap.dk01.1-c2
|
||||
DEVICE_MODEL := MF287
|
||||
endef
|
||||
TARGET_DEVICES += zte_mf287
|
||||
|
||||
define Device/zte_mf287pro
|
||||
$(call Device/zte_mf287_common)
|
||||
DEVICE_PACKAGES += ipq-wifi-zte_mf287plus
|
||||
DEVICE_DTS_CONFIG := config@ap.dk04.1-c1
|
||||
DEVICE_MODEL := MF287Pro
|
||||
endef
|
||||
|
|
|
|||
Loading…
Reference in New Issue