57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
|
From f071c70678b875d2e5411ead123015381647e9f9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
Date: Thu, 26 Dec 2019 11:45:04 +0100
|
||
|
|
Subject: [PATCH] drm/vc4: crtc: Rename SoC data structures
|
||
|
|
|
||
|
|
Since we're going to introduce pixelvalve data structures for other SoCs
|
||
|
|
than the BCM2835, let's rename the structures defined in the code to
|
||
|
|
make it obvious which SoC we're targetting.
|
||
|
|
|
||
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/vc4/vc4_crtc.c | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
|
||
|
|
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
|
||
|
|
@@ -1056,7 +1056,7 @@ static const struct drm_crtc_helper_func
|
||
|
|
.atomic_disable = vc4_crtc_atomic_disable,
|
||
|
|
};
|
||
|
|
|
||
|
|
-static const struct vc4_crtc_data pv0_data = {
|
||
|
|
+static const struct vc4_crtc_data bcm2835_pv0_data = {
|
||
|
|
.hvs_channel = 0,
|
||
|
|
.debugfs_name = "crtc0_regs",
|
||
|
|
.encoder_types = {
|
||
|
|
@@ -1065,7 +1065,7 @@ static const struct vc4_crtc_data pv0_da
|
||
|
|
},
|
||
|
|
};
|
||
|
|
|
||
|
|
-static const struct vc4_crtc_data pv1_data = {
|
||
|
|
+static const struct vc4_crtc_data bcm2835_pv1_data = {
|
||
|
|
.hvs_channel = 2,
|
||
|
|
.debugfs_name = "crtc1_regs",
|
||
|
|
.encoder_types = {
|
||
|
|
@@ -1074,7 +1074,7 @@ static const struct vc4_crtc_data pv1_da
|
||
|
|
},
|
||
|
|
};
|
||
|
|
|
||
|
|
-static const struct vc4_crtc_data pv2_data = {
|
||
|
|
+static const struct vc4_crtc_data bcm2835_pv2_data = {
|
||
|
|
.hvs_channel = 1,
|
||
|
|
.debugfs_name = "crtc2_regs",
|
||
|
|
.encoder_types = {
|
||
|
|
@@ -1084,9 +1084,9 @@ static const struct vc4_crtc_data pv2_da
|
||
|
|
};
|
||
|
|
|
||
|
|
static const struct of_device_id vc4_crtc_dt_match[] = {
|
||
|
|
- { .compatible = "brcm,bcm2835-pixelvalve0", .data = &pv0_data },
|
||
|
|
- { .compatible = "brcm,bcm2835-pixelvalve1", .data = &pv1_data },
|
||
|
|
- { .compatible = "brcm,bcm2835-pixelvalve2", .data = &pv2_data },
|
||
|
|
+ { .compatible = "brcm,bcm2835-pixelvalve0", .data = &bcm2835_pv0_data },
|
||
|
|
+ { .compatible = "brcm,bcm2835-pixelvalve1", .data = &bcm2835_pv1_data },
|
||
|
|
+ { .compatible = "brcm,bcm2835-pixelvalve2", .data = &bcm2835_pv2_data },
|
||
|
|
{}
|
||
|
|
};
|
||
|
|
|