From: Greg Kroah-Hartman Date: Wed, 27 Mar 2024 13:40:55 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: v6.7.12~218 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14b42d9286ab636e988640e260474736b240a172;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: net-ravb-add-r-car-gen4-support.patch --- diff --git a/queue-5.15/net-ravb-add-r-car-gen4-support.patch b/queue-5.15/net-ravb-add-r-car-gen4-support.patch new file mode 100644 index 00000000000..3e5e7ace60d --- /dev/null +++ b/queue-5.15/net-ravb-add-r-car-gen4-support.patch @@ -0,0 +1,34 @@ +From 949f252a8594a860007e7035a0cb1c19a4e218b0 Mon Sep 17 00:00:00 2001 +From: Geert Uytterhoeven +Date: Fri, 9 Sep 2022 12:10:11 +0200 +Subject: net: ravb: Add R-Car Gen4 support + +From: Geert Uytterhoeven + +commit 949f252a8594a860007e7035a0cb1c19a4e218b0 upstream. + +Add support for the Renesas Ethernet AVB (EtherAVB-IF) blocks on R-Car +Gen4 SoCs (e.g. R-Car V4H) by matching on a family-specific compatible +value. + +These are treated the same as EtherAVB on R-Car Gen3. + +Signed-off-by: Geert Uytterhoeven +Reviewed-by: Sergey Shtylyov +Link: https://lore.kernel.org/r/2ee968890feba777e627d781128b074b2c43cddb.1662718171.git.geert+renesas@glider.be +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/renesas/ravb_main.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/ethernet/renesas/ravb_main.c ++++ b/drivers/net/ethernet/renesas/ravb_main.c +@@ -2067,6 +2067,7 @@ static const struct of_device_id ravb_ma + { .compatible = "renesas,etheravb-rcar-gen2", .data = &ravb_gen2_hw_info }, + { .compatible = "renesas,etheravb-r8a7795", .data = &ravb_gen3_hw_info }, + { .compatible = "renesas,etheravb-rcar-gen3", .data = &ravb_gen3_hw_info }, ++ { .compatible = "renesas,etheravb-rcar-gen4", .data = &ravb_gen3_hw_info }, + { } + }; + MODULE_DEVICE_TABLE(of, ravb_match_table); diff --git a/queue-5.15/series b/queue-5.15/series index d6051941db1..9b1da9af0d6 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -115,3 +115,4 @@ drm-amd-display-return-the-correct-hdcp-error-code.patch drm-amd-display-fix-noise-issue-on-hdmi-av-mute.patch dm-snapshot-fix-lockup-in-dm_exception_table_exit.patch x86-pm-work-around-false-positive-kmemleak-report-in.patch +net-ravb-add-r-car-gen4-support.patch