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

Commit 6fa44907 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPDSS: HDMI: use omapdss_version 



Use omapdss_version in hdmi.c to select the proper hdmi features.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent bd81ed08

drivers/video/omap2/dss/dss_features.c

+12 −2
Original line number Diff line number Diff line
@@ -825,10 +825,20 @@ static const struct ti_hdmi_ip_ops omap4_hdmi_functions = { 


};



void dss_init_hdmi_ip_ops(struct hdmi_ip_data *ip_data)

void dss_init_hdmi_ip_ops(struct hdmi_ip_data *ip_data,

		enum omapdss_version version)

{

	if (cpu_is_omap44xx())

	switch (version) {

	case OMAPDSS_VER_OMAP4430_ES1:

	case OMAPDSS_VER_OMAP4430_ES2:

	case OMAPDSS_VER_OMAP4:

		ip_data->ops = &omap4_hdmi_functions;

		break;

	default:

		ip_data->ops = NULL;

	}



	WARN_ON(ip_data->ops == NULL);

}

#endif

drivers/video/omap2/dss/dss_features.h

+2 −1
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ bool dss_has_feature(enum dss_feat_id id); 
void dss_feat_get_reg_field(enum dss_feat_reg_field id, u8 *start, u8 *end);

void dss_features_init(enum omapdss_version version);

#if defined(CONFIG_OMAP4_DSS_HDMI)

void dss_init_hdmi_ip_ops(struct hdmi_ip_data *ip_data);

void dss_init_hdmi_ip_ops(struct hdmi_ip_data *ip_data,

		enum omapdss_version version);

#endif

#endif

drivers/video/omap2/dss/hdmi.c

+2 −1
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ static void hdmi_runtime_put(void) 


static int __init hdmi_init_display(struct omap_dss_device *dssdev)

{

	struct omap_dss_board_info *pdata = hdmi.pdev->dev.platform_data;

	int r;



	struct gpio gpios[] = {
@@ -333,7 +334,7 @@ static int __init hdmi_init_display(struct omap_dss_device *dssdev) 


	DSSDBG("init_display\n");



	dss_init_hdmi_ip_ops(&hdmi.ip_data);

	dss_init_hdmi_ip_ops(&hdmi.ip_data, pdata->version);



	if (hdmi.vdda_hdmi_dac_reg == NULL) {

		struct regulator *reg;