From: Sandor Yu <R01008@freescale.com>
Date: Thu, 8 Dec 2011 06:35:13 +0000 (+0800)
Subject: ENGR00156855 [mx6q arm2] HDMI EDID read failed
X-Git-Tag: v3.0.35-fsl~1801
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ba4cbfc518d275868f4cea3ccf787c5b86947e50;p=karo-tx-linux.git

ENGR00156855 [mx6q arm2] HDMI EDID read failed

It cause by some HDMI sink device not support I2C 400kbps access.
Change EDID I2C speed from 400kbps to 100bps.

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

diff --git a/arch/arm/mach-mx6/board-mx6q_arm2.c b/arch/arm/mach-mx6/board-mx6q_arm2.c
index 6dbaee50603a..0bfebc84a8ad 100644
--- a/arch/arm/mach-mx6/board-mx6q_arm2.c
+++ b/arch/arm/mach-mx6/board-mx6q_arm2.c
@@ -731,14 +731,18 @@ static struct i2c_board_info mxc_i2c0_board_info[] __initdata = {
 	},
 };
 
-static struct imxi2c_platform_data mx6q_arm2_i2c_data = {
-	.bitrate = 400000,
+static struct imxi2c_platform_data mx6q_arm2_i2c0_data = {
+	.bitrate = 100000,
 };
 
-static struct imxi2c_platform_data mx6q_arm2_i2c0_data = {
+static struct imxi2c_platform_data mx6q_arm2_i2c1_data = {
 	.bitrate = 100000,
 };
 
+static struct imxi2c_platform_data mx6q_arm2_i2c2_data = {
+	.bitrate = 400000,
+};
+
 static struct i2c_board_info mxc_i2c2_board_info[] __initdata = {
 	{
 		I2C_BOARD_INFO("max7310", 0x1F),
@@ -1490,13 +1494,13 @@ static void __init mx6_board_init(void)
 	imx6q_add_imx_snvs_rtc();
 
 	imx6q_add_imx_i2c(0, &mx6q_arm2_i2c0_data);
-	imx6q_add_imx_i2c(1, &mx6q_arm2_i2c_data);
+	imx6q_add_imx_i2c(1, &mx6q_arm2_i2c1_data);
 	i2c_register_board_info(0, mxc_i2c0_board_info,
 			ARRAY_SIZE(mxc_i2c0_board_info));
 	i2c_register_board_info(1, mxc_i2c1_board_info,
 			ARRAY_SIZE(mxc_i2c1_board_info));
 	if (!spdif_en) {
-		imx6q_add_imx_i2c(2, &mx6q_arm2_i2c_data);
+		imx6q_add_imx_i2c(2, &mx6q_arm2_i2c2_data);
 		i2c_register_board_info(2, mxc_i2c2_board_info,
 				ARRAY_SIZE(mxc_i2c2_board_info));
 	}