update hdmi drivers: add k29phonepadsdk io control function

diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c
index f755656c009b12a4f0b95fb117b8e31c18fd88b1..6a03246fb45a29662b84f5959136ebbdc4c94837 100644 (file)
--- 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 55c5030385e35fdfc031c61d7e94514c44cfbe5e..757ac7e5a227309d4406b930b6ca73adfb8c9ee4 100755 (executable)
--- 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 faf7893c57a819173934e305a42281cae5bd6457..6aea88643dbfed89d3348bbeb66d45f25d11100b 100755 (executable)
--- 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 fc2d5f720b359e5fbc070b09437b98c694e29b39..c311f76e5cd357a4613b509cf5a9cfe2218bcbac 100644 (file)
--- 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 6c0865d40a3ca3466acf9f306c46ef4944532f12..f077b191c27589376d95b6edfaab6f6d3204c1de 100755 (executable)
--- 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