Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9aaf880e authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman
Browse files

imx-drm: Add mx6 hdmi transmitter support 



Add mx6 hdmi transmitter support.

Original work has been done by Sascha Hauer and Tony Prisk.
Special thanks to Russell King for his carefully review, many bug fixes and
testing of the mx6 HDMI driver.

Tested on the following boards:
- mx6q sabresd
- mx6dl sabresd
- mx6solo wandboard

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf4063e6

drivers/staging/imx-drm/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -53,3 +53,9 @@ config DRM_IMX_IPUV3 
	depends on DRM_IMX_IPUV3_CORE

	help

	  Choose this if you have a i.MX5 or i.MX6 processor.



config DRM_IMX_HDMI

	tristate "Freescale i.MX DRM HDMI"

	depends on DRM_IMX

	help

	  Choose this if you want to use HDMI on i.MX6.

drivers/staging/imx-drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ obj-$(CONFIG_DRM_IMX_IPUV3_CORE) += ipu-v3/ 


imx-ipuv3-crtc-objs  := ipuv3-crtc.o ipuv3-plane.o

obj-$(CONFIG_DRM_IMX_IPUV3)	+= imx-ipuv3-crtc.o

obj-$(CONFIG_DRM_IMX_HDMI) += imx-hdmi.o

drivers/staging/imx-drm/imx-hdmi.c

0 → 100644
+1916 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/staging/imx-drm/imx-hdmi.h

0 → 100644
+1032 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/mfd/syscon/imx6q-iomuxc-gpr.h

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ 
#define IMX6Q_GPR3_MIPI_MUX_CTL_IPU1_DI1	(0x1 << 4)

#define IMX6Q_GPR3_MIPI_MUX_CTL_IPU2_DI0	(0x2 << 4)

#define IMX6Q_GPR3_MIPI_MUX_CTL_IPU2_DI1	(0x3 << 4)

#define IMX6Q_GPR3_HDMI_MUX_CTL_SHIFT		2

#define IMX6Q_GPR3_HDMI_MUX_CTL_MASK		(0x3 << 2)

#define IMX6Q_GPR3_HDMI_MUX_CTL_IPU1_DI0	(0x0 << 2)

#define IMX6Q_GPR3_HDMI_MUX_CTL_IPU1_DI1	(0x1 << 2)