From 8270d3e2ea8002964bf221e33d898b3353ddc5dc Mon Sep 17 00:00:00 2001
From: kfx <kfx@rock-chips.com>
Date: Thu, 11 Aug 2011 10:56:18 +0800
Subject: [PATCH] update hdmi drivers: add k29phonepadsdk io control function

---
 arch/arm/mach-rk29/board-rk29-a22.c        |  6 +-----
 arch/arm/mach-rk29/board-rk29-ddr3sdk.c    |  6 +-----
 arch/arm/mach-rk29/board-rk29-phonesdk.c   | 11 +----------
 arch/arm/mach-rk29/board-rk29phonepadsdk.c | 15 +++++++++++++++
 arch/arm/mach-rk29/board-rk29sdk.c         |  6 +-----
 5 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c
index f755656c009b..6a03246fb45a 100644
--- a/arch/arm/mach-rk29/board-rk29-a22.c
+++ b/arch/arm/mach-rk29/board-rk29-a22.c
@@ -1741,12 +1741,8 @@ struct i2c_gpio_platform_data default_i2c3_data = {
 #endif
 #if defined (CONFIG_ANX7150)
 #define HDMI_VDD_CTL RK29_PIN6_PD3
-int anx7150_io_init(void)
-{
-	return 0;
-}
 struct hdmi_platform_data anx7150_data  = {
-	.io_init = anx7150_io_init,
+	//.io_init = anx7150_io_init,
 };
 #endif
 
diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index 55c5030385e3..757ac7e5a227 100755
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -790,12 +790,8 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
 };
 #endif
 #if defined (CONFIG_ANX7150)
-int anx7150_io_init(void)
-{
-	return 0;
-}
 struct hdmi_platform_data anx7150_data  = {
-	.io_init = anx7150_io_init,
+	//.io_init = anx7150_io_init,
 };
 #endif
 
diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
index faf7893c57a8..6aea88643dbf 100755
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -1798,17 +1798,8 @@ struct i2c_gpio_platform_data default_i2c3_data = {
 #endif
 
 #if defined (CONFIG_ANX7150)
-#define HDMI_VDD_CTL RK29_PIN6_PD3
-int anx7150_io_init(void)
-{
-	gpio_request(HDMI_VDD_CTL, "hdmi pwr ctl");
-	gpio_direction_output(HDMI_VDD_CTL, GPIO_HIGH);
-	//gpio_set_value(HDMI_VDD_CTL, GPIO_HIGH); 
-	mdelay(10);
-	return 0;
-}
 struct hdmi_platform_data anx7150_data = {
-	.io_init = anx7150_io_init,
+	//.io_init = anx7150_io_init,
 };
 #endif
 #ifdef CONFIG_I2C0_RK29
diff --git a/arch/arm/mach-rk29/board-rk29phonepadsdk.c b/arch/arm/mach-rk29/board-rk29phonepadsdk.c
index fc2d5f720b35..c311f76e5cd3 100644
--- a/arch/arm/mach-rk29/board-rk29phonepadsdk.c
+++ b/arch/arm/mach-rk29/board-rk29phonepadsdk.c
@@ -1139,6 +1139,20 @@ static struct i2c_board_info __initdata board_i2c2_devices[] = {
 #endif
 };
 #endif
+#if defined (CONFIG_ANX7150)
+#define HDMI_VDD_CTL RK29_PIN6_PD3
+int anx7150_io_init(void)
+{
+	gpio_request(HDMI_VDD_CTL, "hdmi pwr ctl");
+	gpio_direction_output(HDMI_VDD_CTL, GPIO_HIGH);
+	//gpio_set_value(HDMI_VDD_CTL, GPIO_HIGH); 
+	mdelay(10);
+	return 0;
+}
+struct hdmi_platform_data anx7150_data = {
+	.io_init = anx7150_io_init,
+};
+#endif
 
 #ifdef CONFIG_I2C3_RK29
 static struct i2c_board_info __initdata board_i2c3_devices[] = {
@@ -1148,6 +1162,7 @@ static struct i2c_board_info __initdata board_i2c3_devices[] = {
         .addr           = 0x39,             //0x39, 0x3d
         .flags          = 0,
         .irq            = RK29_PIN1_PD7,
+		.platform_data  = &anx7150_data,
     },
 #endif
 
diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 6c0865d40a3c..f077b191c275 100755
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -796,12 +796,8 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
 };
 #endif
 #if defined (CONFIG_ANX7150)
-int anx7150_io_init(void)
-{
-      return 0;
-}
 struct hdmi_platform_data anx7150_data = {
-       .io_init = anx7150_io_init,
+       //.io_init = anx7150_io_init,
 };
 #endif
 #ifdef CONFIG_I2C1_RK29
-- 
2.34.1