diff options
author | Tony Lindgren <tony@atomide.com> | 2012-11-30 11:40:31 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-11-30 11:40:31 -0500 |
commit | 2589d056122f6dcb405d411eae872aac8cf9da1b (patch) | |
tree | 8b2fb3a9f8205c110842c59ed42987a6f2b17e1a /arch/arm/mach-omap2/pm34xx.c | |
parent | 42a1cc9c0ec2a00b53b4f02849dc4377b09b3b05 (diff) | |
parent | 8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7 (diff) |
Merge tag 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
omap prcm changes via Paul Walmsley <paul@pwsan.com>:
Some miscellaneous OMAP hwmod changes for 3.8, along with a PRM
change needed for one of the hwmod patches to function.
Basic test logs for this branch on top of Tony's
omap-for-v3.8/clock branch at commit
558a0780b0a04862a678f7823215424b4e5501f9 are here:
http://www.pwsan.com/omap/testlogs/hwmod_devel_a_3.8/20121121161522/
However, omap-for-v3.8/clock at 558a0780 does not include some fixes
that are needed for a successful test. With several reverts,
fixes, and workarounds applied, the following test logs were
obtained:
http://www.pwsan.com/omap/testlogs/TEST_hwmod_devel_a_3.8/20121121162719/
which indicate that the series tests cleanly.
Conflicts:
arch/arm/mach-omap2/cm33xx.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/prm_common.c
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 11f9669eb7ed..770320061422 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -38,17 +38,15 @@ | |||
38 | 38 | ||
39 | #include "clockdomain.h" | 39 | #include "clockdomain.h" |
40 | #include "powerdomain.h" | 40 | #include "powerdomain.h" |
41 | #include <plat/prcm.h> | ||
42 | #include <plat-omap/dma-omap.h> | 41 | #include <plat-omap/dma-omap.h> |
43 | 42 | ||
44 | #include "soc.h" | 43 | #include "soc.h" |
45 | #include "common.h" | 44 | #include "common.h" |
46 | #include "cm2xxx_3xxx.h" | 45 | #include "cm3xxx.h" |
47 | #include "cm-regbits-34xx.h" | 46 | #include "cm-regbits-34xx.h" |
48 | #include "gpmc.h" | 47 | #include "gpmc.h" |
49 | #include "prm-regbits-34xx.h" | 48 | #include "prm-regbits-34xx.h" |
50 | 49 | #include "prm3xxx.h" | |
51 | #include "prm2xxx_3xxx.h" | ||
52 | #include "pm.h" | 50 | #include "pm.h" |
53 | #include "sdrc.h" | 51 | #include "sdrc.h" |
54 | #include "sram.h" | 52 | #include "sram.h" |