diff options
author | Tony Lindgren <tony@atomide.com> | 2014-06-16 10:27:40 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-06-16 10:27:40 +0200 |
commit | f5467da80b193edcf52cf6a14e762fdc9a2fb521 (patch) | |
tree | 1a0651653a6beae08b303b1bc010e921f346304c /arch/arm/mach-omap2/soc.h | |
parent | ARM: dts: Enable twl4030 off-idle configuration for selected omaps (diff) | |
parent | ARM: OMAP5: hwmod: Add ocp2scp3 and sata hwmods (diff) | |
download | linux-f5467da80b193edcf52cf6a14e762fdc9a2fb521.tar.xz linux-f5467da80b193edcf52cf6a14e762fdc9a2fb521.zip |
Merge tag 'for-v3.16-rc/omap-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.16/fixes
Two OMAP hwmod patches for early v3.16-rc kernels.
There's one OMAP SoC integration fix for the AM43xx SoC, without
which, IP blocks can't be placed into hard-reset.
There is also one OMAP5 SoC data addition patch that should have gone
in for v3.16. Normally I wouldn't send this as part of an -rc series,
since it's not technically a fix. But I'd like to make an exception in
this case because:
- it's intended to go in very early in the v3.16-rc series (or even
pre-rc1);
- it's a fairly small change;
- the impact is limited to a single SoC and a single device;
- the only reason that it didn't go in earlier is because it "slipped
through the cracks," rather than for any technical reason.
Basic build, boot, and PM test logs are available here:
http://www.pwsan.com/omap/testlogs/hwmod-a-v3.16-rc/20140615201307/
Diffstat (limited to 'arch/arm/mach-omap2/soc.h')
0 files changed, 0 insertions, 0 deletions