[OpenWrt-Devel] [PATCH 5/5] ath79/zyxel_nbg6716: add macs from uboot-env partition

[André Valentin]

Switch NBG6716 to use the new mtd mac parser for u-boot env.

Signed-off-by: André Valentin <avalentin at marcant.net>
---
 .../linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index 677aa7aac5..0d4bc7de46 100644
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -133,7 +133,7 @@
 				read-only;
 			};
 
-                        partition at 40000 {
+                        uboot_env: partition at 40000 {
                                 label = "u-boot-env";
                                 reg = <0x040000 0x010000>;
                         };
@@ -231,7 +231,9 @@
 	status = "okay";
 
 	pll-data = <0xa6000000 0x00000101 0x00001616>;
-	mtd-mac-address = <&uboot 0x5E2>;
+	mtd-mac-address = <&uboot_env 0x0>;
+	mtd-mac-search = "ethaddr=";
+	mtd-mac-address-increment = <2>;
 	phy-handle = <&phy0>;
 	fixed-link {
 		speed = <1000>;
@@ -243,8 +245,9 @@
 	status = "okay";
 
 	pll-data = <0x03000101 0x00000101 0x00001616>;
-	mtd-mac-address = <&uboot 0x5E2>;
-	mtd-mac-address-increment = <1>;
+	mtd-mac-address = <&uboot_env 0x0>;
+	mtd-mac-search = "ethaddr=";
+	mtd-mac-address-increment = <3>;
 	phy-handle = <&phy1>;
 	fixed-link {
 		speed = <1000>;
@@ -260,8 +263,8 @@
 &wmac {
 	status = "okay";
 	mtd-cal-data = <&art 0x1000>;
-	mtd-mac-address = <&uboot 0x5E2>;
-	mtd-mac-address-increment = <3>;
+	mtd-mac-address = <&uboot_env 0x0>;
+	mtd-mac-search = "ethaddr=";
 };
 
 &pcie1 {
@@ -270,6 +273,10 @@
 	wifi at 0,0 {
 		compatible = "qcom,ath10k";
 		reg = <0 0 0 0 0>;
+		mtd-mac-address = <&uboot_env 0x0>;
+		mtd-mac-search = "ethaddr=";
+		mtd-mac-address-increment = <1>;
+		qcom,ath10k-calibration-variant = "ZyXEL-NBG6716";
 	};
 };
 
-- 
2.20.1


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel