diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-05-19 09:59:00 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-05-19 09:59:00 -0700 |
| commit | fee79e7e6be98cf572d2535f3abbbdb26c50d63f (patch) | |
| tree | 4e5e73a169425288a187bc5706134339c0490fdd /arch/arm/mach-omap2 | |
| parent | de4ad740cd7289d6ae06ac344ce9cdc25a269814 (diff) | |
| download | olio-linux-3.10-fee79e7e6be98cf572d2535f3abbbdb26c50d63f.tar.xz olio-linux-3.10-fee79e7e6be98cf572d2535f3abbbdb26c50d63f.zip | |
Latest changes to the configuration, board file, gpio pins of the tps65910, no time-out for UART3, fix for reboot issue.
Change-Id: I79ab087c8406922ea5511b72f77440d97f2d5d0c
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index fa9164322c3..d97f51f76be 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -428,8 +428,8 @@ static struct regulator_init_data tps65910_1v8 = { .constraints = { .min_uV = 1800000, .max_uV = 1800000, - .valid_modes_mask = REGULATOR_MODE_NORMAL | REGULATOR_MODE_STANDBY, - .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, + .valid_modes_mask = REGULATOR_MODE_NORMAL | REGULATOR_MODE_IDLE | REGULATOR_MODE_STANDBY, + .valid_ops_mask = REGULATOR_CHANGE_MODE, .always_on = false, .apply_uV = true, }, @@ -1023,7 +1023,7 @@ static struct omap_uart_port_info omap_uart_ports[] = { .dma_rx_timeout = DEFAULT_RXDMA_TIMEOUT, .dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE, .autosuspend_timeout = -1, - .wakelock_timeout = 10000, + .wakelock_timeout = -1, .wakeup_capable = true, }, { |