board a22: add ak8975, remove mmc3280, update defconfig

diff --git a/arch/arm/configs/rk29_a22_defconfig b/arch/arm/configs/rk29_a22_defconfig
old mode 100644 (file)
new mode 100755 (executable)
index 8d0db39..bcadeb0
--- a/arch/arm/configs/rk29_a22_defconfig
+++ b/arch/arm/configs/rk29_a22_defconfig
@@ -884,9 +884,10 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_GPIO is not set
 # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 CONFIG_INPUT_WM831X_ON=y
-# CONFIG_MAG_SENSORS is not set
+CONFIG_MAG_SENSORS=y
+CONFIG_COMPASS_AK8975=y
 # CONFIG_COMPASS_AK8973 is not set
-CONFIG_COMPASS_MMC328X=y
+# CONFIG_COMPASS_MMC328X is not set
 CONFIG_G_SENSOR_DEVICE=y
 # CONFIG_GS_MMA7660 is not set
 CONFIG_GS_MMA8452=y

diff --git a/arch/arm/mach-rk29/board-rk29-a22.c b/arch/arm/mach-rk29/board-rk29-a22.c
index a4074bb761816d97ca3d04bd27395880ec1cebf7..3044a2af0dc828e103881331c996c38cd4785006 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-a22.c
+++ b/arch/arm/mach-rk29/board-rk29-a22.c
@@ -1628,7 +1628,7 @@ static struct i2c_board_info __initdata board_i2c0_devices[] = {
                .type                   = "ak8975",
                .addr           = 0x0d,
                .flags                  = 0,
-               .irq                    = RK29_PIN0_PA4,
+               .irq                    = RK29_PIN6_PC5,
        },
 #endif
 #if defined (CONFIG_COMPASS_MMC328X)