summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/armada/armada_510.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-22 15:24:03 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-07-03 16:24:48 +0100
commit42e62ba7a484e12a77b9e330a29bbf7c99d3e60e (patch)
treed3a9dbd2ed7cd157d365ee214d87ca1e08f06749 /drivers/gpu/drm/armada/armada_510.c
parent3ecea269959afaae50b001deb294cfb9539dbea3 (diff)
drm/armada: make variant a CRTC thing
Move the variant pointer into the armada_crtc structure, and update for the resulting changes. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_510.c')
-rw-r--r--drivers/gpu/drm/armada/armada_510.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/armada/armada_510.c b/drivers/gpu/drm/armada/armada_510.c
index a9dabcaef92e..1bcf1a8c1915 100644
--- a/drivers/gpu/drm/armada/armada_510.c
+++ b/drivers/gpu/drm/armada/armada_510.c
@@ -79,6 +79,6 @@ static int armada510_crtc_compute_clock(struct armada_crtc *dcrtc,
const struct armada_variant armada510_ops = {
.has_spu_adv_reg = true,
.spu_adv_reg = ADV_HWC32ENABLE | ADV_HWC32ARGB | ADV_HWC32BLEND,
- .crtc_init = armada510_crtc_init,
- .crtc_compute_clock = armada510_crtc_compute_clock,
+ .init = armada510_crtc_init,
+ .compute_clock = armada510_crtc_compute_clock,
};