msm: mdss: update header file with DP audio APIs

The current header file supports hdmi and audio interaction
using the exposed APIs. Update the common structures and the
APIs to support display port and hdmi interaction
with audio codec driver.

CRs-Fixed: 1009284
Change-Id: I3962fd0cbc278c403584e767611f11d841e14d4e
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>

7 files changed, 21 insertions, 20 deletions

diff --git a/drivers/video/fbdev/msm/mdss_dba_utils.c b/drivers/video/fbdev/msm/mdss_dba_utils.c
index b14a83e863ab..fa78bd0166ea 100644
--- a/drivers/video/fbdev/msm/mdss_dba_utils.c
+++ b/drivers/video/fbdev/msm/mdss_dba_utils.c
@@ -300,7 +300,7 @@ static void mdss_dba_utils_dba_cb(void *data, enum msm_dba_callback_event event)
 	bool operands_present = false;
 	u32 no_of_operands, size, i;
 	u32 operands_offset = MAX_CEC_FRAME_SIZE - MAX_OPERAND_SIZE;
-	struct msm_hdmi_audio_edid_blk blk;
+	struct msm_ext_disp_audio_edid_blk blk;
 
 	if (!udata) {
 		pr_err("Invalid data\n");
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_audio.c b/drivers/video/fbdev/msm/mdss_hdmi_audio.c
index d949a86a8f5d..780629eb25b9 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_audio.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_audio.c
@@ -64,7 +64,7 @@ enum hdmi_audio_sample_rates {
 
 struct hdmi_audio {
 	struct dss_io_data *io;
-	struct msm_hdmi_audio_setup_params params;
+	struct msm_ext_disp_audio_setup_params params;
 	struct switch_dev sdev;
 	u32 pclk;
 	bool ack_enabled;
@@ -145,7 +145,7 @@ static void hdmi_audio_acr_enable(struct hdmi_audio *audio)
 {
 	struct dss_io_data *io;
 	struct hdmi_audio_acr acr;
-	struct msm_hdmi_audio_setup_params *params;
+	struct msm_ext_disp_audio_setup_params *params;
 	u32 pclk, layout, multiplier, sample_rate;
 	u32 acr_pkt_ctl, aud_pkt_ctl2, acr_reg_cts, acr_reg_n;
 
@@ -327,7 +327,7 @@ end:
 }
 
 static int hdmi_audio_on(void *ctx, u32 pclk,
-	struct msm_hdmi_audio_setup_params *params)
+	struct msm_ext_disp_audio_setup_params *params)
 {
 	struct hdmi_audio *audio = ctx;
 	int rc = 0;
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_audio.h b/drivers/video/fbdev/msm/mdss_hdmi_audio.h
index c53bfd9b1ff2..57670a84988c 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_audio.h
+++ b/drivers/video/fbdev/msm/mdss_hdmi_audio.h
@@ -14,7 +14,7 @@
 #define __MDSS_HDMI_AUDIO_H__
 
 #include <linux/mdss_io_util.h>
-#include <linux/msm_hdmi.h>
+#include <linux/msm_ext_display.h>
 
 #define AUDIO_ACK_SET_ENABLE BIT(5)
 #define AUDIO_ACK_ENABLE BIT(4)
@@ -46,7 +46,7 @@ struct hdmi_audio_status {
  */
 struct hdmi_audio_ops {
 	int (*on)(void *ctx, u32 pclk,
-		struct msm_hdmi_audio_setup_params *params);
+		struct msm_ext_disp_audio_setup_params *params);
 	void (*off)(void *ctx);
 	void (*reset)(void *ctx);
 	void (*status)(void *ctx, struct hdmi_audio_status *status);
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_edid.c b/drivers/video/fbdev/msm/mdss_hdmi_edid.c
index f5c45571f0d2..018d7519bf8f 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_edid.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_edid.c
@@ -2365,7 +2365,8 @@ bool hdmi_edid_get_sink_scrambler_support(void *input)
 	return scramble_support;
 }
 
-int hdmi_edid_get_audio_blk(void *input, struct msm_hdmi_audio_edid_blk *blk)
+int hdmi_edid_get_audio_blk(void *input,
+				struct msm_ext_disp_audio_edid_blk *blk)
 {
 	struct hdmi_edid_ctrl *edid_ctrl = (struct hdmi_edid_ctrl *)input;
 
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_edid.h b/drivers/video/fbdev/msm/mdss_hdmi_edid.h
index d485e370d3aa..6cf0f1240f8a 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_edid.h
+++ b/drivers/video/fbdev/msm/mdss_hdmi_edid.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2016, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -13,7 +13,7 @@
 #ifndef __HDMI_EDID_H__
 #define __HDMI_EDID_H__
 
-#include <linux/msm_hdmi.h>
+#include <linux/msm_ext_display.h>
 #include "mdss_hdmi_util.h"
 
 #define EDID_BLOCK_SIZE 0x80
@@ -35,7 +35,7 @@ u32 hdmi_edid_get_sink_mode(void *edid_ctrl);
 bool hdmi_edid_get_sink_scrambler_support(void *input);
 bool hdmi_edid_get_scdc_support(void *input);
 int hdmi_edid_get_audio_blk(void *edid_ctrl,
-	struct msm_hdmi_audio_edid_blk *blk);
+	struct msm_ext_disp_audio_edid_blk *blk);
 void hdmi_edid_set_video_resolution(void *edid_ctrl, u32 resolution,
 	bool reset);
 void hdmi_edid_deinit(void *edid_ctrl);
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c
index b300c4aba599..94b7bf02ccd0 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c
@@ -245,7 +245,7 @@ fail:
 	return rc;
 }
 
-int register_hdmi_cable_notification(struct hdmi_cable_notify *handler)
+int register_hdmi_cable_notification(struct ext_disp_cable_notify *handler)
 {
 	struct hdmi_tx_ctrl *hdmi_ctrl = NULL;
 	struct list_head *pos;
@@ -271,7 +271,7 @@ int register_hdmi_cable_notification(struct hdmi_cable_notify *handler)
 	return handler->status;
 } /* register_hdmi_cable_notification */
 
-int unregister_hdmi_cable_notification(struct hdmi_cable_notify *handler)
+int unregister_hdmi_cable_notification(struct ext_disp_cable_notify *handler)
 {
 	struct hdmi_tx_ctrl *hdmi_ctrl = NULL;
 
@@ -297,7 +297,7 @@ int unregister_hdmi_cable_notification(struct hdmi_cable_notify *handler)
 static void hdmi_tx_cable_notify_work(struct work_struct *work)
 {
 	struct hdmi_tx_ctrl *hdmi_ctrl = NULL;
-	struct hdmi_cable_notify *pos;
+	struct ext_disp_cable_notify *pos;
 
 	hdmi_ctrl = container_of(work, struct hdmi_tx_ctrl, cable_notify_work);
 
@@ -3060,7 +3060,7 @@ static void hdmi_tx_phy_reset(struct hdmi_tx_ctrl *hdmi_ctrl)
 } /* hdmi_tx_phy_reset */
 
 static int hdmi_tx_audio_info_setup(struct platform_device *pdev,
-	struct msm_hdmi_audio_setup_params *params)
+	struct msm_ext_disp_audio_setup_params *params)
 {
 	int rc = 0;
 	struct hdmi_tx_ctrl *hdmi_ctrl = platform_get_drvdata(pdev);
@@ -3077,7 +3077,7 @@ static int hdmi_tx_audio_info_setup(struct platform_device *pdev,
 
 	if (!is_mode_dvi && hdmi_tx_is_panel_on(hdmi_ctrl)) {
 		memcpy(&hdmi_ctrl->audio_params, params,
-			sizeof(struct msm_hdmi_audio_setup_params));
+			sizeof(struct msm_ext_disp_audio_setup_params));
 
 		hdmi_tx_audio_setup(hdmi_ctrl);
 	} else {
@@ -3103,7 +3103,7 @@ static int hdmi_tx_audio_info_setup(struct platform_device *pdev,
 }
 
 static int hdmi_tx_get_audio_edid_blk(struct platform_device *pdev,
-	struct msm_hdmi_audio_edid_blk *blk)
+	struct msm_ext_disp_audio_edid_blk *blk)
 {
 	struct hdmi_tx_ctrl *hdmi_ctrl = platform_get_drvdata(pdev);
 
@@ -3217,7 +3217,7 @@ static int hdmi_tx_get_cable_status(struct platform_device *pdev, u32 vote)
 }
 
 int msm_hdmi_register_audio_codec(struct platform_device *pdev,
-	struct msm_hdmi_audio_codec_ops *ops)
+	struct msm_ext_disp_audio_codec_ops *ops)
 {
 	struct hdmi_tx_ctrl *hdmi_ctrl = platform_get_drvdata(pdev);
 
@@ -3228,7 +3228,7 @@ int msm_hdmi_register_audio_codec(struct platform_device *pdev,
 
 	ops->audio_info_setup = hdmi_tx_audio_info_setup;
 	ops->get_audio_edid_blk = hdmi_tx_get_audio_edid_blk;
-	ops->hdmi_cable_status = hdmi_tx_get_cable_status;
+	ops->cable_status = hdmi_tx_get_cable_status;
 
 	return 0;
 } /* hdmi_tx_audio_register */
@@ -3473,7 +3473,7 @@ static inline void hdmi_tx_audio_off(struct hdmi_tx_ctrl *hdmi_ctrl)
 		hdmi_ctrl->audio_ops.off(hdmi_ctrl->audio_data);
 
 	memset(&hdmi_ctrl->audio_params, 0,
-		sizeof(struct msm_hdmi_audio_setup_params));
+		sizeof(struct msm_ext_disp_audio_setup_params));
 }
 
 static int hdmi_tx_power_off(struct mdss_panel_data *panel_data)
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.h b/drivers/video/fbdev/msm/mdss_hdmi_tx.h
index 170837dcc9e6..a33ed2d4a3d1 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_tx.h
+++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.h
@@ -194,7 +194,7 @@ struct hdmi_tx_ctrl {
 	struct cec_ops hdmi_cec_ops;
 	struct cec_cbs hdmi_cec_cbs;
 	struct hdmi_audio_ops audio_ops;
-	struct msm_hdmi_audio_setup_params audio_params;
+	struct msm_ext_disp_audio_setup_params audio_params;
 
 	char disp_switch_name[MAX_SWITCH_NAME_SIZE];
 	bool power_data_enable[HDMI_TX_MAX_PM];