drm/sitronix: move tiny Sitronix drivers to their own subdir

We start to have support many Sitronix displays in the tiny directory,
and we expect more to come.

Move them to their own subdirectory.

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Suggested-by: Javier Martinez Canillas <javierm@redhat.com>
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250512-sitronix-v3-1-bbf6cc413698@gmail.com
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index bcc4944a69916182d5001ba0bebb6fe32134a9ce..fe9773af465a867987dae6277d71820c0a7011a3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7695,13 +7695,13 @@ M:      David Lechner <david@lechnology.com>
 S:     Maintained
 T:     git https://gitlab.freedesktop.org/drm/misc/kernel.git
 F:     Documentation/devicetree/bindings/display/sitronix,st7586.txt
-F:     drivers/gpu/drm/tiny/st7586.c
+F:     drivers/gpu/drm/sitronix/st7586.c
 
 DRM DRIVER FOR SITRONIX ST7571 PANELS
 M:     Marcus Folkesson <marcus.folkesson@gmail.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/display/sitronix,st7571.yaml
-F:     drivers/gpu/drm/tiny/st7571-i2c.c
+F:     drivers/gpu/drm/sitronix/st7571-i2c.c
 
 DRM DRIVER FOR SITRONIX ST7701 PANELS
 M:     Jagan Teki <jagan@amarulasolutions.com>
@@ -7722,7 +7722,7 @@ M:        David Lechner <david@lechnology.com>
 S:     Maintained
 T:     git https://gitlab.freedesktop.org/drm/misc/kernel.git
 F:     Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
-F:     drivers/gpu/drm/tiny/st7735r.c
+F:     drivers/gpu/drm/sitronix/st7735r.c
 
 DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS
 M:     Javier Martinez Canillas <javierm@redhat.com>

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 5088698182d34e11b30ffacbffd8a6612fc0967b..9488fc01bca3a689f207b8ba75fcb142cc643463 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -385,6 +385,8 @@ source "drivers/gpu/drm/xlnx/Kconfig"
 
 source "drivers/gpu/drm/gud/Kconfig"
 
+source "drivers/gpu/drm/sitronix/Kconfig"
+
 source "drivers/gpu/drm/solomon/Kconfig"
 
 source "drivers/gpu/drm/sprd/Kconfig"

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index b5d5561bbe5fd72f3915e6a52f325fdb79c7981e..70510620f29c874e376c795fb05d426a0faae05c 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -221,6 +221,7 @@ obj-$(CONFIG_DRM_TIDSS) += tidss/
 obj-y                  += xlnx/
 obj-y                  += gud/
 obj-$(CONFIG_DRM_HYPERV) += hyperv/
+obj-y                  += sitronix/
 obj-y                  += solomon/
 obj-$(CONFIG_DRM_SPRD) += sprd/
 obj-$(CONFIG_DRM_LOONGSON) += loongson/

diff --git a/drivers/gpu/drm/sitronix/Kconfig b/drivers/gpu/drm/sitronix/Kconfig
new file mode 100644 (file)
index 0000000..c069d0d
--- /dev/null
+++ b/drivers/gpu/drm/sitronix/Kconfig
@@ -0,0 +1,51 @@
+config DRM_ST7571_I2C
+       tristate "DRM support for Sitronix ST7571 display panels (I2C)"
+       depends on DRM && I2C && MMU
+       select DRM_CLIENT_SELECTION
+       select DRM_GEM_SHMEM_HELPER
+       select DRM_KMS_HELPER
+       select REGMAP_I2C
+       help
+         DRM driver for Sitronix ST7571 panels controlled over I2C.
+
+         if M is selected the module will be called st7571-i2c.
+
+config TINYDRM_ST7586
+       tristate
+       default n
+
+config DRM_ST7586
+       tristate "DRM support for Sitronix ST7586 display panels"
+       depends on DRM && SPI
+       select DRM_CLIENT_SELECTION
+       select DRM_KMS_HELPER
+       select DRM_GEM_DMA_HELPER
+       select DRM_MIPI_DBI
+       default TINYDRM_ST7586
+       help
+         DRM driver for the following Sitronix ST7586 panels:
+         * LEGO MINDSTORMS EV3
+
+         If M is selected the module will be called st7586.
+
+config TINYDRM_ST7735R
+       tristate
+       default n
+
+config DRM_ST7735R
+       tristate "DRM support for Sitronix ST7715R/ST7735R display panels"
+       depends on DRM && SPI
+       select DRM_CLIENT_SELECTION
+       select DRM_KMS_HELPER
+       select DRM_GEM_DMA_HELPER
+       select DRM_MIPI_DBI
+       select BACKLIGHT_CLASS_DEVICE
+       default TINYDRM_ST7735R
+       help
+         DRM driver for Sitronix ST7715R/ST7735R with one of the following
+         LCDs:
+         * Jianda JD-T18003-T01 1.8" 128x160 TFT
+         * Okaya RH128128T 1.44" 128x128 TFT
+
+         If M is selected the module will be called st7735r.
+

diff --git a/drivers/gpu/drm/sitronix/Makefile b/drivers/gpu/drm/sitronix/Makefile
new file mode 100644 (file)
index 0000000..bd139e5
--- /dev/null
+++ b/drivers/gpu/drm/sitronix/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_DRM_ST7571_I2C)           += st7571-i2c.o
+obj-$(CONFIG_DRM_ST7586)               += st7586.o
+obj-$(CONFIG_DRM_ST7735R)              += st7735r.o

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

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

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

diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig
index daa1adbb1b43325d644ae13f3cabfc1bb01ff4d8..6d1b3e2cb3fbd8630864824ae985897b9d8095c7 100644 (file)
--- a/drivers/gpu/drm/tiny/Kconfig
+++ b/drivers/gpu/drm/tiny/Kconfig
@@ -199,44 +199,3 @@ config TINYDRM_SHARP_MEMORY
          * 4.40" Sharp Memory LCD (LS044Q7DH01)
 
          If M is selected the module will be called sharp_memory.
-
-config TINYDRM_ST7586
-       tristate "DRM support for Sitronix ST7586 display panels"
-       depends on DRM && SPI
-       select DRM_CLIENT_SELECTION
-       select DRM_KMS_HELPER
-       select DRM_GEM_DMA_HELPER
-       select DRM_MIPI_DBI
-       help
-         DRM driver for the following Sitronix ST7586 panels:
-         * LEGO MINDSTORMS EV3
-
-         If M is selected the module will be called st7586.
-
-config DRM_ST7571_I2C
-       tristate "DRM support for Sitronix ST7571 display panels (I2C)"
-       depends on DRM && I2C && MMU
-       select DRM_CLIENT_SELECTION
-       select DRM_GEM_SHMEM_HELPER
-       select DRM_KMS_HELPER
-       select REGMAP_I2C
-       help
-         DRM driver for Sitronix ST7571 panels controlled over I2C.
-
-         if M is selected the module will be called st7571-i2c.
-
-config TINYDRM_ST7735R
-       tristate "DRM support for Sitronix ST7715R/ST7735R display panels"
-       depends on DRM && SPI
-       select DRM_CLIENT_SELECTION
-       select DRM_KMS_HELPER
-       select DRM_GEM_DMA_HELPER
-       select DRM_MIPI_DBI
-       select BACKLIGHT_CLASS_DEVICE
-       help
-         DRM driver for Sitronix ST7715R/ST7735R with one of the following
-         LCDs:
-         * Jianda JD-T18003-T01 1.8" 128x160 TFT
-         * Okaya RH128128T 1.44" 128x128 TFT
-
-         If M is selected the module will be called st7735r.

diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile
index 0151590db5cbd80aebde0629afd03f47b83c3045..4a9ff61ec25420e2c0a648c04eaab7ca25dd5407 100644 (file)
--- a/drivers/gpu/drm/tiny/Makefile
+++ b/drivers/gpu/drm/tiny/Makefile
@@ -6,7 +6,6 @@ obj-$(CONFIG_DRM_BOCHS)                 += bochs.o
 obj-$(CONFIG_DRM_CIRRUS_QEMU)          += cirrus-qemu.o
 obj-$(CONFIG_DRM_GM12U320)             += gm12u320.o
 obj-$(CONFIG_DRM_PANEL_MIPI_DBI)       += panel-mipi-dbi.o
-obj-$(CONFIG_DRM_ST7571_I2C)           += st7571-i2c.o
 obj-$(CONFIG_TINYDRM_HX8357D)          += hx8357d.o
 obj-$(CONFIG_TINYDRM_ILI9163)          += ili9163.o
 obj-$(CONFIG_TINYDRM_ILI9225)          += ili9225.o
@@ -15,5 +14,3 @@ obj-$(CONFIG_TINYDRM_ILI9486)         += ili9486.o
 obj-$(CONFIG_TINYDRM_MI0283QT)         += mi0283qt.o
 obj-$(CONFIG_TINYDRM_REPAPER)          += repaper.o
 obj-$(CONFIG_TINYDRM_SHARP_MEMORY)     += sharp-memory.o
-obj-$(CONFIG_TINYDRM_ST7586)           += st7586.o
-obj-$(CONFIG_TINYDRM_ST7735R)          += st7735r.o