| author | Dan Murphy <DMurphy@ti.com> | |
| Fri, 29 May 2015 23:43:33 +0000 (18:43 -0500) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Fri, 29 May 2015 23:43:33 +0000 (18:43 -0500) | ||
| commit | ad20be4e5416ebf25555230260b13c99e6c2c48b | |
| tree | 088e3c1fd4a5a622bc6b89b02afdbe4ce10e3132 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 1beb9373a9972bd1b1538acd53aec2738d0e7719 | commit | diff |
| parent | 539ca54672c26ea3c07ab922e1c1bd7937d12484 | commit | diff |
Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree into ti-linux-3.14.y
TI-Feature: power_management_base
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-ti-linux-3.14.y
* 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
ARM: dts: am437x-sk-evm: disable DDR regulator in rtc-only/poweroff mode
regulator: tps65218: do not disable DCDC3 during poweroff on broken PMICs
mfd: tps65218: add version check to the PMIC probe
rtc: omap: fix ext-wakeup setup
rtc: omap: do not disable RTC alarm during shutdown
rtc: omap: setup the regulators for poweroff mode
ARM: dts: am437x-gp-evm: disable DDR regulator in rtc-only/poweroff mode
regulator: tps65218: force set power-up/down strobe to 3 for dcdc3
regulator: of: setup initial suspend state
ARM: dts: AM43xx: update regulator nodes for new layout
regulator: of: Add support for parsing regulator_state for suspend state
ARM: dts: dra7: add i810 errata dpll data
ARM: DRA7: dpll: add implementation for errata i810
Conflicts:
arch/arm/common/edma.c
arch/arm/mach-omap2/Makefile
drivers/regulator/palmas-regulator.c
include/dt-bindings/pinctrl/am43xx.h
Signed-off-by: Dan Murphy <DMurphy@ti.com>
TI-Feature: power_management_base
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-ti-linux-3.14.y
* 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
ARM: dts: am437x-sk-evm: disable DDR regulator in rtc-only/poweroff mode
regulator: tps65218: do not disable DCDC3 during poweroff on broken PMICs
mfd: tps65218: add version check to the PMIC probe
rtc: omap: fix ext-wakeup setup
rtc: omap: do not disable RTC alarm during shutdown
rtc: omap: setup the regulators for poweroff mode
ARM: dts: am437x-gp-evm: disable DDR regulator in rtc-only/poweroff mode
regulator: tps65218: force set power-up/down strobe to 3 for dcdc3
regulator: of: setup initial suspend state
ARM: dts: AM43xx: update regulator nodes for new layout
regulator: of: Add support for parsing regulator_state for suspend state
ARM: dts: dra7: add i810 errata dpll data
ARM: DRA7: dpll: add implementation for errata i810
Conflicts:
arch/arm/common/edma.c
arch/arm/mach-omap2/Makefile
drivers/regulator/palmas-regulator.c
include/dt-bindings/pinctrl/am43xx.h
Signed-off-by: Dan Murphy <DMurphy@ti.com>