OMAP3 Move cache routine to cache.S

[u-boot] / cpu / arm1136 / mx31 / generic.c

diff --git a/cpu/arm1136/mx31/generic.c b/cpu/arm1136/mx31/generic.c
index 29c08c105f1e1d601b3f1ec0002cb914c3038324..1415d6c2ae01a0552e17fb3b7915ecfbf96f9b02 100644 (file)
--- a/cpu/arm1136/mx31/generic.c
+++ b/cpu/arm1136/mx31/generic.c
@@ -27,8 +27,8 @@
 static u32 mx31_decode_pll(u32 reg, u32 infreq)
 {
        u32 mfi = (reg >> 10) & 0xf;
-       u32 mfn = reg & 0x3f;
-       u32 mfd = (reg >> 16) & 0x3f;
+       u32 mfn = reg & 0x3ff;
+       u32 mfd = (reg >> 16) & 0x3ff;
        u32 pd =  (reg >> 26) & 0xf;
 
        mfi = mfi <= 5 ? 5 : mfi;
@@ -81,12 +81,12 @@ void mx31_gpio_mux(unsigned long mode)
 {
        unsigned long reg, shift, tmp;
 
-       reg = IOMUXC_BASE + (mode & 0xfc);
+       reg = IOMUXC_BASE + (mode & 0x1fc);
        shift = (~mode & 0x3) * 8;
 
        tmp = __REG(reg);
        tmp &= ~(0xff << shift);
-       tmp |= ((mode >> 8) & 0xff) << shift;
+       tmp |= ((mode >> IOMUX_MODE_POS) & 0xff) << shift;
        __REG(reg) = tmp;
 }