aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/fbtft
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-16 22:04:13 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-16 22:04:13 +0200
commit7dc074348eb85d48f7a1fa96879458f4becf68a7 (patch)
treeaf626c941574ea68f7d74da04d81e302fbc14a68 /drivers/staging/fbtft
parentMAINTAINERS: remove myself as staging FBTFT maintainer (diff)
parentLinux 4.19-rc4 (diff)
downloadlinux-dev-7dc074348eb85d48f7a1fa96879458f4becf68a7.tar.xz
linux-dev-7dc074348eb85d48f7a1fa96879458f4becf68a7.zip
Merge 4.19-rc4 into staging-next
Handle the merge issues and take the iio and staging driver fixes. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/fbtft')
-rw-r--r--drivers/staging/fbtft/TODO4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/fbtft/TODO b/drivers/staging/fbtft/TODO
index 7e64c7e438f0..a9f4802bb6be 100644
--- a/drivers/staging/fbtft/TODO
+++ b/drivers/staging/fbtft/TODO
@@ -2,3 +2,7 @@
GPIO descriptor API in <linux/gpio/consumer.h> and look up GPIO
lines from device tree, ACPI or board files, board files should
use <linux/gpio/machine.h>
+
+* convert all these over to drm_simple_display_pipe and submit for inclusion
+ into the DRM subsystem under drivers/gpu/drm - fbdev doesn't take any new
+ drivers anymore.