summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTetsuyuki Kobayashi <koba@kmckk.co.jp>2012-09-14 11:14:28 +0200
committerSimon Horman <horms@verge.net.au>2012-10-30 08:21:07 +0100
commit8cec0123bb762eb90753f61a0e5a0c2ff91aec25 (patch)
treeb1c334cebb4db4814b2ee2f5c560708e9e2a94b6
parentLinux 3.7-rc1 (diff)
downloadlinux-8cec0123bb762eb90753f61a0e5a0c2ff91aec25.tar.xz
linux-8cec0123bb762eb90753f61a0e5a0c2ff91aec25.zip
ARM: shmobile: kzm9g: enable magnetometer ak8975.
This patch enables magnetometer ak8975. I checked ak8975_probe() returns successfully. Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--arch/arm/configs/kzm9g_defconfig2
-rw-r--r--arch/arm/mach-shmobile/board-kzm9g.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index c88b57886e79..1404b0487801 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -119,6 +119,8 @@ CONFIG_DMADEVICES=y
CONFIG_SH_DMAE=y
CONFIG_ASYNC_TX_DMA=y
CONFIG_STAGING=y
+CONFIG_SENSORS_AK8975=y
+CONFIG_IIO=y
# CONFIG_DNOTIFY is not set
CONFIG_INOTIFY_USER=y
CONFIG_VFAT_FS=y
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 0a43f3189c21..a37da78687f2 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -557,7 +557,11 @@ static struct i2c_board_info i2c0_devices[] = {
},
{
I2C_BOARD_INFO("r2025sd", 0x32),
- }
+ },
+ {
+ I2C_BOARD_INFO("ak8975", 0x0c),
+ .irq = intcs_evt2irq(0x3380), /* IRQ28 */
+ },
};
static struct i2c_board_info i2c1_devices[] = {