Commit 2e6777e8 authored by Kieran Bingham's avatar Kieran Bingham Committed by Archit Taneja
Browse files

drm: bridge: dw-hdmi: Remove device type from platform data 



The device type isn't used anymore now that workarounds and PHY-specific
operations are performed based on version information read at runtime.
Remove it.

Signed-off-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarJose Abreu <joabreu@synopsys.com>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170303172007.26541-9-laurent.pinchart+renesas@ideasonboard.com
parent 2ef9dfed

drivers/gpu/drm/bridge/dw-hdmi.c

+0 −2
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ struct dw_hdmi { 
	struct drm_connector connector;

	struct drm_bridge bridge;



	enum dw_hdmi_devtype dev_type;

	unsigned int version;



	struct platform_device *audio;
@@ -2014,7 +2013,6 @@ __dw_hdmi_probe(struct platform_device *pdev, 


	hdmi->plat_data = plat_data;

	hdmi->dev = dev;

	hdmi->dev_type = plat_data->dev_type;

	hdmi->sample_rate = 48000;

	hdmi->disabled = true;

	hdmi->rxsense = true;

drivers/gpu/drm/imx/dw_hdmi-imx.c

+0 −2
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ static struct dw_hdmi_plat_data imx6q_hdmi_drv_data = { 
	.mpll_cfg   = imx_mpll_cfg,

	.cur_ctr    = imx_cur_ctr,

	.phy_config = imx_phy_config,

	.dev_type   = IMX6Q_HDMI,

	.mode_valid = imx6q_hdmi_mode_valid,

};
@@ -183,7 +182,6 @@ static struct dw_hdmi_plat_data imx6dl_hdmi_drv_data = { 
	.mpll_cfg = imx_mpll_cfg,

	.cur_ctr  = imx_cur_ctr,

	.phy_config = imx_phy_config,

	.dev_type = IMX6DL_HDMI,

	.mode_valid = imx6dl_hdmi_mode_valid,

};

drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

+0 −1
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ static const struct dw_hdmi_plat_data rockchip_hdmi_drv_data = { 
	.mpll_cfg   = rockchip_mpll_cfg,

	.cur_ctr    = rockchip_cur_ctr,

	.phy_config = rockchip_phy_config,

	.dev_type   = RK3288_HDMI,

};



static const struct of_device_id dw_hdmi_rockchip_dt_ids[] = {

include/drm/bridge/dw_hdmi.h

+0 −7
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ enum { 
	DW_HDMI_RES_MAX,

};



enum dw_hdmi_devtype {

	IMX6Q_HDMI,

	IMX6DL_HDMI,

	RK3288_HDMI,

};



enum dw_hdmi_phy_type {

	DW_HDMI_PHY_DWC_HDMI_TX_PHY = 0x00,

	DW_HDMI_PHY_DWC_MHL_PHY_HEAC = 0xb2,
@@ -65,7 +59,6 @@ struct dw_hdmi_phy_ops { 
};



struct dw_hdmi_plat_data {

	enum dw_hdmi_devtype dev_type;

	enum drm_mode_status (*mode_valid)(struct drm_connector *connector,

					   struct drm_display_mode *mode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE