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 9c2b64fe1acfc32078724eee168499e8285fdee2..efcdbb9647d8190d93c5491b4ab07555b3f1a3e7 100644 (file)
--- 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 0cdeb8926789f3143e2c22c2fa10e246a7e8dea7..6294f41603f362b5c415c6ce692123dacace44c5 100755 (executable)
--- 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 c3c8be34f630b8504fbdb75f19938e32483821c2..001e77f6475955142d5d08acf92cf2596c2728fd 100755 (executable)
--- 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 777c9416c149992d14f7e7381199a904e354fbfa..a2e08f930e72c259d02184481367d4e925df1866 100755 (executable)
--- 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 cd7016f155803864a9a57f59f16166155fdab3dd..0f474cab3cd89cea077f2d227ac7f1abf093bfeb 100755 (executable)
--- 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 d6e378baf40e878bbab25ca923c707475ae5e948..c9e157fb5cb696154baf8d19aaef2a5a14e187ba 100755 (executable)
--- 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 3342297f52af4459a63e3f14e46bc4a1b8911394..beb6a3ce237c3c72f116516043255919907974af 100755 (executable)
--- 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