Merge "[rdk-b][common][bsp][Refactor and sync kernel/wifi from Openwrt]"
diff --git a/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/patches-5.4.inc b/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/patches-5.4.inc
index 2de6831..04bc162 100644
--- a/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/patches-5.4.inc
+++ b/recipes-kernel/linux/linux-mediatek-5.4/mediatek/patches-5.4/patches-5.4.inc
@@ -97,8 +97,8 @@
file://7001-net-make-napi-disable-symmetric-with-enable.patch \
file://7002-net-fix-premature-exit-from-napi-state-polling-in-napi-disable-v2.patch \
file://730-net-ethernet-mtk_eth_soc-add-mtk-dsa-tag-rx-offload.patch \
- file://738-mt7531-gsw-internal_phy_calibration.patch \
- file://739-mt7531-gsw-port5_external_phy_init.patch \
+ file://738-mt7531-gsw-internal_phy_calibration.patch;apply=no\
+ file://739-mt7531-gsw-port5_external_phy_init.patch;apply=no \
file://740-add-gpy211-phy-support.patch \
file://741-add-default-setting-to-dsa-unused-port.patch \
file://742-net-dsa-add-MT7531-Gigabit-Ethernet-PHY-setting.patch \
@@ -114,7 +114,7 @@
file://750-add-mdio-bus-for-gphy-calibration.patch \
file://751-net-phy-aquantia-add-firmware-download.patch \
file://752-net-dsa-phy-coverity-scan.patch \
- file://753-net-mt753x-phy-coverity-scan.patch \
+ file://753-net-mt753x-phy-coverity-scan.patch;apply=no \
file://8000-PATCH-1-4-tphy-support-type-switch-by-pericfg.patch \
file://8001-PATCH-2-4-dt-bindings-phy-Add-PHY_TYPE_DP-definition.patch \
file://8002-PATCH-3-4-dt-bindings-phy-Add-PHY_TYPE_XPCS-definition.patch \
diff --git a/recipes-kernel/linux/linux-mediatek_5.4.bb b/recipes-kernel/linux/linux-mediatek_5.4.bb
index 76f9a56..323be62 100644
--- a/recipes-kernel/linux/linux-mediatek_5.4.bb
+++ b/recipes-kernel/linux/linux-mediatek_5.4.bb
@@ -53,11 +53,7 @@
file://531-debloat_lzma.patch \
"
require ${PN}-${PV}/mediatek/patches-5.4/patches-5.4.inc
-SRC_URI_remove = " \
- file://738-mt7531-gsw-internal_phy_calibration.patch \
- file://739-mt7531-gsw-port5_external_phy_init.patch \
- file://753-net-mt753x-phy-coverity-scan.patch \
- "
+
SRC_URI_remove_mt7986-32bit = " \
file://401-pinctrl-add-mt7986-driver.patch \
"
@@ -76,6 +72,9 @@
patch -p1 < ${WORKDIR}/001-rdkb-eth-mtk-change-ifname-for.patch
patch -p1 < ${WORKDIR}/003-rdkb-mtd-kernel-ubi-relayout.patch
patch -p1 < ${WORKDIR}/0600-net-phylink-propagate-resolved-link-config-via-mac_l.patch
+ patch -p1 < ${WORKDIR}/738-mt7531-gsw-internal_phy_calibration.patch
+ patch -p1 < ${WORKDIR}/739-mt7531-gsw-port5_external_phy_init.patch
+ patch -p1 < ${WORKDIR}/753-net-mt753x-phy-coverity-scan.patch
patch -p1 < ${WORKDIR}/9010-iwconfig-wireless-rate-fix.patch
if [ $DISTRO_FlowBlock_ENABLED = 'true' ]; then
for i in ${WORKDIR}/mediatek/flow_patch/*.patch; do patch -p1 < $i; done