[OpenWrt-Devel,5/5] ath79/zyxel_nbg6716: add macs from uboot-env partition
diff mbox series

Message ID 20191021123214.2252-6-avalentin@marcant.net
State Changes Requested
Headers show
Series
  • ZyXEL NBG6716 update ar71xx, add ath79, add mtd mac parser
Related show

Commit Message

André Valentin Oct. 21, 2019, 12:32 p.m. UTC
Switch NBG6716 to use the new mtd mac parser for u-boot env.

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

Comments

Petr Štetiar Oct. 21, 2019, 1:03 p.m. UTC | #1
André Valentin <avalentin@marcant.net> [2019-10-21 14:32:14]:

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

...

>  	wifi@0,0 {
>  		compatible = "qcom,ath10k";
>  		reg = <0 0 0 0 0>;

...

> +		qcom,ath10k-calibration-variant = "ZyXEL-NBG6716";

this doesn't match commit title and/or commit description.

-- ynezz

Patch
diff mbox series

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@40000 {
+                        uboot_env: partition@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@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";
 	};
 };