| author | Dan Murphy <DMurphy@ti.com> | |
| Tue, 2 Jun 2015 21:29:47 +0000 (16:29 -0500) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Tue, 2 Jun 2015 21:29:47 +0000 (16:29 -0500) | ||
| commit | 50e3fd5f9a86cb3ab6646b722d7327c0021be1f0 | |
| tree | ff3747d10fd2f22af2c15a593e7ed49368d762bf | tree | snapshot (tar.xz tar.gz zip) |
| parent | f1ea93d3c6f1dd209529ce1e3da8a761bb3e5bac | commit | diff |
| parent | 04ea77edb7d394625cede310fe41e1784bd3f45b | 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: OMAP2+: AMX3XX: Add HWMOD_NEEDS_REIDLE to gpmc
ARM: OMAP2+: omap_hwmod: Reidle flagged hwmods when restoring context
ARM: OMAP2+: omap_hwmod: Add softreset to _reidle
ARM: OMAP2+: omap_hwmod: Refactor HWMOD_NEEDS_REIDLE support code
ARM: OMAP2+: omap_hwmod: Always restore saved hardreset context
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: OMAP2+: AMX3XX: Add HWMOD_NEEDS_REIDLE to gpmc
ARM: OMAP2+: omap_hwmod: Reidle flagged hwmods when restoring context
ARM: OMAP2+: omap_hwmod: Add softreset to _reidle
ARM: OMAP2+: omap_hwmod: Refactor HWMOD_NEEDS_REIDLE support code
ARM: OMAP2+: omap_hwmod: Always restore saved hardreset context
Signed-off-by: Dan Murphy <DMurphy@ti.com>
| arch/arm/mach-omap2/omap_hwmod.c | diff1 | | diff2 | | blob | history |