diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-10 10:44:32 -0500 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-10 10:44:48 -0500 |
| commit | 3daf65c0ed7660f75da927c250163c26c9043f1b (patch) | |
| tree | 4b3ae732261ac47e7b8364106177a5bbe2e9f573 /arch/x86/include/asm/inat.h | |
| parent | ed16c8c50e26df3c16e40d35c9a4c0e9f032656c (diff) | |
| parent | 0e7dc862cf687234ed1b01a6b2461b782ea0bca0 (diff) | |
Merge tag 'for-v3.13-rc/hwmod-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes
From Paul Walmsley:
ARM: OMAP2+: hwmod code/data: fixes for v3.13-rc
Fix a few hwmod code problems involving recovery with bad data and bad
IP block OCP reset handling. Also, fix the hwmod data to enable IP
block OCP reset for the OMAP USBHOST devices on OMAP3+.
Basic build, boot, and PM tests are available here:
http://www.pwsan.com/omap/testlogs/prcm_fixes_a_v3.13-rc/20131209030611/
* tag 'for-v3.13-rc/hwmod-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
ARM: OMAP2+: hwmod: Fix usage of invalid iclk / oclk when clock node is not present
ARM: OMAP3: hwmod data: Don't prevent RESET of USB Host module
ARM: OMAP2+: hwmod: Fix SOFTRESET logic
ARM: OMAP4+: hwmod data: Don't prevent RESET of USB Host module
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/x86/include/asm/inat.h')
0 files changed, 0 insertions, 0 deletions