diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 23:53:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-11 23:53:01 +0200 |
| commit | c2fda22207e2977d0b80eac58a9004b6f8beed6d (patch) | |
| tree | 0c82957b9d6fb53aafe0f9a9d54de6015484e3e6 /arch/arm/mach-omap2/board-rm680.c | |
| parent | fdcc205fb9ba006bcd37f72e1b1b904704257351 (diff) | |
| parent | e4609747a33b903c03346eea20d811fafd462269 (diff) | |
| download | olio-linux-3.10-c2fda22207e2977d0b80eac58a9004b6f8beed6d.tar.xz olio-linux-3.10-c2fda22207e2977d0b80eac58a9004b6f8beed6d.zip | |
Merge branch 'fixes-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap/fixes
Diffstat (limited to 'arch/arm/mach-omap2/board-rm680.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rm680.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c index 54dceb16341..7dfed24ee12 100644 --- a/arch/arm/mach-omap2/board-rm680.c +++ b/arch/arm/mach-omap2/board-rm680.c @@ -79,20 +79,14 @@ static struct twl4030_gpio_platform_data rm680_gpio_data = { .pulldowns = BIT(1) | BIT(2) | BIT(8) | BIT(15), }; -static struct twl4030_usb_data rm680_usb_data = { - .usb_mode = T2_USB_MODE_ULPI, -}; - static struct twl4030_platform_data rm680_twl_data = { - .irq_base = TWL4030_IRQ_BASE, - .irq_end = TWL4030_IRQ_END, .gpio = &rm680_gpio_data, - .usb = &rm680_usb_data, /* add rest of the children here */ }; static void __init rm680_i2c_init(void) { + omap3_pmic_get_config(&rm680_twl_data, TWL_COMMON_PDATA_USB, 0); omap_pmic_init(1, 2900, "twl5031", INT_34XX_SYS_NIRQ, &rm680_twl_data); omap_register_i2c_bus(2, 400, NULL, 0); omap_register_i2c_bus(3, 400, NULL, 0); |