diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 07:58:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 07:58:25 -0700 |
| commit | 8c11499a496dd0fcc3817dc0fd5f650f00db1e18 (patch) | |
| tree | fcfcec7a88dcdeb0b72689cac7902a393f5dbe7b /arch/arm/mach-omap2/io.c | |
| parent | 342a597146e8639f7c8d49f056340c2e5536dda6 (diff) | |
| parent | 055c49d285a151ccb91d63bac6d8621be3db5c93 (diff) | |
| download | linux-8c11499a496dd0fcc3817dc0fd5f650f00db1e18.tar.bz2 | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
omap: Fix wrong condition check in while loop for mailbox and iommu2
omap: rng: Use resource_size instead of manual calculation
omap: Fix MMC gpio_wp for BeagleBoard C2 and above
omap: Fix matrix_keymap_data usage
omap: Fix a OMAP_MPUIO_VBASE typo for 850
omap: Fix wrong jtag_id for 850
omap: iovmm: Fix compiler warning
omap: mailbox: Flush posted write when acking mailbox irq
omap: mailbox: Execute softreset at startup
omap: Add missing mux pin for EHCI phy reset line
omap: Fix 44xx compile
omap: Fix mcspi compile for 2420
omap: Fix compile for arch/arm/mach-omap2
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 7574b6f20e8e..e3a3bad1d84f 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -294,10 +294,10 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0, else if (cpu_is_omap34xx()) hwmods = omap34xx_hwmods; - omap_hwmod_init(hwmods); - omap2_mux_init(); #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the clkdev is ready */ /* The OPP tables have to be registered before a clk init */ + omap_hwmod_init(hwmods); + omap2_mux_init(); omap_pm_if_early_init(mpu_opps, dsp_opps, l3_opps); pwrdm_init(powerdomains_omap); clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps); |