Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[23.05] ipq40xx: convert Engenius EAP1300 to DSA #15402

Merged
merged 4 commits into from
May 12, 2024
Merged

[23.05] ipq40xx: convert Engenius EAP1300 to DSA #15402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11b0034
ipq40xx: Enable NVMEM_U_BOOT_ENV config
cminyard May 2, 2024
89088ba
ipq40xx: convert Engenius EAP1300 to DSA
cminyard May 1, 2024
66952b9
ipq40xx: Properly set MAC addresses for the EAP1300
cminyard May 3, 2024
7a0d5a5
ipq40xx: Enable the Engenius EAP1300
cminyard May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions target/linux/ipq40xx/base-files/etc/board.d/02_network
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ ipq40xx_setup_interfaces()
aruba,ap-365|\
avm,fritzrepeater-1200|\
dlink,dap-2610|\
engenius,eap1300|\
extreme-networks,ws-ap3915i|\
meraki,mr33|\
meraki,mr74|\
Expand Down
1 change: 1 addition & 0 deletions target/linux/ipq40xx/config-5.15
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ CONFIG_NVMEM=y
CONFIG_NVMEM_QCOM_QFPROM=y
# CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
# CONFIG_NVMEM_SPMI_SDAM is not set
CONFIG_NVMEM_U_BOOT_ENV=y
CONFIG_NVMEM_SYSFS=y
CONFIG_OF=y
CONFIG_OF_ADDRESS=y
Expand Down
32 changes: 28 additions & 4 deletions target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,13 @@
reg = <0x190000 0x1dc0000>;
};
partition9@1f50000 {
compatible = "u-boot,env";
label = "u-boot-env";
reg = <0x01f50000 0x00010000>;

macaddr_ubootenv_ethaddr: ethaddr {
#nvmem-cell-cells = <1>;
};
};
partition10@1f60000 {
label = "userconfig";
Expand All @@ -215,16 +220,35 @@
status = "okay";
};

&switch {
status = "okay";
};

&swport5 {
status = "okay";
label = "lan";
nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_ubootenv_ethaddr 0>;
};

&gmac {
status = "okay";
};

&mdio {
status = "okay";
};

&wifi0 {
status = "okay";
nvmem-cell-names = "pre-calibration";
nvmem-cells = <&precal_art_1000>;
nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_ubootenv_ethaddr 1>;
qcom,ath10k-calibration-variant = "EnGenius-EAP1300";
};

&wifi1 {
status = "okay";
nvmem-cell-names = "pre-calibration";
nvmem-cells = <&precal_art_5000>;
nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_ubootenv_ethaddr 2>;
qcom,ath10k-calibration-variant = "EnGenius-EAP1300";
};
3 changes: 1 addition & 2 deletions target/linux/ipq40xx/image/generic.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,7 @@ define Device/engenius_eap1300
IMAGE_SIZE := 25344k
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
endef
# Missing DSA Setup
#TARGET_DEVICES += engenius_eap1300
TARGET_DEVICES += engenius_eap1300

define Device/engenius_eap2200
$(call Device/FitImage)
Expand Down