From 3ba969f7b7a71c61c7aecae2332efeb4acee8609 Mon Sep 17 00:00:00 2001
From: Tony SIM <chinyeow.sim.xt@renesas.com>
Date: Tue, 7 Dec 2010 09:12:14 +0000
Subject: [PATCH] --- yaml --- r: 227184 b: refs/heads/master c:
 80f1dc7cc9341b160beb9c833edc1cd131f45a7f h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-shmobile/board-mackerel.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5fac90e1d1f7..5b23b8d19d26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a44d72a4058f870c305a23aa5cbc4cacb6758ea
+refs/heads/master: 80f1dc7cc9341b160beb9c833edc1cd131f45a7f
diff --git a/trunk/arch/arm/mach-shmobile/board-mackerel.c b/trunk/arch/arm/mach-shmobile/board-mackerel.c
index cf3e660d8e70..a0caa9e39c5a 100644
--- a/trunk/arch/arm/mach-shmobile/board-mackerel.c
+++ b/trunk/arch/arm/mach-shmobile/board-mackerel.c
@@ -420,6 +420,16 @@ static struct i2c_board_info i2c0_devices[] = {
 	},
 };
 
+#define IRQ21 evt2irq(0x32a0)
+
+static struct i2c_board_info i2c1_devices[] = {
+	/* Accelerometer */
+	{
+		I2C_BOARD_INFO("adxl34x", 0x53),
+		.irq = IRQ21,
+	},
+};
+
 static struct map_desc mackerel_io_desc[] __initdata = {
 	/* create a 1:1 entity map for 0xe6xxxxxx
 	 * used by CPGA, INTC and PFC.
@@ -515,9 +525,14 @@ static void __init mackerel_init(void)
 
 	intc_set_priority(IRQ_FSI, 3); /* irq priority FSI(3) > SMSC911X(2) */
 
+	/* enable Accelerometer */
+	gpio_request(GPIO_FN_IRQ21,	NULL);
+	set_irq_type(IRQ21, IRQ_TYPE_LEVEL_HIGH);
 
 	i2c_register_board_info(0, i2c0_devices,
 				ARRAY_SIZE(i2c0_devices));
+	i2c_register_board_info(1, i2c1_devices,
+				ARRAY_SIZE(i2c1_devices));
 
 	sh7372_add_standard_devices();