lantiq: rename gphy firmware

Rename the gphy firmware to match the name requested by kernel 4.14 and
update the devicetree source files to use the new name.

Update the u-boot lantiq Makefile to be compatible with the new names as
well.

Signed-off-by: Mathias Kresin <dev@kresin.me>

20 files changed, 35 insertions, 35 deletions

diff --git a/package/boot/uboot-lantiq/Makefile b/package/boot/uboot-lantiq/Makefile
index 5493737d3f..55038fdf65 100644
--- a/package/boot/uboot-lantiq/Makefile
+++ b/package/boot/uboot-lantiq/Makefile
@@ -353,17 +353,17 @@ UBOOT_TARGETS:= \
 
 define CompressVR9Firmware
 	$(STAGING_DIR_HOST)/bin/lzma e \
-		$(FIRMWARE_LANTIQ_SOURCE)/vr9_phy$(1)_a$(2)x.bin \
+		$(FIRMWARE_LANTIQ_SOURCE)/xrx200_phy$(1)_a$(2)$(3).bin \
 		$(PKG_BUILD_DIR)/arch/mips/cpu/mips32/vrx200/fw_phy$(1)_a$(2)x.blob
 endef
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	mkdir -p $(PKG_BUILD_DIR)/arch/mips/cpu/mips32/vrx200/
-	$(call CompressVR9Firmware,11g,1)
-	$(call CompressVR9Firmware,11g,2)
-	$(call CompressVR9Firmware,22f,1)
-	$(call CompressVR9Firmware,22f,2)
+	$(call CompressVR9Firmware,11g,1,4)
+	$(call CompressVR9Firmware,11g,2,2)
+	$(call CompressVR9Firmware,22f,1,4)
+	$(call CompressVR9Firmware,22f,2,2)
 endef
 
 UBOOT_MAKE_FLAGS :=
diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts
index 9e2ae9d6f2..0bdc150a1e 100644
--- a/target/linux/lantiq/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/dts/ARV7519RW22.dts
@@ -99,8 +99,8 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware1 = "lantiq/vr9_phy22f_a1x.bin";	/*VR9 1.1*/
-		firmware2 = "lantiq/vr9_phy22f_a2x.bin";	/*VR9 1.2*/
+		firmware1 = "lantiq/xrx200_phy22f_a14.bin";	/*VR9 1.1*/
+		firmware2 = "lantiq/xrx200_phy22f_a22.bin";	/*VR9 1.2*/
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/ASL56026.dts b/target/linux/lantiq/dts/ASL56026.dts
index 293a3e27de..2037f40f03 100644
--- a/target/linux/lantiq/dts/ASL56026.dts
+++ b/target/linux/lantiq/dts/ASL56026.dts
@@ -77,8 +77,8 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware1 = "lantiq/vr9_phy22f_a1x.bin";	/*VR9 1.1*/
-		firmware2 = "lantiq/vr9_phy22f_a2x.bin";	/*VR9 1.2*/
+		firmware1 = "lantiq/xrx200_phy22f_a14.bin";	/*VR9 1.1*/
+		firmware2 = "lantiq/xrx200_phy22f_a22.bin";	/*VR9 1.2*/
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
index 4bdeddcafa..2f75074696 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
@@ -118,8 +118,8 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware1 = "lantiq/vr9_phy11g_a1x.bin";	/*VR9 1.1*/
-		firmware2 = "lantiq/vr9_phy11g_a2x.bin";	/*VR9 1.2*/
+		firmware1 = "lantiq/xrx200_phy11g_a14.bin";	/*VR9 1.1*/
+		firmware2 = "lantiq/xrx200_phy11g_a22.bin";	/*VR9 1.2*/
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/DM200.dts b/target/linux/lantiq/dts/DM200.dts
index eef4084915..3c8a2a1fa9 100644
--- a/target/linux/lantiq/dts/DM200.dts
+++ b/target/linux/lantiq/dts/DM200.dts
@@ -56,7 +56,7 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware = "lantiq/vr9_phy22f_a2x.bin";
+		firmware = "lantiq/xrx200_phy22f_a22.bin";
 		phys = [ 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index 3565842f24..b19b9713f6 100644
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -106,8 +106,8 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware1 = "lantiq/vr9_phy11g_a1x.bin";
-		firmware2 = "lantiq/vr9_phy11g_a2x.bin";
+		firmware1 = "lantiq/xrx200_phy11g_a14.bin";
+		firmware2 = "lantiq/xrx200_phy11g_a22.bin";
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index 76f7f877bc..ef3655de61 100644
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -121,7 +121,7 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware = "lantiq/vr9_phy11g_a1x.bin";
+		firmware = "lantiq/xrx200_phy11g_a14.bin";
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/FRITZ7360SL.dts b/target/linux/lantiq/dts/FRITZ7360SL.dts
index cf82451400..b164871101 100644
--- a/target/linux/lantiq/dts/FRITZ7360SL.dts
+++ b/target/linux/lantiq/dts/FRITZ7360SL.dts
@@ -98,7 +98,7 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware = "lantiq/vr9_phy11g_a2x.bin";
+		firmware = "lantiq/xrx200_phy11g_a22.bin";
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/P2812HNUFX.dtsi b/target/linux/lantiq/dts/P2812HNUFX.dtsi
index 9429d5caf3..ec3bd1033d 100644
--- a/target/linux/lantiq/dts/P2812HNUFX.dtsi
+++ b/target/linux/lantiq/dts/P2812HNUFX.dtsi
@@ -131,8 +131,8 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware1 = "lantiq/vr9_phy11g_a1x.bin";	/*VR9 1.1*/
-		firmware2 = "lantiq/vr9_phy11g_a2x.bin";	/*VR9 1.2*/
+		firmware1 = "lantiq/xrx200_phy11g_a14.bin";	/*VR9 1.1*/
+		firmware2 = "lantiq/xrx200_phy11g_a22.bin";	/*VR9 1.2*/
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/dts/TDW89X0.dtsi
index 79bcfc103b..a629d92e4f 100644
--- a/target/linux/lantiq/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/dts/TDW89X0.dtsi
@@ -82,7 +82,7 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware = "lantiq/vr9_phy11g_a2x.bin";
+		firmware = "lantiq/xrx200_phy11g_a22.bin";
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/VG3503J.dts b/target/linux/lantiq/dts/VG3503J.dts
index cb0d5ddecd..8a73de9a26 100644
--- a/target/linux/lantiq/dts/VG3503J.dts
+++ b/target/linux/lantiq/dts/VG3503J.dts
@@ -81,8 +81,8 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware1 = "lantiq/vr9_phy11g_a1x.bin";	/*VR9 1.1*/
-		firmware2 = "lantiq/vr9_phy11g_a2x.bin";	/*VR9 1.2*/
+		firmware1 = "lantiq/xrx200_phy11g_a14.bin";	/*VR9 1.1*/
+		firmware2 = "lantiq/xrx200_phy11g_a22.bin";	/*VR9 1.2*/
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/dts/VGV7510KW22.dtsi
index 2d8e528f4e..fb4486aca2 100644
--- a/target/linux/lantiq/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi
@@ -93,8 +93,8 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware1 = "lantiq/vr9_phy22f_a1x.bin";	/*VR9 1.1*/
-		firmware2 = "lantiq/vr9_phy22f_a2x.bin";	/*VR9 1.2*/
+		firmware1 = "lantiq/xrx200_phy22f_a14.bin";	/*VR9 1.1*/
+		firmware2 = "lantiq/xrx200_phy22f_a22.bin";	/*VR9 1.2*/
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi
index edff93cf47..e807b52715 100644
--- a/target/linux/lantiq/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/dts/VGV7519.dtsi
@@ -119,8 +119,8 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware1 = "lantiq/vr9_phy11g_a1x.bin";	/*VR9 1.1*/
-		firmware2 = "lantiq/vr9_phy11g_a2x.bin";	/*VR9 1.2*/
+		firmware1 = "lantiq/xrx200_phy11g_a14.bin";	/*VR9 1.1*/
+		firmware2 = "lantiq/xrx200_phy11g_a22.bin";	/*VR9 1.2*/
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/VR200v.dts b/target/linux/lantiq/dts/VR200v.dts
index b063d758c3..6eccc5bdd9 100644
--- a/target/linux/lantiq/dts/VR200v.dts
+++ b/target/linux/lantiq/dts/VR200v.dts
@@ -88,7 +88,7 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware = "lantiq/vr9_phy11g_a2x.bin";
+		firmware = "lantiq/xrx200_phy11g_a22.bin";
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/dts/WBMR300.dts b/target/linux/lantiq/dts/WBMR300.dts
index de2be582f5..2ecfe4bc92 100644
--- a/target/linux/lantiq/dts/WBMR300.dts
+++ b/target/linux/lantiq/dts/WBMR300.dts
@@ -76,7 +76,7 @@
 
 	gphy-xrx200 {
 		compatible = "lantiq,phy-xrx200";
-		firmware = "lantiq/vr9_phy22f_a2x.bin";
+		firmware = "lantiq/xrx200_phy22f_a22.bin";
 		phys = [ 00 01 ];
 	};
 
diff --git a/target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a1x.bin b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a14.bin
index cdf3d30634..cdf3d30634 100644
--- a/target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a1x.bin
+++ b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a14.bin
diff --git a/target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a2x.bin b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a22.bin
index 44fc39ef06..44fc39ef06 100644
--- a/target/linux/lantiq/files/firmware/lantiq/vr9_phy11g_a2x.bin
+++ b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy11g_a22.bin
diff --git a/target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a1x.bin b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a14.bin
index 02b88a078b..02b88a078b 100644
--- a/target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a1x.bin
+++ b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a14.bin
diff --git a/target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a2x.bin b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a22.bin
index 1fed6ad65e..1fed6ad65e 100644
--- a/target/linux/lantiq/files/firmware/lantiq/vr9_phy22f_a2x.bin
+++ b/target/linux/lantiq/files/firmware/lantiq/xrx200_phy22f_a22.bin
diff --git a/target/linux/lantiq/patches-4.9/0024-NET-lantiq-adds-PHY11G-firmware-blobs.patch b/target/linux/lantiq/patches-4.9/0024-NET-lantiq-adds-PHY11G-firmware-blobs.patch
index b69b2a900f..e62ff2f698 100644
--- a/target/linux/lantiq/patches-4.9/0024-NET-lantiq-adds-PHY11G-firmware-blobs.patch
+++ b/target/linux/lantiq/patches-4.9/0024-NET-lantiq-adds-PHY11G-firmware-blobs.patch
@@ -18,10 +18,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw
  fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
  fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin
-+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy11g_a1x.bin
-+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy11g_a2x.bin
-+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy22f_a1x.bin
-+fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/vr9_phy22f_a2x.bin
++fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy11g_a14.bin
++fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy11g_a22.bin
++fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy22f_a14.bin
++fw-shipped-$(CONFIG_LANTIQ_XRX200) += lantiq/xrx200_phy22f_a22.bin
  fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
  
  fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
@@ -356,9 +356,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +#
 +
 +# GPHY core on Lantiq XWAY VR9 v1.1
-+lantiq/vr9_phy11g_a1x.bin
-+lantiq/vr9_phy22f_a1x.bin
++lantiq/xrx200_phy11g_a14.bin
++lantiq/xrx200_phy22f_a14.bin
 +
 +# GPHY core on Lantiq XWAY VR9 v1.2
-+lantiq/vr9_phy11g_a2x.bin
-+lantiq/vr9_phy22f_a2x.bin
++lantiq/xrx200_phy11g_a22.bin
++lantiq/xrx200_phy22f_a22.bin