drm: imx: Move imx-drm driver out of staging

The imx-drm driver was put into staging mostly for the following reasons, all of which have been addressed or superseded: - convert the irq driver to use linear irq domains - work out the device tree bindings, this lead to the common of_graph bindings being used - factor out common helper functions, this mostly resulted in the component framework and drm of_graph helpers. Before adding new fixes, and certainly before adding new features, move it into its proper place below drivers/gpu/drm. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
LiZhengke · Nov 25, 2014 · 6556f7f · 6556f7f
1 parent 0364d4f
commit 6556f7f
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 20 deletions.
diff --git a/.../bindings/staging/imx-drm/fsl-imx-drm.txt → ...vicetree/bindings/drm/imx/fsl-imx-drm.txt b/.../bindings/staging/imx-drm/fsl-imx-drm.txt → ...vicetree/bindings/drm/imx/fsl-imx-drm.txt
diff --git a/...icetree/bindings/staging/imx-drm/hdmi.txt → ...tion/devicetree/bindings/drm/imx/hdmi.txt b/...icetree/bindings/staging/imx-drm/hdmi.txt → ...tion/devicetree/bindings/drm/imx/hdmi.txt
diff --git a/...vicetree/bindings/staging/imx-drm/ldb.txt → ...ation/devicetree/bindings/drm/imx/ldb.txt b/...vicetree/bindings/staging/imx-drm/ldb.txt → ...ation/devicetree/bindings/drm/imx/ldb.txt
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
@@ -202,3 +202,5 @@ source "drivers/gpu/drm/panel/Kconfig"
 source "drivers/gpu/drm/sti/Kconfig"
 
 source "drivers/gpu/drm/amd/amdkfd/Kconfig"
+
+source "drivers/gpu/drm/imx/Kconfig"
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
@@ -62,6 +62,7 @@ obj-$(CONFIG_DRM_BOCHS) += bochs/
 obj-$(CONFIG_DRM_MSM) += msm/
 obj-$(CONFIG_DRM_TEGRA) += tegra/
 obj-$(CONFIG_DRM_STI) += sti/
+obj-$(CONFIG_DRM_IMX) += imx/
 obj-y			+= i2c/
 obj-y			+= panel/
 obj-y			+= bridge/

diff --git a/drivers/staging/imx-drm/Kconfig → drivers/gpu/drm/imx/Kconfig b/drivers/staging/imx-drm/Kconfig → drivers/gpu/drm/imx/Kconfig
diff --git a/drivers/staging/imx-drm/Makefile → drivers/gpu/drm/imx/Makefile b/drivers/staging/imx-drm/Makefile → drivers/gpu/drm/imx/Makefile
diff --git a/drivers/staging/imx-drm/imx-drm-core.c → drivers/gpu/drm/imx/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c → drivers/gpu/drm/imx/imx-drm-core.c
diff --git a/drivers/staging/imx-drm/imx-drm.h → drivers/gpu/drm/imx/imx-drm.h b/drivers/staging/imx-drm/imx-drm.h → drivers/gpu/drm/imx/imx-drm.h
diff --git a/drivers/staging/imx-drm/imx-hdmi.c → drivers/gpu/drm/imx/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c → drivers/gpu/drm/imx/imx-hdmi.c
diff --git a/drivers/staging/imx-drm/imx-hdmi.h → drivers/gpu/drm/imx/imx-hdmi.h b/drivers/staging/imx-drm/imx-hdmi.h → drivers/gpu/drm/imx/imx-hdmi.h
diff --git a/drivers/staging/imx-drm/imx-ldb.c → drivers/gpu/drm/imx/imx-ldb.c b/drivers/staging/imx-drm/imx-ldb.c → drivers/gpu/drm/imx/imx-ldb.c
diff --git a/drivers/staging/imx-drm/imx-tve.c → drivers/gpu/drm/imx/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c → drivers/gpu/drm/imx/imx-tve.c
diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c → drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c → drivers/gpu/drm/imx/ipuv3-crtc.c
diff --git a/drivers/staging/imx-drm/ipuv3-plane.c → drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/staging/imx-drm/ipuv3-plane.c → drivers/gpu/drm/imx/ipuv3-plane.c
diff --git a/drivers/staging/imx-drm/ipuv3-plane.h → drivers/gpu/drm/imx/ipuv3-plane.h b/drivers/staging/imx-drm/ipuv3-plane.h → drivers/gpu/drm/imx/ipuv3-plane.h
diff --git a/drivers/staging/imx-drm/parallel-display.c → drivers/gpu/drm/imx/parallel-display.c b/drivers/staging/imx-drm/parallel-display.c → drivers/gpu/drm/imx/parallel-display.c
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
@@ -86,8 +86,6 @@ source "drivers/staging/gdm72xx/Kconfig"
 
 source "drivers/staging/gdm724x/Kconfig"
 
-source "drivers/staging/imx-drm/Kconfig"
-
 source "drivers/staging/fwserial/Kconfig"
 
 source "drivers/staging/goldfish/Kconfig"

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
@@ -36,7 +36,6 @@ obj-$(CONFIG_STAGING_BOARD)	+= board/
 obj-$(CONFIG_USB_WPAN_HCD)	+= ozwpan/
 obj-$(CONFIG_WIMAX_GDM72XX)	+= gdm72xx/
 obj-$(CONFIG_LTE_GDM724X)	+= gdm724x/
-obj-$(CONFIG_DRM_IMX)		+= imx-drm/
 obj-$(CONFIG_FIREWIRE_SERIAL)	+= fwserial/
 obj-$(CONFIG_GOLDFISH)		+= goldfish/
 obj-$(CONFIG_LUSTRE_FS)		+= lustre/

diff --git a/drivers/staging/imx-drm/TODO b/drivers/staging/imx-drm/TODO