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

Commit b21f4b65 authored by Andy Yan's avatar Andy Yan Committed by Philipp Zabel
Browse files

drm: imx: imx-hdmi: move imx-hdmi to bridge/dw_hdmi 



the original imx hdmi driver is under drm/imx/,
which depends on imx-drm, so move the imx hdmi
driver out to drm/bridge and rename it to dw_hdmi

Signed-off-by: default avatarAndy Yan <andy.yan@rock-chips.com>
Tested-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent aaa757a0

drivers/gpu/drm/bridge/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -3,3 +3,8 @@ config DRM_PTN3460 
	depends on DRM

	select DRM_KMS_HELPER

	---help---



config DRM_DW_HDMI

	tristate

	depends on DRM

	select DRM_KMS_HELPER

drivers/gpu/drm/bridge/Makefile

+1 −0
Original line number Diff line number Diff line 
ccflags-y := -Iinclude/drm



obj-$(CONFIG_DRM_PTN3460) += ptn3460.o

obj-$(CONFIG_DRM_DW_HDMI) += dw_hdmi.o

drivers/gpu/drm/imx/imx-hdmi.c→drivers/gpu/drm/bridge/dw_hdmi.c

+140 −138

File changed and moved.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/imx/imx-hdmi.h→drivers/gpu/drm/bridge/dw_hdmi.h

+0 −43
Original line number Diff line number Diff line
@@ -1030,47 +1030,4 @@ enum { 
	HDMI_A_VIDPOLCFG_HSYNCPOL_ACTIVE_LOW = 0x0,

};



enum imx_hdmi_devtype {

	IMX6Q_HDMI,

	IMX6DL_HDMI,

};



struct imx_hdmi_plat_data {

	enum imx_hdmi_devtype dev_type;

	const struct mpll_config *mpll_cfg;

	const struct curr_ctrl *cur_ctr;

	const struct sym_term *sym_term;

};



enum {

	RES_8,

	RES_10,

	RES_12,

	RES_MAX,

};



struct mpll_config {

	unsigned long mpixelclock;

	struct {

		u16 cpce;

		u16 gmp;

	} res[RES_MAX];

};



struct curr_ctrl {

	unsigned long mpixelclock;

	u16 curr[RES_MAX];

};



struct sym_term {

	unsigned long mpixelclock;

	u16 sym_ctr;    /*clock symbol and transmitter control*/

	u16 term;       /*transmission termination value*/

};



int imx_hdmi_bind(struct device *dev, struct device *master,

		  void *data, struct drm_encoder *encoder,

		  struct resource *iores, int irq,

		  const struct imx_hdmi_plat_data *plat_data);

void imx_hdmi_unbind(struct device *dev, struct device *master, void *data);

#endif /* __IMX_HDMI_H__ */

drivers/gpu/drm/imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ config DRM_IMX_IPUV3 


config DRM_IMX_HDMI

	tristate "Freescale i.MX DRM HDMI"

	select DRM_DW_HDMI

	depends on DRM_IMX

	help

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