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 targeting.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/39aed7dd512ce2a4560902974ec26b16b88ec68b.1590594512.git-series.maxime@cerno.tech

diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index 440ff63b74bbc7759dd46a2947fb958b38f91c37..bf63570076f907321dc3ccbf426f35ae0b2971f5 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -1044,7 +1044,7 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {
        .get_scanout_position = vc4_crtc_get_scanout_position,
 };
 
-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 = {
@@ -1053,7 +1053,7 @@ static const struct vc4_crtc_data pv0_data = {
        },
 };
 
-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 = {
@@ -1062,7 +1062,7 @@ static const struct vc4_crtc_data pv1_data = {
        },
 };
 
-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 = {
@@ -1072,9 +1072,9 @@ static const struct vc4_crtc_data pv2_data = {
 };
 
 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 },
        {}
 };