]> xenbits.xensource.com Git - people/liuw/qemu.git/commitdiff
i.MX: Fix i.MX31 default/reset configuration
authorJean-Christophe Dubois <jcd@tribudubois.net>
Thu, 17 Dec 2015 13:37:15 +0000 (13:37 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 17 Dec 2015 13:37:15 +0000 (13:37 +0000)
Linux on i.MX31/KZM is expecting the CCM to use the CKIH ref clock
instead of the CKIL plus the FPM multiplier.

We change the CCMR reg reset value to match linux expected config.

This allows the CCM to provide a 39MHz clk (as expected by linux)
instead of the actual 50MHz.

With this change the "sleep 60" command on linux is time accurate
with "real world time".

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Message-id: 6dc5bc4e0a450b20cecdb2991112e7281b653345.1449528242.git.jcd@tribudubois.net
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/misc/imx_ccm.c

index 4cc2bbc0ed941abe92e0297fc75ee1a4e5bb2f40..500dda5024a552c6d399b3f51493ad5d0a95d38f 100644 (file)
@@ -123,7 +123,7 @@ static void imx_ccm_reset(DeviceState *dev)
 {
     IMXCCMState *s = IMX_CCM(dev);
 
-    s->ccmr = 0x074b0b7b;
+    s->ccmr = 0x074b0b7d;
     s->pdr0 = 0xff870b48;
     s->pdr1 = 0x49fcfe7f;
     s->mpctl = PLL_PD(1) | PLL_MFD(0) | PLL_MFI(6) | PLL_MFN(0);