drm/gm12u320: Move driver to drm/tiny

Move the driver to the new haven for tiny DRM drivers.

Cc: Hans de Goede <hdegoede@redhat.com>
Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190725105132.22545-4-noralf@tronnes.org

diff --git a/MAINTAINERS b/MAINTAINERS
index 00c7cbc92711064942f81cb4c8382a2d57f7c297..6fe3462a1f7ae19c6db53347117bb7d1a4a277a8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5099,7 +5099,7 @@ DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS
 M:     Hans de Goede <hdegoede@redhat.com>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
-F:     drivers/gpu/drm/gm12u320/
+F:     drivers/gpu/drm/tiny/gm12u320.c
 
 DRM DRIVER FOR ILITEK ILI9225 PANELS
 M:     David Lechner <david@lechnology.com>

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index a5ae0d369e88b88c92d291a71d91e1f2532ef345..e6f40fb54c9afe7e911d0f37ada462768515624f 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -358,8 +358,6 @@ source "drivers/gpu/drm/aspeed/Kconfig"
 
 source "drivers/gpu/drm/mcde/Kconfig"
 
-source "drivers/gpu/drm/gm12u320/Kconfig"
-
 # Keep legacy drivers last
 
 menuconfig DRM_LEGACY

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 1d366c4bbd1fb17c4090bdfc7ab58e55316da86d..10f8329a8b71b2cc10deb38ac49f44fa7837b15a 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -121,4 +121,3 @@ obj-$(CONFIG_DRM_LIMA)  += lima/
 obj-$(CONFIG_DRM_PANFROST) += panfrost/
 obj-$(CONFIG_DRM_ASPEED_GFX) += aspeed/
 obj-$(CONFIG_DRM_MCDE) += mcde/
-obj-$(CONFIG_DRM_GM12U320) += gm12u320/

diff --git a/drivers/gpu/drm/gm12u320/Kconfig b/drivers/gpu/drm/gm12u320/Kconfig
deleted file mode 100644 (file)
index 0882a61..0000000
--- a/drivers/gpu/drm/gm12u320/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-config DRM_GM12U320
-       tristate "GM12U320 driver for USB projectors"
-       depends on DRM && USB
-       select DRM_KMS_HELPER
-       select DRM_GEM_SHMEM_HELPER
-       help
-        This is a KMS driver for projectors which use the GM12U320 chipset
-        for video transfer over USB2/3, such as the Acer C120 mini projector.

diff --git a/drivers/gpu/drm/gm12u320/Makefile b/drivers/gpu/drm/gm12u320/Makefile
deleted file mode 100644 (file)
index ea51438..0000000
--- a/drivers/gpu/drm/gm12u320/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-obj-$(CONFIG_DRM_GM12U320) += gm12u320.o

diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig
index f8c9a0e71dde889fb1f7337bb74b192cc7ef7475..504763423d463a69122e3fe92870c8bec8b63aad 100644 (file)
--- a/drivers/gpu/drm/tiny/Kconfig
+++ b/drivers/gpu/drm/tiny/Kconfig
@@ -1,4 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0-only
+
+config DRM_GM12U320
+       tristate "GM12U320 driver for USB projectors"
+       depends on DRM && USB
+       select DRM_KMS_HELPER
+       select DRM_GEM_SHMEM_HELPER
+       help
+        This is a KMS driver for projectors which use the GM12U320 chipset
+        for video transfer over USB2/3, such as the Acer C120 mini projector.
+
 config TINYDRM_HX8357D
        tristate "DRM support for HX8357D display panels"
        depends on DRM && SPI

diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile
index 6490167a9ad141851da7a5c0f2a28ae1aef95aab..896cf31132d397b6ac80fc2d8f87d355b06bb78a 100644 (file)
--- a/drivers/gpu/drm/tiny/Makefile
+++ b/drivers/gpu/drm/tiny/Makefile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+obj-$(CONFIG_DRM_GM12U320)             += gm12u320.o
 obj-$(CONFIG_TINYDRM_HX8357D)          += hx8357d.o
 obj-$(CONFIG_TINYDRM_ILI9225)          += ili9225.o
 obj-$(CONFIG_TINYDRM_ILI9341)          += ili9341.o

diff --git a/drivers/gpu/drm/gm12u320/gm12u320.c b/drivers/gpu/drm/tiny/gm12u320.c
similarity index 100%
rename from drivers/gpu/drm/gm12u320/gm12u320.c
rename to drivers/gpu/drm/tiny/gm12u320.c