diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-29 19:14:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-29 19:14:20 -0700 |
| commit | 6f177c586ea230d952f278b26f36ea44c388cecd (patch) | |
| tree | cede5006f7ebe140a5c4465877fe4d2ac45d0bd9 /include/linux | |
| parent | 1c39aaa3b8aa77dfc5c8b02d3f3735a3e6b5ac14 (diff) | |
| parent | fb5a1b12767548c57674d4c039aba8e42fbc834b (diff) | |
Merge "ARM: dts: msm: add audio codec as child of MSM External display"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/msm_ext_display.h | 55 |
1 files changed, 7 insertions, 48 deletions
diff --git a/include/linux/msm_ext_display.h b/include/linux/msm_ext_display.h index 54c99d9cb245..873a778d5370 100644 --- a/include/linux/msm_ext_display.h +++ b/include/linux/msm_ext_display.h @@ -133,58 +133,17 @@ int msm_ext_disp_register_audio_codec(struct platform_device *pdev, struct msm_ext_disp_audio_codec_ops *ops); /* + * msm_hdmi_register_audio_codec() - wrapper for hdmi audio codec registration + * @pdev: platform device pointer + * @codec_ops: audio codec operations + */ +int msm_hdmi_register_audio_codec(struct platform_device *pdev, + struct msm_ext_disp_audio_codec_ops *ops); +/* * msm_ext_disp_register_intf() - display interface registration * @init_data: data needed to register the display interface */ int msm_ext_disp_register_intf(struct platform_device *pdev, struct msm_ext_disp_init_data *init_data); -/* TODO: remove all the display specific functions below */ -#ifdef CONFIG_FB_MSM_MDSS_DP_PANEL -int msm_dp_register_audio_codec(struct platform_device *pdev, - struct msm_ext_disp_audio_codec_ops *ops); - -#else -static inline int msm_dp_register_audio_codec(struct platform_device *pdev, - struct msm_ext_disp_audio_codec_ops *ops) { - return 0; -} -#endif /* CONFIG_FB_MSM_MDSS_DP_PANEL */ -#ifdef CONFIG_FB_MSM_MDSS_HDMI_PANEL -/* - * Register for HDMI cable connect or disconnect notification. - * @param handler callback handler for notification - * @return negative value as error otherwise current status of cable - */ -int register_hdmi_cable_notification( - struct ext_disp_cable_notify *handler); - -/* - * Un-register for HDMI cable connect or disconnect notification. - * @param handler callback handler for notification - * @return negative value as error - */ -int unregister_hdmi_cable_notification( - struct ext_disp_cable_notify *handler); - -int msm_hdmi_register_audio_codec(struct platform_device *pdev, - struct msm_ext_disp_audio_codec_ops *ops); - -#else -static inline int register_hdmi_cable_notification( - struct ext_disp_cable_notify *handler) { - return 0; -} - -static inline int unregister_hdmi_cable_notification( - struct ext_disp_cable_notify *handler) { - return 0; -} - -static inline int msm_hdmi_register_audio_codec(struct platform_device *pdev, - struct msm_ext_disp_audio_codec_ops *ops) { - return 0; -} -#endif /* CONFIG_FB_MSM_MDSS_HDMI_PANEL */ - #endif /*_MSM_EXT_DISPLAY_H_*/ |