mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-29 16:06:59 +08:00
d81c03f05e
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 2d148ac987e05745b393daed53661d4afbc20ad8 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Fri, 25 Oct 2024 18:15:32 +0100
|
|
Subject: [PATCH] drm/vc4: Use of_device_get_match_data to set generation
|
|
|
|
Use of_device_get_match_data to retrieve the generation value
|
|
as set in the struct of_device_id, rather than manually comparing
|
|
compatible strings.
|
|
|
|
Reviewed-by: Maxime Ripard <mripard@kernel.org>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20241025-drm-vc4-2712-support-v2-1-35efa83c8fc0@raspberrypi.com
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_drv.c | 11 ++++-------
|
|
1 file changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_drv.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
|
|
@@ -296,10 +296,7 @@ static int vc4_drm_bind(struct device *d
|
|
|
|
dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
|
|
|
- if (of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5"))
|
|
- gen = VC4_GEN_5;
|
|
- else
|
|
- gen = VC4_GEN_4;
|
|
+ gen = (enum vc4_gen)of_device_get_match_data(dev);
|
|
|
|
if (gen > VC4_GEN_4)
|
|
driver = &vc5_drm_driver;
|
|
@@ -458,9 +455,9 @@ static void vc4_platform_drm_shutdown(st
|
|
}
|
|
|
|
static const struct of_device_id vc4_of_match[] = {
|
|
- { .compatible = "brcm,bcm2711-vc5", },
|
|
- { .compatible = "brcm,bcm2835-vc4", },
|
|
- { .compatible = "brcm,cygnus-vc4", },
|
|
+ { .compatible = "brcm,bcm2711-vc5", .data = (void *)VC4_GEN_5 },
|
|
+ { .compatible = "brcm,bcm2835-vc4", .data = (void *)VC4_GEN_4 },
|
|
+ { .compatible = "brcm,cygnus-vc4", .data = (void *)VC4_GEN_4 },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, vc4_of_match);
|