aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2014-06-18 05:58:02 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-07-04 04:17:58 -0400
commit9fb1737dffa542d61b2e708eee109d3783849dc3 (patch)
tree7c5c962b80b395876a38a2b8acf21e238f917852 /drivers
parent8c071caa7e9c584a97ca3cd33015b1d97d4f2250 (diff)
OMAPDSS: add hdmi ops to hdmi-connector and tpd12s015
Add pass-through functions for set_infoframe and set_hdmi_mode to hdmi-connector and tpd12s015 drivers. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/fbdev/omap2/displays-new/connector-hdmi.c19
-rw-r--r--drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c20
2 files changed, 39 insertions, 0 deletions
diff --git a/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c b/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
index 4420ccb69aa9..131c6e260898 100644
--- a/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
+++ b/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
@@ -262,6 +262,23 @@ static int hdmic_audio_config(struct omap_dss_device *dssdev,
262 return 0; 262 return 0;
263} 263}
264 264
265static int hdmic_set_hdmi_mode(struct omap_dss_device *dssdev, bool hdmi_mode)
266{
267 struct panel_drv_data *ddata = to_panel_data(dssdev);
268 struct omap_dss_device *in = ddata->in;
269
270 return in->ops.hdmi->set_hdmi_mode(in, hdmi_mode);
271}
272
273static int hdmic_set_infoframe(struct omap_dss_device *dssdev,
274 const struct hdmi_avi_infoframe *avi)
275{
276 struct panel_drv_data *ddata = to_panel_data(dssdev);
277 struct omap_dss_device *in = ddata->in;
278
279 return in->ops.hdmi->set_infoframe(in, avi);
280}
281
265static struct omap_dss_driver hdmic_driver = { 282static struct omap_dss_driver hdmic_driver = {
266 .connect = hdmic_connect, 283 .connect = hdmic_connect,
267 .disconnect = hdmic_disconnect, 284 .disconnect = hdmic_disconnect,
@@ -277,6 +294,8 @@ static struct omap_dss_driver hdmic_driver = {
277 294
278 .read_edid = hdmic_read_edid, 295 .read_edid = hdmic_read_edid,
279 .detect = hdmic_detect, 296 .detect = hdmic_detect,
297 .set_hdmi_mode = hdmic_set_hdmi_mode,
298 .set_hdmi_infoframe = hdmic_set_infoframe,
280 299
281 .audio_enable = hdmic_audio_enable, 300 .audio_enable = hdmic_audio_enable,
282 .audio_disable = hdmic_audio_disable, 301 .audio_disable = hdmic_audio_disable,
diff --git a/drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c b/drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c
index 7e33686171e3..c891d8f84cb2 100644
--- a/drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c
+++ b/drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c
@@ -242,6 +242,24 @@ static int tpd_audio_config(struct omap_dss_device *dssdev,
242 return in->ops.hdmi->audio_config(in, audio); 242 return in->ops.hdmi->audio_config(in, audio);
243} 243}
244 244
245static int tpd_set_infoframe(struct omap_dss_device *dssdev,
246 const struct hdmi_avi_infoframe *avi)
247{
248 struct panel_drv_data *ddata = to_panel_data(dssdev);
249 struct omap_dss_device *in = ddata->in;
250
251 return in->ops.hdmi->set_infoframe(in, avi);
252}
253
254static int tpd_set_hdmi_mode(struct omap_dss_device *dssdev,
255 bool hdmi_mode)
256{
257 struct panel_drv_data *ddata = to_panel_data(dssdev);
258 struct omap_dss_device *in = ddata->in;
259
260 return in->ops.hdmi->set_hdmi_mode(in, hdmi_mode);
261}
262
245static const struct omapdss_hdmi_ops tpd_hdmi_ops = { 263static const struct omapdss_hdmi_ops tpd_hdmi_ops = {
246 .connect = tpd_connect, 264 .connect = tpd_connect,
247 .disconnect = tpd_disconnect, 265 .disconnect = tpd_disconnect,
@@ -255,6 +273,8 @@ static const struct omapdss_hdmi_ops tpd_hdmi_ops = {
255 273
256 .read_edid = tpd_read_edid, 274 .read_edid = tpd_read_edid,
257 .detect = tpd_detect, 275 .detect = tpd_detect,
276 .set_infoframe = tpd_set_infoframe,
277 .set_hdmi_mode = tpd_set_hdmi_mode,
258 278
259 .audio_enable = tpd_audio_enable, 279 .audio_enable = tpd_audio_enable,
260 .audio_disable = tpd_audio_disable, 280 .audio_disable = tpd_audio_disable,