drm/vc4: txp: Rename TXP data structure

The TXP data structure has a name too generic for the multiple variants
we'll have to support. Let's rename it to mention the SoC it applies to.

Signed-off-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241025-drm-vc4-2712-support-v2-14-35efa83c8fc0@raspberrypi.com
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>

diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.c b/drivers/gpu/drm/vc4/tests/vc4_mock.c
index c7b91c87f1bcbe97da54decd32c921cb72b48bbf..372482fcd6c72f5b574eeda5ff59286280292d32 100644 (file)
--- a/drivers/gpu/drm/vc4/tests/vc4_mock.c
+++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c
@@ -51,7 +51,7 @@ struct vc4_mock_desc {
 
 static const struct vc4_mock_desc vc4_mock =
        VC4_MOCK_DESC(
-               VC4_MOCK_CRTC_DESC(&vc4_txp_data.base,
+               VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
                                   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
                                                        DRM_MODE_ENCODER_VIRTUAL,
                                                        DRM_MODE_CONNECTOR_WRITEBACK)),
@@ -77,7 +77,7 @@ static const struct vc4_mock_desc vc4_mock =
 
 static const struct vc4_mock_desc vc5_mock =
        VC4_MOCK_DESC(
-               VC4_MOCK_CRTC_DESC(&vc4_txp_data.base,
+               VC4_MOCK_CRTC_DESC(&bcm2835_txp_data.base,
                                   VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP,
                                                        DRM_MODE_ENCODER_VIRTUAL,
                                                        DRM_MODE_CONNECTOR_WRITEBACK)),

diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
index 1ed1fb5aa7e8837ac927ff2777f86e0183e4901b..e08c90245f949ba80f9a8d01667e013c6efeebed 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_drv.h
+++ b/drivers/gpu/drm/vc4/vc4_drv.h
@@ -540,7 +540,7 @@ struct vc4_txp_data {
        struct vc4_crtc_data    base;
 };
 
-extern const struct vc4_txp_data vc4_txp_data;
+extern const struct vc4_txp_data bcm2835_txp_data;
 
 struct vc4_pv_data {
        struct vc4_crtc_data    base;

diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c
index dcb1b3fd37de1cb6dd02570a366a2c3839a90c5f..6fe378b454ca21912042dcea4b3bd495c7c89387 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_txp.c
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
@@ -485,7 +485,7 @@ static irqreturn_t vc4_txp_interrupt(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-const struct vc4_txp_data vc4_txp_data = {
+const struct vc4_txp_data bcm2835_txp_data = {
        .base = {
                .name = "txp",
                .debugfs_name = "txp_regs",
@@ -588,7 +588,7 @@ static void vc4_txp_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id vc4_txp_dt_match[] = {
-       { .compatible = "brcm,bcm2835-txp", .data = &vc4_txp_data },
+       { .compatible = "brcm,bcm2835-txp", .data = &bcm2835_txp_data },
        { /* sentinel */ },
 };