Skip to content

Commit 9b8f320

Browse files
marcusfolkessonmartinezjavier
authored andcommitted
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 <[email protected]> Suggested-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Marcus Folkesson <[email protected]> Acked-by: Thomas Zimmermann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Javier Martinez Canillas <[email protected]>
1 parent 84953fc commit 9b8f320

File tree

10 files changed

+60
-47
lines changed

10 files changed

+60
-47
lines changed

MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7695,13 +7695,13 @@ M: David Lechner <[email protected]>
76957695
S: Maintained
76967696
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
76977697
F: Documentation/devicetree/bindings/display/sitronix,st7586.txt
7698-
F: drivers/gpu/drm/tiny/st7586.c
7698+
F: drivers/gpu/drm/sitronix/st7586.c
76997699

77007700
DRM DRIVER FOR SITRONIX ST7571 PANELS
77017701
M: Marcus Folkesson <[email protected]>
77027702
S: Maintained
77037703
F: Documentation/devicetree/bindings/display/sitronix,st7571.yaml
7704-
F: drivers/gpu/drm/tiny/st7571-i2c.c
7704+
F: drivers/gpu/drm/sitronix/st7571-i2c.c
77057705

77067706
DRM DRIVER FOR SITRONIX ST7701 PANELS
77077707
M: Jagan Teki <[email protected]>
@@ -7722,7 +7722,7 @@ M: David Lechner <[email protected]>
77227722
S: Maintained
77237723
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
77247724
F: Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
7725-
F: drivers/gpu/drm/tiny/st7735r.c
7725+
F: drivers/gpu/drm/sitronix/st7735r.c
77267726

77277727
DRM DRIVER FOR SOLOMON SSD130X OLED DISPLAYS
77287728
M: Javier Martinez Canillas <[email protected]>

drivers/gpu/drm/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ source "drivers/gpu/drm/xlnx/Kconfig"
385385

386386
source "drivers/gpu/drm/gud/Kconfig"
387387

388+
source "drivers/gpu/drm/sitronix/Kconfig"
389+
388390
source "drivers/gpu/drm/solomon/Kconfig"
389391

390392
source "drivers/gpu/drm/sprd/Kconfig"

drivers/gpu/drm/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ obj-$(CONFIG_DRM_TIDSS) += tidss/
221221
obj-y += xlnx/
222222
obj-y += gud/
223223
obj-$(CONFIG_DRM_HYPERV) += hyperv/
224+
obj-y += sitronix/
224225
obj-y += solomon/
225226
obj-$(CONFIG_DRM_SPRD) += sprd/
226227
obj-$(CONFIG_DRM_LOONGSON) += loongson/

drivers/gpu/drm/sitronix/Kconfig

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
config DRM_ST7571_I2C
2+
tristate "DRM support for Sitronix ST7571 display panels (I2C)"
3+
depends on DRM && I2C && MMU
4+
select DRM_CLIENT_SELECTION
5+
select DRM_GEM_SHMEM_HELPER
6+
select DRM_KMS_HELPER
7+
select REGMAP_I2C
8+
help
9+
DRM driver for Sitronix ST7571 panels controlled over I2C.
10+
11+
if M is selected the module will be called st7571-i2c.
12+
13+
config TINYDRM_ST7586
14+
tristate
15+
default n
16+
17+
config DRM_ST7586
18+
tristate "DRM support for Sitronix ST7586 display panels"
19+
depends on DRM && SPI
20+
select DRM_CLIENT_SELECTION
21+
select DRM_KMS_HELPER
22+
select DRM_GEM_DMA_HELPER
23+
select DRM_MIPI_DBI
24+
default TINYDRM_ST7586
25+
help
26+
DRM driver for the following Sitronix ST7586 panels:
27+
* LEGO MINDSTORMS EV3
28+
29+
If M is selected the module will be called st7586.
30+
31+
config TINYDRM_ST7735R
32+
tristate
33+
default n
34+
35+
config DRM_ST7735R
36+
tristate "DRM support for Sitronix ST7715R/ST7735R display panels"
37+
depends on DRM && SPI
38+
select DRM_CLIENT_SELECTION
39+
select DRM_KMS_HELPER
40+
select DRM_GEM_DMA_HELPER
41+
select DRM_MIPI_DBI
42+
select BACKLIGHT_CLASS_DEVICE
43+
default TINYDRM_ST7735R
44+
help
45+
DRM driver for Sitronix ST7715R/ST7735R with one of the following
46+
LCDs:
47+
* Jianda JD-T18003-T01 1.8" 128x160 TFT
48+
* Okaya RH128128T 1.44" 128x128 TFT
49+
50+
If M is selected the module will be called st7735r.
51+

drivers/gpu/drm/sitronix/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
obj-$(CONFIG_DRM_ST7571_I2C) += st7571-i2c.o
2+
obj-$(CONFIG_DRM_ST7586) += st7586.o
3+
obj-$(CONFIG_DRM_ST7735R) += st7735r.o
File renamed without changes.
File renamed without changes.

drivers/gpu/drm/tiny/Kconfig

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -199,44 +199,3 @@ config TINYDRM_SHARP_MEMORY
199199
* 4.40" Sharp Memory LCD (LS044Q7DH01)
200200

201201
If M is selected the module will be called sharp_memory.
202-
203-
config TINYDRM_ST7586
204-
tristate "DRM support for Sitronix ST7586 display panels"
205-
depends on DRM && SPI
206-
select DRM_CLIENT_SELECTION
207-
select DRM_KMS_HELPER
208-
select DRM_GEM_DMA_HELPER
209-
select DRM_MIPI_DBI
210-
help
211-
DRM driver for the following Sitronix ST7586 panels:
212-
* LEGO MINDSTORMS EV3
213-
214-
If M is selected the module will be called st7586.
215-
216-
config DRM_ST7571_I2C
217-
tristate "DRM support for Sitronix ST7571 display panels (I2C)"
218-
depends on DRM && I2C && MMU
219-
select DRM_CLIENT_SELECTION
220-
select DRM_GEM_SHMEM_HELPER
221-
select DRM_KMS_HELPER
222-
select REGMAP_I2C
223-
help
224-
DRM driver for Sitronix ST7571 panels controlled over I2C.
225-
226-
if M is selected the module will be called st7571-i2c.
227-
228-
config TINYDRM_ST7735R
229-
tristate "DRM support for Sitronix ST7715R/ST7735R display panels"
230-
depends on DRM && SPI
231-
select DRM_CLIENT_SELECTION
232-
select DRM_KMS_HELPER
233-
select DRM_GEM_DMA_HELPER
234-
select DRM_MIPI_DBI
235-
select BACKLIGHT_CLASS_DEVICE
236-
help
237-
DRM driver for Sitronix ST7715R/ST7735R with one of the following
238-
LCDs:
239-
* Jianda JD-T18003-T01 1.8" 128x160 TFT
240-
* Okaya RH128128T 1.44" 128x128 TFT
241-
242-
If M is selected the module will be called st7735r.

drivers/gpu/drm/tiny/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ obj-$(CONFIG_DRM_BOCHS) += bochs.o
66
obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus-qemu.o
77
obj-$(CONFIG_DRM_GM12U320) += gm12u320.o
88
obj-$(CONFIG_DRM_PANEL_MIPI_DBI) += panel-mipi-dbi.o
9-
obj-$(CONFIG_DRM_ST7571_I2C) += st7571-i2c.o
109
obj-$(CONFIG_TINYDRM_HX8357D) += hx8357d.o
1110
obj-$(CONFIG_TINYDRM_ILI9163) += ili9163.o
1211
obj-$(CONFIG_TINYDRM_ILI9225) += ili9225.o
@@ -15,5 +14,3 @@ obj-$(CONFIG_TINYDRM_ILI9486) += ili9486.o
1514
obj-$(CONFIG_TINYDRM_MI0283QT) += mi0283qt.o
1615
obj-$(CONFIG_TINYDRM_REPAPER) += repaper.o
1716
obj-$(CONFIG_TINYDRM_SHARP_MEMORY) += sharp-memory.o
18-
obj-$(CONFIG_TINYDRM_ST7586) += st7586.o
19-
obj-$(CONFIG_TINYDRM_ST7735R) += st7735r.o

0 commit comments

Comments
 (0)