diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-11-16 02:39:55 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-11-16 02:39:55 +0300 |
| commit | 4473904ccd7fc27b7e9e575c36dc709617a3eb85 (patch) | |
| tree | 58be4542b362c7c498cbc7bb55aa5091f74374b1 /drivers/gpu/drm/sun4i/sun6i_drc.c | |
| parent | 1a3865d64a0d8151c7fe23f4b57a587615ccc5bb (diff) | |
| parent | 47d7fbb32c57c8d1722a3e9bd21e501e80fd0741 (diff) | |
| download | linux-4473904ccd7fc27b7e9e575c36dc709617a3eb85.tar.xz | |
Merge tag 'sunxi-drm-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into drm-next
sun4i-drm changes for 4.10
Support for the Allwinner A31 SoC display engine using the sun4i-drm
driver.
* tag 'sunxi-drm-for-4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
drm/sun4i: Add a few formats
drm/sun4i: Add compatible strings for A31/A31s display pipelines
drm/sun4i: Add compatible string for A31/A31s TCON (timing controller)
drm/sun4i: tcon: Move SoC specific quirks to a DT matched data structure
drm/sun4i: sun6i-drc: Support DRC on A31 and A31s
Diffstat (limited to 'drivers/gpu/drm/sun4i/sun6i_drc.c')
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun6i_drc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/sun4i/sun6i_drc.c b/drivers/gpu/drm/sun4i/sun6i_drc.c index bf6d846d8132..6ef707c5a719 100644 --- a/drivers/gpu/drm/sun4i/sun6i_drc.c +++ b/drivers/gpu/drm/sun4i/sun6i_drc.c @@ -98,6 +98,8 @@ static int sun6i_drc_remove(struct platform_device *pdev) } static const struct of_device_id sun6i_drc_of_table[] = { + { .compatible = "allwinner,sun6i-a31-drc" }, + { .compatible = "allwinner,sun6i-a31s-drc" }, { .compatible = "allwinner,sun8i-a33-drc" }, { } }; |