Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 227184
b: refs/heads/master
c: 80f1dc7
h: refs/heads/master
v: v3
  • Loading branch information
Tony SIM authored and Paul Mundt committed Dec 8, 2010
1 parent 559cb75 commit 3ba969f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a44d72a4058f870c305a23aa5cbc4cacb6758ea
refs/heads/master: 80f1dc7cc9341b160beb9c833edc1cd131f45a7f
15 changes: 15 additions & 0 deletions trunk/arch/arm/mach-shmobile/board-mackerel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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();

Expand Down

0 comments on commit 3ba969f

Please sign in to comment.