From cd8d7f90d8d6205e712d65a8bab00ad6bc430b42 Mon Sep 17 00:00:00 2001
From: ChenJQ <chenjq@rock-chips.com>
Date: Tue, 17 Aug 2010 18:29:50 -0700
Subject: [PATCH] Chang wm8994 i2c3 to i2c0 in board of info.

---
 arch/arm/mach-rk2818/board-infosdk.c | 52 +++++++++++++++-------------
 arch/arm/mach-rk2818/board-raho.c    | 36 +++++++++----------
 2 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/arch/arm/mach-rk2818/board-infosdk.c b/arch/arm/mach-rk2818/board-infosdk.c
index 2f6ff7ac4f19..25bac267ff39 100755
--- a/arch/arm/mach-rk2818/board-infosdk.c
+++ b/arch/arm/mach-rk2818/board-infosdk.c
@@ -330,6 +330,24 @@ struct rk2818_gs_platform_data rk2818_gs_platdata = {
 	.gsensor_irq_pin = GS_IRQ_PIN,
 };
 
+/*****************************************************************************************
+ * wm8994  codec
+ * author: cjq@rock-chips.com
+ *****************************************************************************************/
+static struct wm8994_platform_data wm8994_data = {
+    .mic_input = 0,
+    .micBase_vcc = 0,
+    .bb_input = 0, 
+    .bb_output = 0,
+    .frequence = 0,
+    .enable_pin = 0,
+    .headset_pin = 0,
+    .headset_call_vol = 0,
+    .speaker_call_vol = 0,
+    .earpiece_call_vol = 0,
+    .bt_call_vol = 0,
+};// must initialize 
+
 /*****************************************************************************************
  * i2c devices
  * author: kfx@rock-chips.com
@@ -409,6 +427,14 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
 		.flags			= 0,
 	}
 #endif	
+#if defined (CONFIG_SND_SOC_WM8994)
+	{
+		.type    		= "wm8994",
+		.addr           = 0x1a,
+		.flags			= 0,
+		.platform_data  = &wm8994_data,
+	},
+#endif
 };
 static struct i2c_board_info __initdata board_i2c1_devices[] = {
 #if defined (CONFIG_RTC_HYM8563)
@@ -464,32 +490,8 @@ static struct i2c_board_info __initdata board_i2c1_devices[] = {
 static struct i2c_board_info __initdata board_i2c2_devices[] = {
 
 };
-/*****************************************************************************************
- * wm8994  codec
- * author: cjq@rock-chips.com
- *****************************************************************************************/
-static struct wm8994_platform_data wm8994_data = {
-    .mic_input = 0,
-    .micBase_vcc = 0,
-    .bb_input = 0, 
-    .bb_output = 0,
-    .frequence = 0,
-    .enable_pin = 0,
-    .headset_pin = 0,
-    .headset_call_vol = 0,
-    .speaker_call_vol = 0,
-    .earpiece_call_vol = 0,
-    .bt_call_vol = 0,
-};// must initialize 
 static struct i2c_board_info __initdata board_i2c3_devices[] = {
-#if defined (CONFIG_SND_SOC_WM8994)
-	{
-		.type    		= "wm8994",
-		.addr           = 0x1a,
-		.flags			= 0,
-		.platform_data  = &wm8994_data,
-	},
-#endif
+
 };	
 
 /*****************************************************************************************
diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c
index 294b544e1efe..61103639a66c 100755
--- a/arch/arm/mach-rk2818/board-raho.c
+++ b/arch/arm/mach-rk2818/board-raho.c
@@ -507,6 +507,24 @@ struct rk2818_gs_platform_data rk2818_gs_platdata = {
 	.gsensor_irq_pin = GS_IRQ_PIN,
 };
 
+/*****************************************************************************************
+ * wm8994  codec
+ * author: cjq@rock-chips.com
+ *****************************************************************************************/
+static struct wm8994_platform_data wm8994_data = {
+    .mic_input = 0,
+    .micBase_vcc = 0,
+    .bb_input = 0, 
+    .bb_output = 0,
+    .frequence = 0,
+    .enable_pin = 0,
+    .headset_pin = 0,
+    .headset_call_vol = 0,
+    .speaker_call_vol = 0,
+    .earpiece_call_vol = 0,
+    .bt_call_vol = 0,
+};// must initialize 
+
 /*****************************************************************************************
  * i2c devices
  * author: kfx@rock-chips.com
@@ -642,24 +660,6 @@ static struct i2c_board_info __initdata board_i2c2_devices[] = {
 
 };
 
-/*****************************************************************************************
- * wm8994  codec
- * author: cjq@rock-chips.com
- *****************************************************************************************/
-static struct wm8994_platform_data wm8994_data = {
-    .mic_input = 0,
-    .micBase_vcc = 0,
-    .bb_input = 0, 
-    .bb_output = 0,
-    .frequence = 0,
-    .enable_pin = 0,
-    .headset_pin = 0,
-    .headset_call_vol = 0,
-    .speaker_call_vol = 0,
-    .earpiece_call_vol = 0,
-    .bt_call_vol = 0,
-};// must initialize 
-
 static struct i2c_board_info __initdata board_i2c3_devices[] = {
 #if defined (CONFIG_SND_SOC_WM8994)
 	{
-- 
2.34.1