lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'devel-gpio' into omap-for-linus

Browse Source
This commit is contained in:
Tony Lindgren
2010-12-10 11:37:47 -08:00
parent b2d6fef512 5de62b86d2
commit 79b357c217
51 changed files with 2185 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-omap2/board-ldp.c
View File

@@ -294,8 +294,6 @@ static void __init omap_ldp_init_irq(void)
omap_board_config_size = ARRAY_SIZE(ldp_config);
omap2_init_common_hw(NULL, NULL);
omap_init_irq();
omap_gpio_init();
ldp_init_smsc911x();
}
static struct twl4030_usb_data ldp_usb_data = {
@@ -424,6 +422,7 @@ static struct mtd_partition ldp_nand_partitions[] = {
static void __init omap_ldp_init(void)
{
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
ldp_init_smsc911x();
omap_i2c_init();
platform_add_devices(ldp_devices, ARRAY_SIZE(ldp_devices));
ts_gpio = 54;