[][kernel][mt7988][eth][Fix patches conflict issue]
[Description]
Fix patches conflict issue.
[Release-log]
N/A
Change-Id: I234883783102d55e133c0ad3953b8498ee4150dc
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9672539
diff --git a/autobuild/unified/global/common/files/target/linux/generic/hack-6.6/702-arch-arm64-dts-mt7988a-rfb-aqr-change-firmware-file.patch b/autobuild/unified/global/common/files/target/linux/generic/hack-6.6/702-arch-arm64-dts-mt7988a-rfb-aqr-change-firmware-file.patch
deleted file mode 100644
index 8fd63ef..0000000
--- a/autobuild/unified/global/common/files/target/linux/generic/hack-6.6/702-arch-arm64-dts-mt7988a-rfb-aqr-change-firmware-file.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso b/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso
-index c471b9e..58a20be 100644
---- a/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso
-+++ b/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso
-@@ -22,7 +22,7 @@ __overlay__ {
- phy0: ethernet-phy@0 {
- reg = <0>;
- compatible = "ethernet-phy-ieee802.3-c45";
-- firmware-name = "AQR-G4_v5.7.0-AQR_EVB_Generic_X3410_StdCfg_MDISwap_USX_ID46316_VER2140.cld";
-+ firmware-name = "Rhe-05.06-Candidate9-AQR_Mediatek_23B_P5_ID45824_LCLVER1.cld";
- reset-gpios = <&pio 72 GPIO_ACTIVE_LOW>;
- reset-assert-us = <100000>;
- reset-deassert-us = <221000>;
-diff --git a/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso b/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso
-index 1490f05..6d90fc9 100644
---- a/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso
-+++ b/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso
-@@ -22,7 +22,7 @@ __overlay__ {
- phy8: ethernet-phy@8 {
- reg = <8>;
- compatible = "ethernet-phy-ieee802.3-c45";
-- firmware-name = "AQR-G4_v5.7.0-AQR_EVB_Generic_X3410_StdCfg_MDISwap_USX_ID46316_VER2140.cld";
-+ firmware-name = "Rhe-05.06-Candidate9-AQR_Mediatek_23B_P5_ID45824_LCLVER1.cld";
- reset-gpios = <&pio 71 GPIO_ACTIVE_LOW>;
- reset-assert-us = <100000>;
- reset-deassert-us = <221000>;
diff --git a/autobuild/unified/global/master/patches-base/0003-arch-arm64-dts-mt7988a-rfb-aqr-change-firmware-file.patch b/autobuild/unified/global/master/patches-base/0003-arch-arm64-dts-mt7988a-rfb-aqr-change-firmware-file.patch
new file mode 100644
index 0000000..a1918d1
--- /dev/null
+++ b/autobuild/unified/global/master/patches-base/0003-arch-arm64-dts-mt7988a-rfb-aqr-change-firmware-file.patch
@@ -0,0 +1,26 @@
+diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso
+index c471b9e..58a20be 100644
+--- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso
++++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso
+@@ -22,7 +22,7 @@ __overlay__ {
+ phy0: ethernet-phy@0 {
+ reg = <0>;
+ compatible = "ethernet-phy-ieee802.3-c45";
+- firmware-name = "AQR-G4_v5.7.0-AQR_EVB_Generic_X3410_StdCfg_MDISwap_USX_ID46316_VER2140.cld";
++ firmware-name = "Rhe-05.06-Candidate9-AQR_Mediatek_23B_P5_ID45824_LCLVER1.cld";
+ reset-gpios = <&pio 72 GPIO_ACTIVE_LOW>;
+ reset-assert-us = <100000>;
+ reset-deassert-us = <221000>;
+diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso
+index 1490f05..6d90fc9 100644
+--- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso
++++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso
+@@ -22,7 +22,7 @@ __overlay__ {
+ phy8: ethernet-phy@8 {
+ reg = <8>;
+ compatible = "ethernet-phy-ieee802.3-c45";
+- firmware-name = "AQR-G4_v5.7.0-AQR_EVB_Generic_X3410_StdCfg_MDISwap_USX_ID46316_VER2140.cld";
++ firmware-name = "Rhe-05.06-Candidate9-AQR_Mediatek_23B_P5_ID45824_LCLVER1.cld";
+ reset-gpios = <&pio 71 GPIO_ACTIVE_LOW>;
+ reset-assert-us = <100000>;
+ reset-deassert-us = <221000>;