From afa59bb2cf67960d18409ed16a352fa7f25d0c93 Mon Sep 17 00:00:00 2001 From: Tetsuyuki Kobayashi Date: Fri, 14 Sep 2012 18:14:29 +0900 Subject: [PATCH] --- yaml --- r: 340163 b: refs/heads/master c: 608c5620d90c016f9cdb7b90a14761849cf344b2 h: refs/heads/master i: 340161: 18045247ae3a05c9caed7ddcf3ed7e34330daf90 340159: fa3bc8347a1573084df39a8bf186c4d41035e061 v: v3 --- [refs] | 2 +- trunk/arch/arm/configs/kzm9g_defconfig | 2 ++ trunk/arch/arm/mach-shmobile/board-kzm9g.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7865b754f64b..038946f2258d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cec0123bb762eb90753f61a0e5a0c2ff91aec25 +refs/heads/master: 608c5620d90c016f9cdb7b90a14761849cf344b2 diff --git a/trunk/arch/arm/configs/kzm9g_defconfig b/trunk/arch/arm/configs/kzm9g_defconfig index 1404b0487801..ce99e3e00efa 100644 --- a/trunk/arch/arm/configs/kzm9g_defconfig +++ b/trunk/arch/arm/configs/kzm9g_defconfig @@ -74,6 +74,8 @@ CONFIG_KEYBOARD_GPIO=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ST1232=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_ADXL34X=y # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI_NR_UARTS=9 diff --git a/trunk/arch/arm/mach-shmobile/board-kzm9g.c b/trunk/arch/arm/mach-shmobile/board-kzm9g.c index a37da78687f2..1a4642200747 100644 --- a/trunk/arch/arm/mach-shmobile/board-kzm9g.c +++ b/trunk/arch/arm/mach-shmobile/board-kzm9g.c @@ -562,6 +562,10 @@ static struct i2c_board_info i2c0_devices[] = { I2C_BOARD_INFO("ak8975", 0x0c), .irq = intcs_evt2irq(0x3380), /* IRQ28 */ }, + { + I2C_BOARD_INFO("adxl34x", 0x1d), + .irq = intcs_evt2irq(0x3340), /* IRQ26 */ + }, }; static struct i2c_board_info i2c1_devices[] = {