diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-25 14:14:13 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-25 14:14:13 -0500 |
| commit | 3e5087329489e0beceecf3426f1216619821937f (patch) | |
| tree | f26bfd39b3ca7bf68ef98eacde03fef6c7b4dae5 /hw/misc/imx_ccm.c | |
| parent | 8c260b1135b15dbfe8843de799eada596167016a (diff) | |
| parent | 7426aa72c36c908a7d0eae3e38568bb0a70de479 (diff) | |
Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging
# By Peter Crosthwaite (3) and others
# Via Peter Maydell
* pmaydell/arm-devs.for-upstream:
nand: Don't inherit from Sysbus
block/nand: Convert Sysbus::init to Device::realize
block/nand: QOM casting sweep
i.MX31: Fix PRCS bit test
arm/boot: Free dtb blob memory after use
i.MX: Rework functions/types name and use new style initialization
i.MX: Implement a more complete version of the GPT timer.
ARM: Allow dumping of device tree
Message-id: 1372184516-32397-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/misc/imx_ccm.c')
| -rw-r--r-- | hw/misc/imx_ccm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c index c153a24310..427ce5cd1d 100644 --- a/hw/misc/imx_ccm.c +++ b/hw/misc/imx_ccm.c @@ -153,7 +153,7 @@ static void update_clocks(IMXCCMState *s) * approach */ - if ((s->ccmr & CCMR_PRCS) == 1) { + if ((s->ccmr & CCMR_PRCS) == 2) { s->pll_refclk_freq = CKIL_FREQ * 1024; } else { s->pll_refclk_freq = CKIH_FREQ; |