diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 11:52:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 11:52:30 +0100 |
| commit | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (patch) | |
| tree | f603a75958f584452f4d40f2f8f730ed1ff6fa06 /arch/arm/mach-omap2/io.c | |
| parent | b8e6c91c74e9f0279b7c51048779b3d62da60b88 (diff) | |
| parent | e89087c99f2be002ff46126742c21da5d357b324 (diff) | |
Merge branch 'omap2-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
Merge branch 'omap2-clock' into omap-all
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 987351f07d7..371e5409fef 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -24,6 +24,13 @@ #include <mach/mux.h> #include <mach/omapfb.h> +#include <mach/powerdomain.h> + +#include "powerdomains.h" + +#include <mach/clockdomain.h> +#include "clockdomains.h" + extern void omap_sram_init(void); extern int omap2_clk_init(void); extern void omap2_check_revision(void); @@ -101,6 +108,8 @@ void __init omap2_map_common_io(void) void __init omap2_init_common_hw(void) { omap2_mux_init(); + pwrdm_init(powerdomains_omap); + clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); omap2_clk_init(); /* * Need to Fix this for 2430 |