Merge branch 'drm-tda998x-3.12' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into...
authorDave Airlie <airlied@redhat.com>
Tue, 22 Oct 2013 08:38:18 +0000 (09:38 +0100)
committerDave Airlie <airlied@redhat.com>
Tue, 22 Oct 2013 08:50:08 +0000 (09:50 +0100)
commit5e4e3ba997af8c756c23ffaa86652d3a4df5bdfa
treea6860666ccf18c9add51d2b0f468cecf3fd7b3da
parent5bdebb183c9702a8c57a01dff09337be3de337a6
parent585b691e2180e1501637050290292f77f5c30c7b
Merge branch 'drm-tda998x-3.12' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next

This adds support for the Armada 510 display subsystem found on the
Marvell Dove devices.  This IP is re-used across several different Marvell
SoCs with various tweaks, and this driver has been structured to allow
the other IPs to re-use the bulk of this code; further work in this area
is expected from interested parties.

This has been extensively tested on the SolidRun Cubox platform and
appears to work well there.

[airlied: update for api changes merged previous to this]
drivers/gpu/drm/armada/armada_crtc.c
drivers/gpu/drm/armada/armada_drv.c
include/drm/drm_crtc.h