From 5668a0905555ec75f4654bae4bc05fad2c9b1d49 Mon Sep 17 00:00:00 2001
From: lyx <lyx@rock-chips.com>
Date: Fri, 25 Mar 2011 19:59:27 -0700
Subject: [PATCH] update phonesdk defconfig

---
 arch/arm/configs/rk29_phonesdk_defconfig  | 7 ++++++-
 arch/arm/mach-rk29/board-malata.c         | 4 ++--
 arch/arm/mach-rk29/board-rk29-aigo.c      | 4 ++--
 arch/arm/mach-rk29/board-rk29-phonesdk.c  | 4 ++--
 arch/arm/mach-rk29/board-rk29-winaccord.c | 4 ++--
 arch/arm/mach-rk29/board-rk29sdk.c        | 4 ++--
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/arch/arm/configs/rk29_phonesdk_defconfig b/arch/arm/configs/rk29_phonesdk_defconfig
index 309a1c84544f..a0aac47bc274 100644
--- a/arch/arm/configs/rk29_phonesdk_defconfig
+++ b/arch/arm/configs/rk29_phonesdk_defconfig
@@ -836,10 +836,15 @@ CONFIG_INPUT_LPSENSOR_ISL29028=y
 # CONFIG_INPUT_GPIO is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 CONFIG_INPUT_WM831X_ON=y
+
+#
+# Magnetometer sensors
+#
+CONFIG_COMPASS_AK8975=y
+# CONFIG_COMPASS_AK8973 is not set
 CONFIG_G_SENSOR_DEVICE=y
 # CONFIG_GS_MMA7660 is not set
 CONFIG_GS_MMA8452=y
-CONFIG_GS_FIH=y
 # CONFIG_INPUT_JOGBALL is not set
 
 #
diff --git a/arch/arm/mach-rk29/board-malata.c b/arch/arm/mach-rk29/board-malata.c
index 305db83e83fe..2328aa3c1cc2 100755
--- a/arch/arm/mach-rk29/board-malata.c
+++ b/arch/arm/mach-rk29/board-malata.c
@@ -557,7 +557,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
       .platform_data  = &mma8452_info,
     },
 #endif
-#if defined (CONFIG_SENSORS_AK8973)
+#if defined (CONFIG_COMPASS_AK8973)
 	{
 		.type    		= "ak8973",
 		.addr           = 0x1d,
@@ -565,7 +565,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
 		.irq			= RK29_PIN0_PA4,
 	},
 #endif
-#if defined (CONFIG_SENSORS_AK8975)
+#if defined (CONFIG_COMPASS_AK8975)
 	{
 		.type    		= "ak8975",
 		.addr           = 0x1d,
diff --git a/arch/arm/mach-rk29/board-rk29-aigo.c b/arch/arm/mach-rk29/board-rk29-aigo.c
index 774bb154e805..049c6c60f483 100755
--- a/arch/arm/mach-rk29/board-rk29-aigo.c
+++ b/arch/arm/mach-rk29/board-rk29-aigo.c
@@ -514,7 +514,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
       .platform_data  = &mma8452_info,
     },
 #endif
-#if defined (CONFIG_SENSORS_AK8973)
+#if defined (CONFIG_COMPASS_AK8973)
 	{
 		.type    		= "ak8973",
 		.addr           = 0x1d,
@@ -522,7 +522,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
 		.irq			= RK29_PIN0_PA4,
 	},
 #endif
-#if defined (CONFIG_SENSORS_AK8975)
+#if defined (CONFIG_COMPASS_AK8975)
 	{
 		.type    		= "ak8975",
 		.addr           = 0x1d,
diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk.c b/arch/arm/mach-rk29/board-rk29-phonesdk.c
index c2c3206e3180..f107a0c388dc 100755
--- a/arch/arm/mach-rk29/board-rk29-phonesdk.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk.c
@@ -1514,7 +1514,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
       .platform_data  = &mma8452_info,
     },
 #endif
-#if defined (CONFIG_SENSORS_AK8973)
+#if defined (CONFIG_COMPASS_AK8973)
 	{
 		.type    		= "ak8973",
 		.addr           = 0x1d,
@@ -1522,7 +1522,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
 		.irq			= RK29_PIN0_PA4,
 	},
 #endif
-#if defined (CONFIG_SENSORS_AK8975)
+#if defined (CONFIG_COMPASS_AK8975)
 	{
 		.type    		= "ak8975",
 		.addr           = 0x0d,
diff --git a/arch/arm/mach-rk29/board-rk29-winaccord.c b/arch/arm/mach-rk29/board-rk29-winaccord.c
index 3eb952058f53..558077e93110 100755
--- a/arch/arm/mach-rk29/board-rk29-winaccord.c
+++ b/arch/arm/mach-rk29/board-rk29-winaccord.c
@@ -464,7 +464,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
       .platform_data  = &mma8452_info,
     },
 #endif
-#if defined (CONFIG_SENSORS_AK8973)
+#if defined (CONFIG_COMPASS_AK8973)
 	{
 		.type    		= "ak8973",
 		.addr           = 0x1d,
@@ -472,7 +472,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
 		.irq			= RK29_PIN4_PA1,
 	},
 #endif
-#if defined (CONFIG_SENSORS_AK8975)
+#if defined (CONFIG_COMPASS_AK8975)
 	{
 		.type    		= "ak8975",
 		.addr           = 0x1d,
diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 3ed2784a978e..4efcf21cae73 100755
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -545,7 +545,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
       .platform_data  = &mma8452_info,
     },
 #endif
-#if defined (CONFIG_SENSORS_AK8973)
+#if defined (CONFIG_COMPASS_AK8973)
 	{
 		.type    		= "ak8973",
 		.addr           = 0x1d,
@@ -553,7 +553,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
 		.irq			= RK29_PIN0_PA4,
 	},
 #endif
-#if defined (CONFIG_SENSORS_AK8975)
+#if defined (CONFIG_COMPASS_AK8975)
 	{
 		.type    		= "ak8975",
 		.addr           = 0x0d,
-- 
2.34.1