Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/imx: move IPUv3 driver into separate subdirectory

The IPUv3 and DCSS driver are two totally separate DRM drivers. Having
one of them live in the drivers/gpu/drm/imx toplevel directory and the
other one in the dcss/ subdirectory is confusing. Move the IPUv3 driver
into its own subdirectory to make the separation more clear.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20221125112519.3849636-1-l.stach@pengutronix.de
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20221125112519.3849636-1-l.stach@pengutronix.de

authored by

Lucas Stach and committed by
Philipp Zabel
4b6cb2b6 4333472f

+55 -50
+1 -1
MAINTAINERS
··· 6905 6905 L: dri-devel@lists.freedesktop.org 6906 6906 S: Maintained 6907 6907 F: Documentation/devicetree/bindings/display/imx/ 6908 - F: drivers/gpu/drm/imx/ 6908 + F: drivers/gpu/drm/imx/ipuv3/ 6909 6909 F: drivers/gpu/ipu-v3/ 6910 6910 6911 6911 DRM DRIVERS FOR FREESCALE IMX BRIDGE
+1 -40
drivers/gpu/drm/imx/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0-only 2 - config DRM_IMX 3 - tristate "DRM Support for Freescale i.MX" 4 - select DRM_KMS_HELPER 5 - select VIDEOMODE_HELPERS 6 - select DRM_GEM_DMA_HELPER 7 - depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM || COMPILE_TEST) 8 - depends on IMX_IPUV3_CORE 9 - help 10 - enable i.MX graphics support 11 - 12 - config DRM_IMX_PARALLEL_DISPLAY 13 - tristate "Support for parallel displays" 14 - select DRM_PANEL 15 - depends on DRM_IMX 16 - select VIDEOMODE_HELPERS 17 - 18 - config DRM_IMX_TVE 19 - tristate "Support for TV and VGA displays" 20 - depends on DRM_IMX 21 - depends on COMMON_CLK 22 - select REGMAP_MMIO 23 - help 24 - Choose this to enable the internal Television Encoder (TVe) 25 - found on i.MX53 processors. 26 - 27 - config DRM_IMX_LDB 28 - tristate "Support for LVDS displays" 29 - depends on DRM_IMX && MFD_SYSCON 30 - depends on COMMON_CLK 31 - select DRM_PANEL 32 - help 33 - Choose this to enable the internal LVDS Display Bridge (LDB) 34 - found on i.MX53 and i.MX6 processors. 35 - 36 - config DRM_IMX_HDMI 37 - tristate "Freescale i.MX DRM HDMI" 38 - select DRM_DW_HDMI 39 - depends on DRM_IMX && OF 40 - help 41 - Choose this if you want to use HDMI on i.MX6. 42 2 43 3 source "drivers/gpu/drm/imx/dcss/Kconfig" 4 + source "drivers/gpu/drm/imx/ipuv3/Kconfig"
+1 -9
drivers/gpu/drm/imx/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 3 - imxdrm-objs := imx-drm-core.o ipuv3-crtc.o ipuv3-plane.o 4 - 5 - obj-$(CONFIG_DRM_IMX) += imxdrm.o 6 - 7 - obj-$(CONFIG_DRM_IMX_PARALLEL_DISPLAY) += parallel-display.o 8 - obj-$(CONFIG_DRM_IMX_TVE) += imx-tve.o 9 - obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o 10 - 11 - obj-$(CONFIG_DRM_IMX_HDMI) += dw_hdmi-imx.o 12 3 obj-$(CONFIG_DRM_IMX_DCSS) += dcss/ 4 + obj-$(CONFIG_DRM_IMX) += ipuv3/
drivers/gpu/drm/imx/dw_hdmi-imx.c drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.c
drivers/gpu/drm/imx/imx-drm-core.c drivers/gpu/drm/imx/ipuv3/imx-drm-core.c
drivers/gpu/drm/imx/imx-drm.h drivers/gpu/drm/imx/ipuv3/imx-drm.h
drivers/gpu/drm/imx/imx-ldb.c drivers/gpu/drm/imx/ipuv3/imx-ldb.c
drivers/gpu/drm/imx/imx-tve.c drivers/gpu/drm/imx/ipuv3/imx-tve.c
drivers/gpu/drm/imx/ipuv3-crtc.c drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c
drivers/gpu/drm/imx/ipuv3-plane.c drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c
drivers/gpu/drm/imx/ipuv3-plane.h drivers/gpu/drm/imx/ipuv3/ipuv3-plane.h
+41
drivers/gpu/drm/imx/ipuv3/Kconfig
··· 1 + # SPDX-License-Identifier: GPL-2.0-only 2 + config DRM_IMX 3 + tristate "DRM Support for Freescale i.MX" 4 + select DRM_KMS_HELPER 5 + select VIDEOMODE_HELPERS 6 + select DRM_GEM_DMA_HELPER 7 + depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM || COMPILE_TEST) 8 + depends on IMX_IPUV3_CORE 9 + help 10 + enable i.MX graphics support 11 + 12 + config DRM_IMX_PARALLEL_DISPLAY 13 + tristate "Support for parallel displays" 14 + select DRM_PANEL 15 + depends on DRM_IMX 16 + select VIDEOMODE_HELPERS 17 + 18 + config DRM_IMX_TVE 19 + tristate "Support for TV and VGA displays" 20 + depends on DRM_IMX 21 + depends on COMMON_CLK 22 + select REGMAP_MMIO 23 + help 24 + Choose this to enable the internal Television Encoder (TVe) 25 + found on i.MX53 processors. 26 + 27 + config DRM_IMX_LDB 28 + tristate "Support for LVDS displays" 29 + depends on DRM_IMX && MFD_SYSCON 30 + depends on COMMON_CLK 31 + select DRM_PANEL 32 + help 33 + Choose this to enable the internal LVDS Display Bridge (LDB) 34 + found on i.MX53 and i.MX6 processors. 35 + 36 + config DRM_IMX_HDMI 37 + tristate "Freescale i.MX DRM HDMI" 38 + select DRM_DW_HDMI 39 + depends on DRM_IMX && OF 40 + help 41 + Choose this if you want to use HDMI on i.MX6.
+11
drivers/gpu/drm/imx/ipuv3/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + 3 + imxdrm-objs := imx-drm-core.o ipuv3-crtc.o ipuv3-plane.o 4 + 5 + obj-$(CONFIG_DRM_IMX) += imxdrm.o 6 + 7 + obj-$(CONFIG_DRM_IMX_PARALLEL_DISPLAY) += parallel-display.o 8 + obj-$(CONFIG_DRM_IMX_TVE) += imx-tve.o 9 + obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o 10 + 11 + obj-$(CONFIG_DRM_IMX_HDMI) += dw_hdmi-imx.o
drivers/gpu/drm/imx/parallel-display.c drivers/gpu/drm/imx/ipuv3/parallel-display.c