From: yzq <yzq@rock-chips.com>
Date: Wed, 9 Jan 2013 01:48:35 +0000 (+0800)
Subject: rk610:fix rk30 board macro config
X-Git-Tag: firefly_0821_release~7981
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=411635c3fc40eef4e072c4b11442d73fa29f8948;p=firefly-linux-kernel-4.4.55.git

rk610:fix rk30 board macro config
---

diff --git a/arch/arm/mach-rk30/board-rk30-ds1001b.c b/arch/arm/mach-rk30/board-rk30-ds1001b.c
index 9c2b64fe1acf..efcdbb9647d8 100644
--- a/arch/arm/mach-rk30/board-rk30-ds1001b.c
+++ b/arch/arm/mach-rk30/board-rk30-ds1001b.c
@@ -1370,7 +1370,7 @@ static struct i2c_board_info __initdata i2c0_info[] = {
 			.flags			= 0,
 		},
 #endif
-#ifdef CONFIG_RK610_HDMI
+#ifdef CONFIG_HDMI_RK610
 		{
 			.type			= "rk610_hdmi",
 			.addr			= 0x46,
diff --git a/arch/arm/mach-rk30/board-rk30-ds975.c b/arch/arm/mach-rk30/board-rk30-ds975.c
index 0cdeb8926789..6294f41603f3 100755
--- a/arch/arm/mach-rk30/board-rk30-ds975.c
+++ b/arch/arm/mach-rk30/board-rk30-ds975.c
@@ -1819,7 +1819,7 @@ static struct i2c_board_info __initdata i2c0_info[] = {
 			.flags			= 0,
 		},
 #endif
-#ifdef CONFIG_RK610_HDMI
+#ifdef CONFIG_HDMI_RK610
 		{
 			.type			= "rk610_hdmi",
 			.addr			= 0x46,
@@ -1888,7 +1888,7 @@ static struct i2c_board_info __initdata i2c1_info[] = {
 			.flags			= 0,
 		},
 #endif
-#ifdef CONFIG_RK610_HDMI
+#ifdef CONFIG_HDMI_RK610
 		{
 			.type			= "rk610_hdmi",
 			.addr			= 0x46,
diff --git a/arch/arm/mach-rk30/board-rk30-phone-a22.c b/arch/arm/mach-rk30/board-rk30-phone-a22.c
index c3c8be34f630..001e77f64759 100755
--- a/arch/arm/mach-rk30/board-rk30-phone-a22.c
+++ b/arch/arm/mach-rk30/board-rk30-phone-a22.c
@@ -1692,7 +1692,7 @@ static struct i2c_board_info __initdata i2c0_info[] = {
 			.flags			= 0,
 		},
 #endif
-#ifdef CONFIG_RK610_HDMI
+#ifdef CONFIG_HDMI_RK610
 		{
 			.type			= "rk610_hdmi",
 			.addr			= 0x46,
diff --git a/arch/arm/mach-rk30/board-rk30-phone-loquat.c b/arch/arm/mach-rk30/board-rk30-phone-loquat.c
index 777c9416c149..a2e08f930e72 100755
--- a/arch/arm/mach-rk30/board-rk30-phone-loquat.c
+++ b/arch/arm/mach-rk30/board-rk30-phone-loquat.c
@@ -1810,7 +1810,7 @@ static struct i2c_board_info __initdata i2c0_info[] = {
 			.flags			= 0,
 		},
 #endif
-#ifdef CONFIG_RK610_HDMI
+#ifdef CONFIG_HDMI_RK610
 		{
 			.type			= "rk610_hdmi",
 			.addr			= 0x46,
diff --git a/arch/arm/mach-rk30/board-rk30-phone.c b/arch/arm/mach-rk30/board-rk30-phone.c
index cd7016f15580..0f474cab3cd8 100755
--- a/arch/arm/mach-rk30/board-rk30-phone.c
+++ b/arch/arm/mach-rk30/board-rk30-phone.c
@@ -1825,7 +1825,7 @@ static struct i2c_board_info __initdata i2c0_info[] = {
 			.flags			= 0,
 		},
 #endif
-#ifdef CONFIG_RK610_HDMI
+#ifdef CONFIG_HDMI_RK610
 		{
 			.type			= "rk610_hdmi",
 			.addr			= 0x46,
diff --git a/arch/arm/mach-rk30/board-rk30-phonepad.c b/arch/arm/mach-rk30/board-rk30-phonepad.c
index d6e378baf40e..c9e157fb5cb6 100755
--- a/arch/arm/mach-rk30/board-rk30-phonepad.c
+++ b/arch/arm/mach-rk30/board-rk30-phonepad.c
@@ -2648,7 +2648,7 @@ static struct i2c_board_info __initdata i2c0_info[] = {
 			.flags			= 0,
 		},
 #endif
-#ifdef CONFIG_RK610_HDMI
+#ifdef CONFIG_HDMI_RK610
 		{
 			.type			= "rk610_hdmi",
 			.addr			= 0x46,
diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index 3342297f52af..beb6a3ce237c 100755
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -1523,12 +1523,12 @@ static struct i2c_board_info __initdata i2c0_info[] = {
 			.flags			= 0,
 		},
 #endif
-#ifdef CONFIG_RK610_HDMI
+#ifdef CONFIG_HDMI_RK610
 		{
 			.type			= "rk610_hdmi",
 			.addr			= 0x46,
 			.flags			= 0,
-			.irq			= RK29_PIN5_PA2,
+			.irq			= INVALID_GPIO,
 		},
 #endif
 #ifdef CONFIG_SND_SOC_RK610