diff options
| author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-01-29 11:51:57 +0200 |
|---|---|---|
| committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2018-01-29 11:51:57 +0200 |
| commit | 74c0167f8bcf02af8ff9f2677b2d85070ba7236d (patch) | |
| tree | 5a840e9abb2e49abd64180c48e6e77ce428b237c /drivers/gpu/drm/tinydrm/ili9225.c | |
| parent | 5db47e37b38755c5e26e6b8fbc1a32ce73495940 (diff) | |
| parent | 559f17bec508548850654dd04525fd69d90f6d4e (diff) | |
| download | linux-74c0167f8bcf02af8ff9f2677b2d85070ba7236d.tar.gz | |
Merge drm-next into drm-intel-next-queued
Pull 4.15 into drm-intel-next-queued for next feature pull.
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/tinydrm/ili9225.c')
| -rw-r--r-- | drivers/gpu/drm/tinydrm/ili9225.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/tinydrm/ili9225.c b/drivers/gpu/drm/tinydrm/ili9225.c index 3b766a26aa61..c0cf49849302 100644 --- a/drivers/gpu/drm/tinydrm/ili9225.c +++ b/drivers/gpu/drm/tinydrm/ili9225.c @@ -20,6 +20,7 @@ #include <linux/spi/spi.h> #include <video/mipi_display.h> +#include <drm/drm_fb_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/tinydrm/mipi-dbi.h> #include <drm/tinydrm/tinydrm-helpers.h> @@ -381,7 +382,7 @@ static struct drm_driver ili9225_driver = { DRIVER_ATOMIC, .fops = &ili9225_fops, TINYDRM_GEM_DRIVER_OPS, - .lastclose = tinydrm_lastclose, + .lastclose = drm_fb_helper_lastclose, .name = "ili9225", .desc = "Ilitek ILI9225", .date = "20171106", @@ -390,13 +391,13 @@ static struct drm_driver ili9225_driver = { }; static const struct of_device_id ili9225_of_match[] = { - { .compatible = "ilitek,ili9225-2.2in-176x220" }, + { .compatible = "vot,v220hf01a-t" }, {}, }; MODULE_DEVICE_TABLE(of, ili9225_of_match); static const struct spi_device_id ili9225_id[] = { - { "ili9225-2.2in-176x220", 0 }, + { "v220hf01a-t", 0 }, { }, }; MODULE_DEVICE_TABLE(spi, ili9225_id); |