Commit debf585c authored by Maxime Ripard's avatar Maxime Ripard

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: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/39aed7dd512ce2a4560902974ec26b16b88ec68b.1590594512.git-series.maxime@cerno.tech
parent 0c2a50f1
...@@ -1044,7 +1044,7 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { ...@@ -1044,7 +1044,7 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {
.get_scanout_position = vc4_crtc_get_scanout_position, .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, .hvs_channel = 0,
.debugfs_name = "crtc0_regs", .debugfs_name = "crtc0_regs",
.encoder_types = { .encoder_types = {
...@@ -1053,7 +1053,7 @@ static const struct vc4_crtc_data pv0_data = { ...@@ -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, .hvs_channel = 2,
.debugfs_name = "crtc1_regs", .debugfs_name = "crtc1_regs",
.encoder_types = { .encoder_types = {
...@@ -1062,7 +1062,7 @@ static const struct vc4_crtc_data pv1_data = { ...@@ -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, .hvs_channel = 1,
.debugfs_name = "crtc2_regs", .debugfs_name = "crtc2_regs",
.encoder_types = { .encoder_types = {
...@@ -1072,9 +1072,9 @@ static const struct vc4_crtc_data pv2_data = { ...@@ -1072,9 +1072,9 @@ static const struct vc4_crtc_data pv2_data = {
}; };
static const struct of_device_id vc4_crtc_dt_match[] = { static const struct of_device_id vc4_crtc_dt_match[] = {
{ .compatible = "brcm,bcm2835-pixelvalve0", .data = &pv0_data }, { .compatible = "brcm,bcm2835-pixelvalve0", .data = &bcm2835_pv0_data },
{ .compatible = "brcm,bcm2835-pixelvalve1", .data = &pv1_data }, { .compatible = "brcm,bcm2835-pixelvalve1", .data = &bcm2835_pv1_data },
{ .compatible = "brcm,bcm2835-pixelvalve2", .data = &pv2_data }, { .compatible = "brcm,bcm2835-pixelvalve2", .data = &bcm2835_pv2_data },
{} {}
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment