diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-26 12:32:50 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-26 12:32:50 -0800 |
| commit | 8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7 (patch) | |
| tree | 282feb4b7a0f4b430b363048616f50e27f656594 /arch/arm/mach-omap2/prm2xxx.c | |
| parent | 558a0780b0a04862a678f7823215424b4e5501f9 (diff) | |
| parent | c567b0584c352e7f97ced003be46bed8581ddd5b (diff) | |
| download | olio-linux-3.10-8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7.tar.xz olio-linux-3.10-8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7.zip | |
Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/devel-pcrm
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.
Diffstat (limited to 'arch/arm/mach-omap2/prm2xxx.c')
| -rw-r--r-- | arch/arm/mach-omap2/prm2xxx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/prm2xxx.c b/arch/arm/mach-omap2/prm2xxx.c index bf24fc47603..faeab18696d 100644 --- a/arch/arm/mach-omap2/prm2xxx.c +++ b/arch/arm/mach-omap2/prm2xxx.c @@ -118,14 +118,13 @@ static struct prm_ll_data omap2xxx_prm_ll_data = { .read_reset_sources = &omap2xxx_prm_read_reset_sources, }; -static int __init omap2xxx_prm_init(void) +int __init omap2xxx_prm_init(void) { if (!cpu_is_omap24xx()) return 0; return prm_register(&omap2xxx_prm_ll_data); } -subsys_initcall(omap2xxx_prm_init); static void __exit omap2xxx_prm_exit(void) { |