Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303483
b: refs/heads/master
c: 46cf668
h: refs/heads/master
i:
  303481: 9824196
  303479: 8070bae
v: v3
  • Loading branch information
Kuninori Morimoto authored and Rafael J. Wysocki committed May 12, 2012
1 parent 16ffdf9 commit 7db7d5f
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: d8fed1e254ba1ed38fd2977fdac4c2e35ed5dbc1
refs/heads/master: 46cf668748070e54879d528fa58107abc835dff3
15 changes: 15 additions & 0 deletions trunk/arch/arm/mach-shmobile/board-armadillo800eva.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,14 @@ static struct platform_device gpio_keys_device = {
},
};

/* I2C */
static struct i2c_board_info i2c0_devices[] = {
{
I2C_BOARD_INFO("st1232-ts", 0x55),
.irq = evt2irq(0x0340),
},
};

/*
* board devices
*/
Expand Down Expand Up @@ -265,6 +273,11 @@ static void __init eva_init(void)
gpio_request(GPIO_PORT202, NULL); /* LCD0_LED_CONT */
gpio_direction_output(GPIO_PORT202, 0);

/* Touchscreen */
gpio_request(GPIO_FN_IRQ10, NULL); /* TP_INT */
gpio_request(GPIO_PORT166, NULL); /* TP_RST_B */
gpio_direction_output(GPIO_PORT166, 1);

/* GETHER */
gpio_request(GPIO_FN_ET_CRS, NULL);
gpio_request(GPIO_FN_ET_MDC, NULL);
Expand Down Expand Up @@ -303,6 +316,8 @@ static void __init eva_init(void)
l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
#endif

i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));

r8a7740_add_standard_devices();

platform_add_devices(eva_devices,
Expand Down

0 comments on commit 7db7d5f

Please sign in to comment.