diff options
Diffstat (limited to 'recipes/linux/linux-omap/fix-omap4.diff')
| -rw-r--r-- | recipes/linux/linux-omap/fix-omap4.diff | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/recipes/linux/linux-omap/fix-omap4.diff b/recipes/linux/linux-omap/fix-omap4.diff new file mode 100644 index 0000000000..5f8ffbce1d --- /dev/null +++ b/recipes/linux/linux-omap/fix-omap4.diff @@ -0,0 +1,63 @@ +From: Tony Lindgren <tony@atomide.com> +Date: Thu, 24 Sep 2009 23:23:07 +0000 (-0700) +Subject: omap: Fix 44xx compile +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftmlind%2Flinux-omap-2.6.git;a=commitdiff_plain;h=61f04ee83c768c556168b09d71f0dc87b4a6090a + +omap: Fix 44xx compile + +Looks like these patches were not tested that well.. + +Signed-off-by: Tony Lindgren <tony@atomide.com> +--- + +diff --git a/arch/arm/mach-omap2/cm4xxx.c b/arch/arm/mach-omap2/cm4xxx.c +index e4ebd6d..4af76bb 100644 +--- a/arch/arm/mach-omap2/cm4xxx.c ++++ b/arch/arm/mach-omap2/cm4xxx.c +@@ -22,7 +22,6 @@ + #include <asm/atomic.h> + + #include "cm.h" +-#include "cm-regbits-4xxx.h" + + /* XXX move this to cm.h */ + /* MAX_MODULE_READY_TIME: max milliseconds for module to leave idle */ +@@ -50,19 +49,7 @@ + */ + int omap4_cm_wait_idlest_ready(u32 prcm_mod, u8 prcm_dev_offs) + { +- int i = 0; +- u8 cm_id; +- u16 prcm_mod_offs; +- u32 mask = OMAP4_PRCM_CM_CLKCTRL_IDLEST_MASK; +- +- cm_id = prcm_mod >> OMAP4_PRCM_MOD_CM_ID_SHIFT; +- prcm_mod_offs = prcm_mod & OMAP4_PRCM_MOD_OFFS_MASK; +- +- while (((omap4_cm_read_mod_reg(cm_id, prcm_mod_offs, prcm_dev_offs, +- OMAP4_CM_CLKCTRL_DREG) & mask) != 0) && +- (i++ < MAX_MODULE_READY_TIME)) +- udelay(1); +- +- return (i < MAX_MODULE_READY_TIME) ? 0 : -EBUSY; ++ /* FIXME: Add clock manager related code */ ++ return 0; + } + +diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c +index 7574b6f..e3a3bad 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); |