From: Robert Marko Date: Sat, 8 Jan 2022 13:39:54 +0000 (+0100) Subject: generic: 5.15: fix new AQR PHY patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=81fdb6afe3e4068d8ebac127523b5c6175eb551a;p=openwrt%2Fstaging%2Fjogo.git generic: 5.15: fix new AQR PHY patches After fixing the original 720 patch, it looks like more were added for additional AQR ID-s. Patches that add the additional AQR PHY ID-s is just copy/paste from 5.10 and kernel 5.11 dropped the ack_interrupt method for PHY IRQ handling, instead handle_interrupt is used. So, simply switch to using handle_interrupt like other upstream AQR PHY-s. Signed-off-by: Robert Marko --- diff --git a/target/linux/generic/hack-5.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch b/target/linux/generic/hack-5.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch index e3541400d7..6ab7bc7569 100644 --- a/target/linux/generic/hack-5.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch +++ b/target/linux/generic/hack-5.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch @@ -119,7 +119,7 @@ Signed-off-by: Alex Marginean + .probe = aqr107_probe, + .config_aneg = aqr_config_aneg_set_prot, + .config_intr = aqr_config_intr, -+ .ack_interrupt = aqr_ack_interrupt, ++ .handle_interrupt = aqr_handle_interrupt, + .read_status = aqr107_read_status, + .get_sset_count = aqr107_get_sset_count, + .get_strings = aqr107_get_strings, @@ -131,7 +131,7 @@ Signed-off-by: Alex Marginean + .probe = aqr107_probe, + .config_aneg = aqr_config_aneg_set_prot, + .config_intr = aqr_config_intr, -+ .ack_interrupt = aqr_ack_interrupt, ++ .handle_interrupt = aqr_handle_interrupt, + .read_status = aqr107_read_status, + .get_sset_count = aqr107_get_sset_count, + .get_strings = aqr107_get_strings, diff --git a/target/linux/generic/hack-5.15/724-net-phy-aquantia-Add-AQR113-driver-support.patch b/target/linux/generic/hack-5.15/724-net-phy-aquantia-Add-AQR113-driver-support.patch index 7a661309f9..1fc7658ff3 100644 --- a/target/linux/generic/hack-5.15/724-net-phy-aquantia-Add-AQR113-driver-support.patch +++ b/target/linux/generic/hack-5.15/724-net-phy-aquantia-Add-AQR113-driver-support.patch @@ -26,7 +26,7 @@ Add a new entry for AQR113 PHY_ID + .name = "Aquantia AQR113", + .config_aneg = aqr_config_aneg, + .config_intr = aqr_config_intr, -+ .ack_interrupt = aqr_ack_interrupt, ++ .handle_interrupt = aqr_handle_interrupt, + .read_status = aqr107_read_status, +}, +{ diff --git a/target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch b/target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch index 40ad0ff583..ba9f3ee120 100644 --- a/target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch +++ b/target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch @@ -30,7 +30,7 @@ Signed-off-by: Daniel Golle + .probe = aqr107_probe, + .config_aneg = aqr_config_aneg_set_prot, + .config_intr = aqr_config_intr, -+ .ack_interrupt = aqr_ack_interrupt, ++ .handle_interrupt = aqr_handle_interrupt, + .read_status = aqr107_read_status, + .get_sset_count = aqr107_get_sset_count, + .get_strings = aqr107_get_strings, @@ -42,7 +42,7 @@ Signed-off-by: Daniel Golle + .probe = aqr107_probe, + .config_aneg = aqr_config_aneg_set_prot, + .config_intr = aqr_config_intr, -+ .ack_interrupt = aqr_ack_interrupt, ++ .handle_interrupt = aqr_handle_interrupt, + .read_status = aqr107_read_status, + .get_sset_count = aqr107_get_sset_count, + .get_strings = aqr107_get_strings,