From: Sandor Yu <R01008@freescale.com>
Date: Thu, 27 Dec 2012 10:14:52 +0000 (+0800)
Subject: ENGR00238391 MX6x HDMI: Add default EDID config function when read EDID failed
X-Git-Tag: v3.0.35-fsl~177
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e59cc4f6e00abc673e8568569627868dc4d8334a;p=karo-tx-linux.git

ENGR00238391 MX6x HDMI: Add default EDID config function when read EDID failed

Add default EDID config function when read EDID failed.
Fix HDMI no audio issue  when failed read EDID.

Signed-off-by: Sandor Yu <R01008@freescale.com>
---

diff --git a/drivers/video/mxc_hdmi.c b/drivers/video/mxc_hdmi.c
index 284c6e5e5a5e..09b8823d3c15 100644
--- a/drivers/video/mxc_hdmi.c
+++ b/drivers/video/mxc_hdmi.c
@@ -1560,6 +1560,12 @@ static void mxc_hdmi_edid_rebuild_modelist(struct mxc_hdmi *hdmi)
 	console_unlock();
 }
 
+static void  mxc_hdmi_default_edid_cfg(struct mxc_hdmi *hdmi)
+{
+	/* Default setting HDMI working in HDMI mode */
+	hdmi->edid_cfg.hdmi_cap = true;
+}
+
 static void  mxc_hdmi_default_modelist(struct mxc_hdmi *hdmi)
 {
 	u32 i;
@@ -1680,8 +1686,10 @@ static void mxc_hdmi_cable_connected(struct mxc_hdmi *hdmi)
 	case HDMI_EDID_SAME:
 		break;
 
-	case HDMI_EDID_NO_MODES:
 	case HDMI_EDID_FAIL:
+		mxc_hdmi_default_edid_cfg(hdmi);
+		/* No break here  */
+	case HDMI_EDID_NO_MODES:
 	default:
 		mxc_hdmi_default_modelist(hdmi);
 		break;