diff options
| author | Tony Lindgren | 2012-08-30 13:47:23 -0700 |
|---|---|---|
| committer | Tony Lindgren | 2012-08-30 13:47:23 -0700 |
| commit | 39b1bb2e0cdf9042505a138ea93520f39a2b3d48 (patch) | |
| tree | 71d5fa580aea0f289f123c9445058a81b81f4583 /arch/arm/mach-omap2 | |
| parent | 85d7ff9b907685b6469058888f1d961b3e8d47ad (diff) | |
| parent | 624411ceba816b38e9e4a013c7e4c5f36a9f4cfe (diff) | |
Merge branch 'devel-dt-regulator' into devel-dt
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-igep0020.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index dd2db025f778..4a4d058ed146 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -69,6 +69,7 @@ config SOC_OMAP5 select CPU_V7 select ARM_GIC select HAVE_SMP + select ARM_CPU_SUSPEND if PM comment "OMAP Core Type" depends on ARCH_OMAP2 diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index 74915295482e..28214483aaba 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c @@ -554,6 +554,8 @@ static const struct usbhs_omap_board_data igep3_usbhs_bdata __initconst = { #ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { + /* SMSC9221 LAN Controller ETH IRQ (GPIO_176) */ + OMAP3_MUX(MCSPI1_CS2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT), { .reg_offset = OMAP_MUX_TERMINATOR }, }; #endif |