2008-03-18 07:09:51 -06:00
|
|
|
/*
|
|
|
|
* OMAP3-specific clock framework functions
|
|
|
|
*
|
2008-07-03 03:24:45 -06:00
|
|
|
* Copyright (C) 2007-2008 Texas Instruments, Inc.
|
OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB
Fix two bugs in the OMAP3 clock tree pertaining to the SSI, DSS,
USBHOST, and HSOTGUSB devices. These devices are both interconnect
initiators and targets. Without this patch, clk_enable()s on clocks for
these modules can be very high latency (potentially up to ~200
milliseconds) and message such as the following are generated:
Clock usbhost_48m_fck didn't enable in 100000 tries
Two bugs are fixed by this patch. First, OMAP hardware only supports
target CM_IDLEST register bits on ES2+ chips and beyond. ES1 chips
should not wait for these clocks to enable. So, split the appropriate
clocks into ES1 and ES2+ variants, so that kernels running on ES1
devices won't try to wait.
Second, the current heuristic in omap2_clk_dflt_find_idlest() will
fail for these clocks. It assumes that the CM_IDLEST bit to wait upon
is the same as the CM_*CLKEN bit, which is false[1]. Fix by
implementing custom clkops .find_idlest function pointers for the
appropriate clocks that return the correct slave IDLEST bit shift.
This was originally fixed in the linux-omap kernel during 2.6.29 in a
slightly different manner[2][3].
In the medium-term future, all of the module IDLEST code will
eventually be moved to the omap_hwmod code.
Problem reported by Jarkko Nikula <jhnikula@gmail.com>:
http://marc.info/?l=linux-omap&m=124306184903679&w=2
...
1. See for example 34xx TRM Revision P Table 4-213 and 4-217 (for the
DSS case).
2. http://www.spinics.net/lists/linux-omap/msg05512.html et seq.
3. http://lkml.indiana.edu/hypermail/linux/kernel/0901.3/01498.html
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
2009-07-24 19:44:06 -06:00
|
|
|
* Copyright (C) 2007-2009 Nokia Corporation
|
2008-03-18 07:09:51 -06:00
|
|
|
*
|
|
|
|
* Written by Paul Walmsley
|
2008-07-03 03:24:45 -06:00
|
|
|
* Testing and integration fixes by Jouni Högander
|
2008-03-18 07:09:51 -06:00
|
|
|
*
|
|
|
|
* Parts of this code are based on code written by
|
|
|
|
* Richard Woodruff, Tony Lindgren, Tuukka Tikkanen, Karthik Dasu
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*/
|
|
|
|
#undef DEBUG
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/device.h>
|
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/clk.h>
|
|
|
|
#include <linux/io.h>
|
2008-07-03 03:24:45 -06:00
|
|
|
#include <linux/limits.h>
|
2008-09-06 05:13:59 -06:00
|
|
|
#include <linux/bitops.h>
|
2008-03-18 07:09:51 -06:00
|
|
|
|
2008-08-05 09:14:15 -06:00
|
|
|
#include <mach/clock.h>
|
|
|
|
#include <mach/sram.h>
|
2008-03-18 07:09:51 -06:00
|
|
|
#include <asm/div64.h>
|
2009-01-19 08:51:11 -07:00
|
|
|
#include <asm/clkdev.h>
|
2008-03-18 07:09:51 -06:00
|
|
|
|
2009-01-28 12:27:31 -07:00
|
|
|
#include <mach/sdrc.h>
|
2008-03-18 07:09:51 -06:00
|
|
|
#include "clock.h"
|
|
|
|
#include "prm.h"
|
|
|
|
#include "prm-regbits-34xx.h"
|
|
|
|
#include "cm.h"
|
|
|
|
#include "cm-regbits-34xx.h"
|
|
|
|
|
2008-11-04 07:02:46 -07:00
|
|
|
static const struct clkops clkops_noncore_dpll_ops;
|
|
|
|
|
OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB
Fix two bugs in the OMAP3 clock tree pertaining to the SSI, DSS,
USBHOST, and HSOTGUSB devices. These devices are both interconnect
initiators and targets. Without this patch, clk_enable()s on clocks for
these modules can be very high latency (potentially up to ~200
milliseconds) and message such as the following are generated:
Clock usbhost_48m_fck didn't enable in 100000 tries
Two bugs are fixed by this patch. First, OMAP hardware only supports
target CM_IDLEST register bits on ES2+ chips and beyond. ES1 chips
should not wait for these clocks to enable. So, split the appropriate
clocks into ES1 and ES2+ variants, so that kernels running on ES1
devices won't try to wait.
Second, the current heuristic in omap2_clk_dflt_find_idlest() will
fail for these clocks. It assumes that the CM_IDLEST bit to wait upon
is the same as the CM_*CLKEN bit, which is false[1]. Fix by
implementing custom clkops .find_idlest function pointers for the
appropriate clocks that return the correct slave IDLEST bit shift.
This was originally fixed in the linux-omap kernel during 2.6.29 in a
slightly different manner[2][3].
In the medium-term future, all of the module IDLEST code will
eventually be moved to the omap_hwmod code.
Problem reported by Jarkko Nikula <jhnikula@gmail.com>:
http://marc.info/?l=linux-omap&m=124306184903679&w=2
...
1. See for example 34xx TRM Revision P Table 4-213 and 4-217 (for the
DSS case).
2. http://www.spinics.net/lists/linux-omap/msg05512.html et seq.
3. http://lkml.indiana.edu/hypermail/linux/kernel/0901.3/01498.html
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
2009-07-24 19:44:06 -06:00
|
|
|
static void omap3430es2_clk_ssi_find_idlest(struct clk *clk,
|
|
|
|
void __iomem **idlest_reg,
|
|
|
|
u8 *idlest_bit);
|
|
|
|
static void omap3430es2_clk_hsotgusb_find_idlest(struct clk *clk,
|
|
|
|
void __iomem **idlest_reg,
|
|
|
|
u8 *idlest_bit);
|
|
|
|
static void omap3430es2_clk_dss_usbhost_find_idlest(struct clk *clk,
|
|
|
|
void __iomem **idlest_reg,
|
|
|
|
u8 *idlest_bit);
|
|
|
|
|
|
|
|
static const struct clkops clkops_omap3430es2_ssi_wait = {
|
|
|
|
.enable = omap2_dflt_clk_enable,
|
|
|
|
.disable = omap2_dflt_clk_disable,
|
|
|
|
.find_idlest = omap3430es2_clk_ssi_find_idlest,
|
|
|
|
.find_companion = omap2_clk_dflt_find_companion,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct clkops clkops_omap3430es2_hsotgusb_wait = {
|
|
|
|
.enable = omap2_dflt_clk_enable,
|
|
|
|
.disable = omap2_dflt_clk_disable,
|
|
|
|
.find_idlest = omap3430es2_clk_hsotgusb_find_idlest,
|
|
|
|
.find_companion = omap2_clk_dflt_find_companion,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct clkops clkops_omap3430es2_dss_usbhost_wait = {
|
|
|
|
.enable = omap2_dflt_clk_enable,
|
|
|
|
.disable = omap2_dflt_clk_disable,
|
|
|
|
.find_idlest = omap3430es2_clk_dss_usbhost_find_idlest,
|
|
|
|
.find_companion = omap2_clk_dflt_find_companion,
|
|
|
|
};
|
|
|
|
|
2008-11-04 07:02:46 -07:00
|
|
|
#include "clock34xx.h"
|
|
|
|
|
2009-01-19 08:51:11 -07:00
|
|
|
struct omap_clk {
|
|
|
|
u32 cpu;
|
|
|
|
struct clk_lookup lk;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define CLK(dev, con, ck, cp) \
|
|
|
|
{ \
|
|
|
|
.cpu = cp, \
|
|
|
|
.lk = { \
|
|
|
|
.dev_id = dev, \
|
|
|
|
.con_id = con, \
|
|
|
|
.clk = ck, \
|
|
|
|
}, \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define CK_343X (1 << 0)
|
|
|
|
#define CK_3430ES1 (1 << 1)
|
|
|
|
#define CK_3430ES2 (1 << 2)
|
|
|
|
|
|
|
|
static struct omap_clk omap34xx_clks[] = {
|
|
|
|
CLK(NULL, "omap_32k_fck", &omap_32k_fck, CK_343X),
|
|
|
|
CLK(NULL, "virt_12m_ck", &virt_12m_ck, CK_343X),
|
|
|
|
CLK(NULL, "virt_13m_ck", &virt_13m_ck, CK_343X),
|
|
|
|
CLK(NULL, "virt_16_8m_ck", &virt_16_8m_ck, CK_3430ES2),
|
|
|
|
CLK(NULL, "virt_19_2m_ck", &virt_19_2m_ck, CK_343X),
|
|
|
|
CLK(NULL, "virt_26m_ck", &virt_26m_ck, CK_343X),
|
|
|
|
CLK(NULL, "virt_38_4m_ck", &virt_38_4m_ck, CK_343X),
|
|
|
|
CLK(NULL, "osc_sys_ck", &osc_sys_ck, CK_343X),
|
|
|
|
CLK(NULL, "sys_ck", &sys_ck, CK_343X),
|
|
|
|
CLK(NULL, "sys_altclk", &sys_altclk, CK_343X),
|
|
|
|
CLK(NULL, "mcbsp_clks", &mcbsp_clks, CK_343X),
|
|
|
|
CLK(NULL, "sys_clkout1", &sys_clkout1, CK_343X),
|
|
|
|
CLK(NULL, "dpll1_ck", &dpll1_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll1_x2_ck", &dpll1_x2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll1_x2m2_ck", &dpll1_x2m2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll2_ck", &dpll2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll2_m2_ck", &dpll2_m2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll3_ck", &dpll3_ck, CK_343X),
|
|
|
|
CLK(NULL, "core_ck", &core_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll3_x2_ck", &dpll3_x2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll3_m2_ck", &dpll3_m2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll3_m2x2_ck", &dpll3_m2x2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll3_m3_ck", &dpll3_m3_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll3_m3x2_ck", &dpll3_m3x2_ck, CK_343X),
|
|
|
|
CLK(NULL, "emu_core_alwon_ck", &emu_core_alwon_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_ck", &dpll4_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_x2_ck", &dpll4_x2_ck, CK_343X),
|
|
|
|
CLK(NULL, "omap_96m_alwon_fck", &omap_96m_alwon_fck, CK_343X),
|
|
|
|
CLK(NULL, "omap_96m_fck", &omap_96m_fck, CK_343X),
|
|
|
|
CLK(NULL, "cm_96m_fck", &cm_96m_fck, CK_343X),
|
|
|
|
CLK(NULL, "omap_54m_fck", &omap_54m_fck, CK_343X),
|
|
|
|
CLK(NULL, "omap_48m_fck", &omap_48m_fck, CK_343X),
|
|
|
|
CLK(NULL, "omap_12m_fck", &omap_12m_fck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_m2_ck", &dpll4_m2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_m2x2_ck", &dpll4_m2x2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_m3_ck", &dpll4_m3_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_m3x2_ck", &dpll4_m3x2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_m4_ck", &dpll4_m4_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_m4x2_ck", &dpll4_m4x2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_m5_ck", &dpll4_m5_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_m5x2_ck", &dpll4_m5x2_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_m6_ck", &dpll4_m6_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll4_m6x2_ck", &dpll4_m6x2_ck, CK_343X),
|
|
|
|
CLK(NULL, "emu_per_alwon_ck", &emu_per_alwon_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll5_ck", &dpll5_ck, CK_3430ES2),
|
|
|
|
CLK(NULL, "dpll5_m2_ck", &dpll5_m2_ck, CK_3430ES2),
|
|
|
|
CLK(NULL, "clkout2_src_ck", &clkout2_src_ck, CK_343X),
|
|
|
|
CLK(NULL, "sys_clkout2", &sys_clkout2, CK_343X),
|
|
|
|
CLK(NULL, "corex2_fck", &corex2_fck, CK_343X),
|
|
|
|
CLK(NULL, "dpll1_fck", &dpll1_fck, CK_343X),
|
|
|
|
CLK(NULL, "mpu_ck", &mpu_ck, CK_343X),
|
|
|
|
CLK(NULL, "arm_fck", &arm_fck, CK_343X),
|
|
|
|
CLK(NULL, "emu_mpu_alwon_ck", &emu_mpu_alwon_ck, CK_343X),
|
|
|
|
CLK(NULL, "dpll2_fck", &dpll2_fck, CK_343X),
|
|
|
|
CLK(NULL, "iva2_ck", &iva2_ck, CK_343X),
|
|
|
|
CLK(NULL, "l3_ick", &l3_ick, CK_343X),
|
|
|
|
CLK(NULL, "l4_ick", &l4_ick, CK_343X),
|
|
|
|
CLK(NULL, "rm_ick", &rm_ick, CK_343X),
|
|
|
|
CLK(NULL, "gfx_l3_ck", &gfx_l3_ck, CK_3430ES1),
|
|
|
|
CLK(NULL, "gfx_l3_fck", &gfx_l3_fck, CK_3430ES1),
|
|
|
|
CLK(NULL, "gfx_l3_ick", &gfx_l3_ick, CK_3430ES1),
|
|
|
|
CLK(NULL, "gfx_cg1_ck", &gfx_cg1_ck, CK_3430ES1),
|
|
|
|
CLK(NULL, "gfx_cg2_ck", &gfx_cg2_ck, CK_3430ES1),
|
|
|
|
CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2),
|
|
|
|
CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2),
|
|
|
|
CLK(NULL, "d2d_26m_fck", &d2d_26m_fck, CK_3430ES1),
|
2009-04-28 16:27:44 -06:00
|
|
|
CLK(NULL, "modem_fck", &modem_fck, CK_343X),
|
|
|
|
CLK(NULL, "sad2d_ick", &sad2d_ick, CK_343X),
|
|
|
|
CLK(NULL, "mad2d_ick", &mad2d_ick, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "gpt10_fck", &gpt10_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpt11_fck", &gpt11_fck, CK_343X),
|
|
|
|
CLK(NULL, "cpefuse_fck", &cpefuse_fck, CK_3430ES2),
|
|
|
|
CLK(NULL, "ts_fck", &ts_fck, CK_3430ES2),
|
|
|
|
CLK(NULL, "usbtll_fck", &usbtll_fck, CK_3430ES2),
|
|
|
|
CLK(NULL, "core_96m_fck", &core_96m_fck, CK_343X),
|
2009-01-28 03:22:50 -07:00
|
|
|
CLK("mmci-omap-hs.2", "fck", &mmchs3_fck, CK_3430ES2),
|
|
|
|
CLK("mmci-omap-hs.1", "fck", &mmchs2_fck, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "mspro_fck", &mspro_fck, CK_343X),
|
2009-01-28 03:22:50 -07:00
|
|
|
CLK("mmci-omap-hs.0", "fck", &mmchs1_fck, CK_343X),
|
2009-01-19 14:02:29 -07:00
|
|
|
CLK("i2c_omap.3", "fck", &i2c3_fck, CK_343X),
|
|
|
|
CLK("i2c_omap.2", "fck", &i2c2_fck, CK_343X),
|
|
|
|
CLK("i2c_omap.1", "fck", &i2c1_fck, CK_343X),
|
2009-01-23 03:26:46 -07:00
|
|
|
CLK("omap-mcbsp.5", "fck", &mcbsp5_fck, CK_343X),
|
|
|
|
CLK("omap-mcbsp.1", "fck", &mcbsp1_fck, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "core_48m_fck", &core_48m_fck, CK_343X),
|
2009-01-19 13:49:37 -07:00
|
|
|
CLK("omap2_mcspi.4", "fck", &mcspi4_fck, CK_343X),
|
|
|
|
CLK("omap2_mcspi.3", "fck", &mcspi3_fck, CK_343X),
|
|
|
|
CLK("omap2_mcspi.2", "fck", &mcspi2_fck, CK_343X),
|
|
|
|
CLK("omap2_mcspi.1", "fck", &mcspi1_fck, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "uart2_fck", &uart2_fck, CK_343X),
|
|
|
|
CLK(NULL, "uart1_fck", &uart1_fck, CK_343X),
|
|
|
|
CLK(NULL, "fshostusb_fck", &fshostusb_fck, CK_3430ES1),
|
|
|
|
CLK(NULL, "core_12m_fck", &core_12m_fck, CK_343X),
|
2009-01-22 03:12:04 -07:00
|
|
|
CLK("omap_hdq.0", "fck", &hdq_fck, CK_343X),
|
OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB
Fix two bugs in the OMAP3 clock tree pertaining to the SSI, DSS,
USBHOST, and HSOTGUSB devices. These devices are both interconnect
initiators and targets. Without this patch, clk_enable()s on clocks for
these modules can be very high latency (potentially up to ~200
milliseconds) and message such as the following are generated:
Clock usbhost_48m_fck didn't enable in 100000 tries
Two bugs are fixed by this patch. First, OMAP hardware only supports
target CM_IDLEST register bits on ES2+ chips and beyond. ES1 chips
should not wait for these clocks to enable. So, split the appropriate
clocks into ES1 and ES2+ variants, so that kernels running on ES1
devices won't try to wait.
Second, the current heuristic in omap2_clk_dflt_find_idlest() will
fail for these clocks. It assumes that the CM_IDLEST bit to wait upon
is the same as the CM_*CLKEN bit, which is false[1]. Fix by
implementing custom clkops .find_idlest function pointers for the
appropriate clocks that return the correct slave IDLEST bit shift.
This was originally fixed in the linux-omap kernel during 2.6.29 in a
slightly different manner[2][3].
In the medium-term future, all of the module IDLEST code will
eventually be moved to the omap_hwmod code.
Problem reported by Jarkko Nikula <jhnikula@gmail.com>:
http://marc.info/?l=linux-omap&m=124306184903679&w=2
...
1. See for example 34xx TRM Revision P Table 4-213 and 4-217 (for the
DSS case).
2. http://www.spinics.net/lists/linux-omap/msg05512.html et seq.
3. http://lkml.indiana.edu/hypermail/linux/kernel/0901.3/01498.html
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
2009-07-24 19:44:06 -06:00
|
|
|
CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es1, CK_3430ES1),
|
|
|
|
CLK(NULL, "ssi_ssr_fck", &ssi_ssr_fck_3430es2, CK_3430ES2),
|
|
|
|
CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es1, CK_3430ES1),
|
|
|
|
CLK(NULL, "ssi_sst_fck", &ssi_sst_fck_3430es2, CK_3430ES2),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "core_l3_ick", &core_l3_ick, CK_343X),
|
OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB
Fix two bugs in the OMAP3 clock tree pertaining to the SSI, DSS,
USBHOST, and HSOTGUSB devices. These devices are both interconnect
initiators and targets. Without this patch, clk_enable()s on clocks for
these modules can be very high latency (potentially up to ~200
milliseconds) and message such as the following are generated:
Clock usbhost_48m_fck didn't enable in 100000 tries
Two bugs are fixed by this patch. First, OMAP hardware only supports
target CM_IDLEST register bits on ES2+ chips and beyond. ES1 chips
should not wait for these clocks to enable. So, split the appropriate
clocks into ES1 and ES2+ variants, so that kernels running on ES1
devices won't try to wait.
Second, the current heuristic in omap2_clk_dflt_find_idlest() will
fail for these clocks. It assumes that the CM_IDLEST bit to wait upon
is the same as the CM_*CLKEN bit, which is false[1]. Fix by
implementing custom clkops .find_idlest function pointers for the
appropriate clocks that return the correct slave IDLEST bit shift.
This was originally fixed in the linux-omap kernel during 2.6.29 in a
slightly different manner[2][3].
In the medium-term future, all of the module IDLEST code will
eventually be moved to the omap_hwmod code.
Problem reported by Jarkko Nikula <jhnikula@gmail.com>:
http://marc.info/?l=linux-omap&m=124306184903679&w=2
...
1. See for example 34xx TRM Revision P Table 4-213 and 4-217 (for the
DSS case).
2. http://www.spinics.net/lists/linux-omap/msg05512.html et seq.
3. http://lkml.indiana.edu/hypermail/linux/kernel/0901.3/01498.html
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
2009-07-24 19:44:06 -06:00
|
|
|
CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es1, CK_3430ES1),
|
|
|
|
CLK("musb_hdrc", "ick", &hsotgusb_ick_3430es2, CK_3430ES2),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "sdrc_ick", &sdrc_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpmc_fck", &gpmc_fck, CK_343X),
|
|
|
|
CLK(NULL, "security_l3_ick", &security_l3_ick, CK_343X),
|
|
|
|
CLK(NULL, "pka_ick", &pka_ick, CK_343X),
|
|
|
|
CLK(NULL, "core_l4_ick", &core_l4_ick, CK_343X),
|
|
|
|
CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2),
|
2009-01-28 03:22:50 -07:00
|
|
|
CLK("mmci-omap-hs.2", "ick", &mmchs3_ick, CK_3430ES2),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "icr_ick", &icr_ick, CK_343X),
|
|
|
|
CLK(NULL, "aes2_ick", &aes2_ick, CK_343X),
|
|
|
|
CLK(NULL, "sha12_ick", &sha12_ick, CK_343X),
|
|
|
|
CLK(NULL, "des2_ick", &des2_ick, CK_343X),
|
2009-01-28 03:22:50 -07:00
|
|
|
CLK("mmci-omap-hs.1", "ick", &mmchs2_ick, CK_343X),
|
|
|
|
CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "mspro_ick", &mspro_ick, CK_343X),
|
2009-01-22 03:12:04 -07:00
|
|
|
CLK("omap_hdq.0", "ick", &hdq_ick, CK_343X),
|
2009-01-19 13:49:37 -07:00
|
|
|
CLK("omap2_mcspi.4", "ick", &mcspi4_ick, CK_343X),
|
|
|
|
CLK("omap2_mcspi.3", "ick", &mcspi3_ick, CK_343X),
|
|
|
|
CLK("omap2_mcspi.2", "ick", &mcspi2_ick, CK_343X),
|
|
|
|
CLK("omap2_mcspi.1", "ick", &mcspi1_ick, CK_343X),
|
2009-01-19 14:02:29 -07:00
|
|
|
CLK("i2c_omap.3", "ick", &i2c3_ick, CK_343X),
|
|
|
|
CLK("i2c_omap.2", "ick", &i2c2_ick, CK_343X),
|
|
|
|
CLK("i2c_omap.1", "ick", &i2c1_ick, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "uart2_ick", &uart2_ick, CK_343X),
|
|
|
|
CLK(NULL, "uart1_ick", &uart1_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt11_ick", &gpt11_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt10_ick", &gpt10_ick, CK_343X),
|
2009-01-23 03:26:46 -07:00
|
|
|
CLK("omap-mcbsp.5", "ick", &mcbsp5_ick, CK_343X),
|
|
|
|
CLK("omap-mcbsp.1", "ick", &mcbsp1_ick, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "fac_ick", &fac_ick, CK_3430ES1),
|
|
|
|
CLK(NULL, "mailboxes_ick", &mailboxes_ick, CK_343X),
|
|
|
|
CLK(NULL, "omapctrl_ick", &omapctrl_ick, CK_343X),
|
|
|
|
CLK(NULL, "ssi_l4_ick", &ssi_l4_ick, CK_343X),
|
OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB
Fix two bugs in the OMAP3 clock tree pertaining to the SSI, DSS,
USBHOST, and HSOTGUSB devices. These devices are both interconnect
initiators and targets. Without this patch, clk_enable()s on clocks for
these modules can be very high latency (potentially up to ~200
milliseconds) and message such as the following are generated:
Clock usbhost_48m_fck didn't enable in 100000 tries
Two bugs are fixed by this patch. First, OMAP hardware only supports
target CM_IDLEST register bits on ES2+ chips and beyond. ES1 chips
should not wait for these clocks to enable. So, split the appropriate
clocks into ES1 and ES2+ variants, so that kernels running on ES1
devices won't try to wait.
Second, the current heuristic in omap2_clk_dflt_find_idlest() will
fail for these clocks. It assumes that the CM_IDLEST bit to wait upon
is the same as the CM_*CLKEN bit, which is false[1]. Fix by
implementing custom clkops .find_idlest function pointers for the
appropriate clocks that return the correct slave IDLEST bit shift.
This was originally fixed in the linux-omap kernel during 2.6.29 in a
slightly different manner[2][3].
In the medium-term future, all of the module IDLEST code will
eventually be moved to the omap_hwmod code.
Problem reported by Jarkko Nikula <jhnikula@gmail.com>:
http://marc.info/?l=linux-omap&m=124306184903679&w=2
...
1. See for example 34xx TRM Revision P Table 4-213 and 4-217 (for the
DSS case).
2. http://www.spinics.net/lists/linux-omap/msg05512.html et seq.
3. http://lkml.indiana.edu/hypermail/linux/kernel/0901.3/01498.html
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
2009-07-24 19:44:06 -06:00
|
|
|
CLK(NULL, "ssi_ick", &ssi_ick_3430es1, CK_3430ES1),
|
|
|
|
CLK(NULL, "ssi_ick", &ssi_ick_3430es2, CK_3430ES2),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "usb_l4_ick", &usb_l4_ick, CK_3430ES1),
|
|
|
|
CLK(NULL, "security_l4_ick2", &security_l4_ick2, CK_343X),
|
|
|
|
CLK(NULL, "aes1_ick", &aes1_ick, CK_343X),
|
2009-01-19 13:58:56 -07:00
|
|
|
CLK("omap_rng", "ick", &rng_ick, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "sha11_ick", &sha11_ick, CK_343X),
|
|
|
|
CLK(NULL, "des1_ick", &des1_ick, CK_343X),
|
OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB
Fix two bugs in the OMAP3 clock tree pertaining to the SSI, DSS,
USBHOST, and HSOTGUSB devices. These devices are both interconnect
initiators and targets. Without this patch, clk_enable()s on clocks for
these modules can be very high latency (potentially up to ~200
milliseconds) and message such as the following are generated:
Clock usbhost_48m_fck didn't enable in 100000 tries
Two bugs are fixed by this patch. First, OMAP hardware only supports
target CM_IDLEST register bits on ES2+ chips and beyond. ES1 chips
should not wait for these clocks to enable. So, split the appropriate
clocks into ES1 and ES2+ variants, so that kernels running on ES1
devices won't try to wait.
Second, the current heuristic in omap2_clk_dflt_find_idlest() will
fail for these clocks. It assumes that the CM_IDLEST bit to wait upon
is the same as the CM_*CLKEN bit, which is false[1]. Fix by
implementing custom clkops .find_idlest function pointers for the
appropriate clocks that return the correct slave IDLEST bit shift.
This was originally fixed in the linux-omap kernel during 2.6.29 in a
slightly different manner[2][3].
In the medium-term future, all of the module IDLEST code will
eventually be moved to the omap_hwmod code.
Problem reported by Jarkko Nikula <jhnikula@gmail.com>:
http://marc.info/?l=linux-omap&m=124306184903679&w=2
...
1. See for example 34xx TRM Revision P Table 4-213 and 4-217 (for the
DSS case).
2. http://www.spinics.net/lists/linux-omap/msg05512.html et seq.
3. http://lkml.indiana.edu/hypermail/linux/kernel/0901.3/01498.html
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
2009-07-24 19:44:06 -06:00
|
|
|
CLK("omapfb", "dss1_fck", &dss1_alwon_fck_3430es1, CK_3430ES1),
|
|
|
|
CLK("omapfb", "dss1_fck", &dss1_alwon_fck_3430es2, CK_3430ES2),
|
2009-05-16 09:28:17 -06:00
|
|
|
CLK("omapfb", "tv_fck", &dss_tv_fck, CK_343X),
|
|
|
|
CLK("omapfb", "video_fck", &dss_96m_fck, CK_343X),
|
|
|
|
CLK("omapfb", "dss2_fck", &dss2_alwon_fck, CK_343X),
|
OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB
Fix two bugs in the OMAP3 clock tree pertaining to the SSI, DSS,
USBHOST, and HSOTGUSB devices. These devices are both interconnect
initiators and targets. Without this patch, clk_enable()s on clocks for
these modules can be very high latency (potentially up to ~200
milliseconds) and message such as the following are generated:
Clock usbhost_48m_fck didn't enable in 100000 tries
Two bugs are fixed by this patch. First, OMAP hardware only supports
target CM_IDLEST register bits on ES2+ chips and beyond. ES1 chips
should not wait for these clocks to enable. So, split the appropriate
clocks into ES1 and ES2+ variants, so that kernels running on ES1
devices won't try to wait.
Second, the current heuristic in omap2_clk_dflt_find_idlest() will
fail for these clocks. It assumes that the CM_IDLEST bit to wait upon
is the same as the CM_*CLKEN bit, which is false[1]. Fix by
implementing custom clkops .find_idlest function pointers for the
appropriate clocks that return the correct slave IDLEST bit shift.
This was originally fixed in the linux-omap kernel during 2.6.29 in a
slightly different manner[2][3].
In the medium-term future, all of the module IDLEST code will
eventually be moved to the omap_hwmod code.
Problem reported by Jarkko Nikula <jhnikula@gmail.com>:
http://marc.info/?l=linux-omap&m=124306184903679&w=2
...
1. See for example 34xx TRM Revision P Table 4-213 and 4-217 (for the
DSS case).
2. http://www.spinics.net/lists/linux-omap/msg05512.html et seq.
3. http://lkml.indiana.edu/hypermail/linux/kernel/0901.3/01498.html
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
2009-07-24 19:44:06 -06:00
|
|
|
CLK("omapfb", "ick", &dss_ick_3430es1, CK_3430ES1),
|
|
|
|
CLK("omapfb", "ick", &dss_ick_3430es2, CK_3430ES2),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "cam_mclk", &cam_mclk, CK_343X),
|
|
|
|
CLK(NULL, "cam_ick", &cam_ick, CK_343X),
|
2009-01-27 19:13:09 -07:00
|
|
|
CLK(NULL, "csi2_96m_fck", &csi2_96m_fck, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2),
|
|
|
|
CLK(NULL, "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2),
|
|
|
|
CLK(NULL, "usbhost_ick", &usbhost_ick, CK_3430ES2),
|
|
|
|
CLK(NULL, "usim_fck", &usim_fck, CK_3430ES2),
|
|
|
|
CLK(NULL, "gpt1_fck", &gpt1_fck, CK_343X),
|
|
|
|
CLK(NULL, "wkup_32k_fck", &wkup_32k_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpio1_dbck", &gpio1_dbck, CK_343X),
|
2009-01-19 13:44:33 -07:00
|
|
|
CLK("omap_wdt", "fck", &wdt2_fck, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "wkup_l4_ick", &wkup_l4_ick, CK_343X),
|
|
|
|
CLK(NULL, "usim_ick", &usim_ick, CK_3430ES2),
|
2009-01-19 13:44:33 -07:00
|
|
|
CLK("omap_wdt", "ick", &wdt2_ick, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "wdt1_ick", &wdt1_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpio1_ick", &gpio1_ick, CK_343X),
|
|
|
|
CLK(NULL, "omap_32ksync_ick", &omap_32ksync_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt12_ick", &gpt12_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt1_ick", &gpt1_ick, CK_343X),
|
|
|
|
CLK(NULL, "per_96m_fck", &per_96m_fck, CK_343X),
|
|
|
|
CLK(NULL, "per_48m_fck", &per_48m_fck, CK_343X),
|
|
|
|
CLK(NULL, "uart3_fck", &uart3_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpt2_fck", &gpt2_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpt3_fck", &gpt3_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpt4_fck", &gpt4_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpt5_fck", &gpt5_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpt6_fck", &gpt6_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpt7_fck", &gpt7_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpt8_fck", &gpt8_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpt9_fck", &gpt9_fck, CK_343X),
|
|
|
|
CLK(NULL, "per_32k_alwon_fck", &per_32k_alwon_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpio6_dbck", &gpio6_dbck, CK_343X),
|
|
|
|
CLK(NULL, "gpio5_dbck", &gpio5_dbck, CK_343X),
|
|
|
|
CLK(NULL, "gpio4_dbck", &gpio4_dbck, CK_343X),
|
|
|
|
CLK(NULL, "gpio3_dbck", &gpio3_dbck, CK_343X),
|
|
|
|
CLK(NULL, "gpio2_dbck", &gpio2_dbck, CK_343X),
|
|
|
|
CLK(NULL, "wdt3_fck", &wdt3_fck, CK_343X),
|
|
|
|
CLK(NULL, "per_l4_ick", &per_l4_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpio6_ick", &gpio6_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpio5_ick", &gpio5_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpio4_ick", &gpio4_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpio3_ick", &gpio3_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpio2_ick", &gpio2_ick, CK_343X),
|
|
|
|
CLK(NULL, "wdt3_ick", &wdt3_ick, CK_343X),
|
|
|
|
CLK(NULL, "uart3_ick", &uart3_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt9_ick", &gpt9_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt8_ick", &gpt8_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt7_ick", &gpt7_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt6_ick", &gpt6_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt5_ick", &gpt5_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt4_ick", &gpt4_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt3_ick", &gpt3_ick, CK_343X),
|
|
|
|
CLK(NULL, "gpt2_ick", &gpt2_ick, CK_343X),
|
2009-01-23 03:26:46 -07:00
|
|
|
CLK("omap-mcbsp.2", "ick", &mcbsp2_ick, CK_343X),
|
|
|
|
CLK("omap-mcbsp.3", "ick", &mcbsp3_ick, CK_343X),
|
|
|
|
CLK("omap-mcbsp.4", "ick", &mcbsp4_ick, CK_343X),
|
|
|
|
CLK("omap-mcbsp.2", "fck", &mcbsp2_fck, CK_343X),
|
|
|
|
CLK("omap-mcbsp.3", "fck", &mcbsp3_fck, CK_343X),
|
|
|
|
CLK("omap-mcbsp.4", "fck", &mcbsp4_fck, CK_343X),
|
2009-01-19 08:51:11 -07:00
|
|
|
CLK(NULL, "emu_src_ck", &emu_src_ck, CK_343X),
|
|
|
|
CLK(NULL, "pclk_fck", &pclk_fck, CK_343X),
|
|
|
|
CLK(NULL, "pclkx2_fck", &pclkx2_fck, CK_343X),
|
|
|
|
CLK(NULL, "atclk_fck", &atclk_fck, CK_343X),
|
|
|
|
CLK(NULL, "traceclk_src_fck", &traceclk_src_fck, CK_343X),
|
|
|
|
CLK(NULL, "traceclk_fck", &traceclk_fck, CK_343X),
|
|
|
|
CLK(NULL, "sr1_fck", &sr1_fck, CK_343X),
|
|
|
|
CLK(NULL, "sr2_fck", &sr2_fck, CK_343X),
|
|
|
|
CLK(NULL, "sr_l4_ick", &sr_l4_ick, CK_343X),
|
|
|
|
CLK(NULL, "secure_32k_fck", &secure_32k_fck, CK_343X),
|
|
|
|
CLK(NULL, "gpt12_fck", &gpt12_fck, CK_343X),
|
|
|
|
CLK(NULL, "wdt1_fck", &wdt1_fck, CK_343X),
|
|
|
|
};
|
|
|
|
|
2008-07-03 03:24:45 -06:00
|
|
|
/* CM_AUTOIDLE_PLL*.AUTO_* bit values */
|
|
|
|
#define DPLL_AUTOIDLE_DISABLE 0x0
|
|
|
|
#define DPLL_AUTOIDLE_LOW_POWER_STOP 0x1
|
|
|
|
|
|
|
|
#define MAX_DPLL_WAIT_TRIES 1000000
|
2008-03-18 07:09:51 -06:00
|
|
|
|
2009-05-12 17:26:32 -06:00
|
|
|
#define MIN_SDRC_DLL_LOCK_FREQ 83000000
|
|
|
|
|
2009-06-19 19:08:26 -06:00
|
|
|
#define CYCLES_PER_MHZ 1000000
|
|
|
|
|
|
|
|
/* Scale factor for fixed-point arith in omap3_core_dpll_m2_set_rate() */
|
|
|
|
#define SDRC_MPURATE_SCALE 8
|
|
|
|
|
|
|
|
/* 2^SDRC_MPURATE_BASE_SHIFT: MPU MHz that SDRC_MPURATE_LOOPS is defined for */
|
|
|
|
#define SDRC_MPURATE_BASE_SHIFT 9
|
|
|
|
|
|
|
|
/*
|
|
|
|
* SDRC_MPURATE_LOOPS: Number of MPU loops to execute at
|
|
|
|
* 2^MPURATE_BASE_SHIFT MHz for SDRC to stabilize
|
|
|
|
*/
|
|
|
|
#define SDRC_MPURATE_LOOPS 96
|
|
|
|
|
OMAP3 clock: correct module IDLEST bits: SSI; DSS; USBHOST; HSOTGUSB
Fix two bugs in the OMAP3 clock tree pertaining to the SSI, DSS,
USBHOST, and HSOTGUSB devices. These devices are both interconnect
initiators and targets. Without this patch, clk_enable()s on clocks for
these modules can be very high latency (potentially up to ~200
milliseconds) and message such as the following are generated:
Clock usbhost_48m_fck didn't enable in 100000 tries
Two bugs are fixed by this patch. First, OMAP hardware only supports
target CM_IDLEST register bits on ES2+ chips and beyond. ES1 chips
should not wait for these clocks to enable. So, split the appropriate
clocks into ES1 and ES2+ variants, so that kernels running on ES1
devices won't try to wait.
Second, the current heuristic in omap2_clk_dflt_find_idlest() will
fail for these clocks. It assumes that the CM_IDLEST bit to wait upon
is the same as the CM_*CLKEN bit, which is false[1]. Fix by
implementing custom clkops .find_idlest function pointers for the
appropriate clocks that return the correct slave IDLEST bit shift.
This was originally fixed in the linux-omap kernel during 2.6.29 in a
slightly different manner[2][3].
In the medium-term future, all of the module IDLEST code will
eventually be moved to the omap_hwmod code.
Problem reported by Jarkko Nikula <jhnikula@gmail.com>:
http://marc.info/?l=linux-omap&m=124306184903679&w=2
...
1. See for example 34xx TRM Revision P Table 4-213 and 4-217 (for the
DSS case).
2. http://www.spinics.net/lists/linux-omap/msg05512.html et seq.
3. http://lkml.indiana.edu/hypermail/linux/kernel/0901.3/01498.html
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
2009-07-24 19:44:06 -06:00
|
|
|
/**
|
|
|
|
* omap3430es2_clk_ssi_find_idlest - return CM_IDLEST info for SSI
|
|
|
|
* @clk: struct clk * being enabled
|
|
|
|
* @idlest_reg: void __iomem ** to store CM_IDLEST reg address into
|
|
|
|
* @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into
|
|
|
|
*
|
|
|
|
* The OMAP3430ES2 SSI target CM_IDLEST bit is at a different shift
|
|
|
|
* from the CM_{I,F}CLKEN bit. Pass back the correct info via
|
|
|
|
* @idlest_reg and @idlest_bit. No return value.
|
|
|
|
*/
|
|
|
|
static void omap3430es2_clk_ssi_find_idlest(struct clk *clk,
|
|
|
|
void __iomem **idlest_reg,
|
|
|
|
u8 *idlest_bit)
|
|
|
|
{
|
|
|
|
u32 r;
|
|
|
|
|
|
|
|
r = (((__force u32)clk->enable_reg & ~0xf0) | 0x20);
|
|
|
|
*idlest_reg = (__force void __iomem *)r;
|
|
|
|
*idlest_bit = OMAP3430ES2_ST_SSI_IDLE_SHIFT;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* omap3430es2_clk_dss_usbhost_find_idlest - CM_IDLEST info for DSS, USBHOST
|
|
|
|
* @clk: struct clk * being enabled
|
|
|
|
* @idlest_reg: void __iomem ** to store CM_IDLEST reg address into
|
|
|
|
* @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into
|
|
|
|
*
|
|
|
|
* Some OMAP modules on OMAP3 ES2+ chips have both initiator and
|
|
|
|
* target IDLEST bits. For our purposes, we are concerned with the
|
|
|
|
* target IDLEST bits, which exist at a different bit position than
|
|
|
|
* the *CLKEN bit position for these modules (DSS and USBHOST) (The
|
|
|
|
* default find_idlest code assumes that they are at the same
|
|
|
|
* position.) No return value.
|
|
|
|
*/
|
|
|
|
static void omap3430es2_clk_dss_usbhost_find_idlest(struct clk *clk,
|
|
|
|
void __iomem **idlest_reg,
|
|
|
|
u8 *idlest_bit)
|
|
|
|
{
|
|
|
|
u32 r;
|
|
|
|
|
|
|
|
r = (((__force u32)clk->enable_reg & ~0xf0) | 0x20);
|
|
|
|
*idlest_reg = (__force void __iomem *)r;
|
|
|
|
/* USBHOST_IDLE has same shift */
|
|
|
|
*idlest_bit = OMAP3430ES2_ST_DSS_IDLE_SHIFT;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* omap3430es2_clk_hsotgusb_find_idlest - return CM_IDLEST info for HSOTGUSB
|
|
|
|
* @clk: struct clk * being enabled
|
|
|
|
* @idlest_reg: void __iomem ** to store CM_IDLEST reg address into
|
|
|
|
* @idlest_bit: pointer to a u8 to store the CM_IDLEST bit shift into
|
|
|
|
*
|
|
|
|
* The OMAP3430ES2 HSOTGUSB target CM_IDLEST bit is at a different
|
|
|
|
* shift from the CM_{I,F}CLKEN bit. Pass back the correct info via
|
|
|
|
* @idlest_reg and @idlest_bit. No return value.
|
|
|
|
*/
|
|
|
|
static void omap3430es2_clk_hsotgusb_find_idlest(struct clk *clk,
|
|
|
|
void __iomem **idlest_reg,
|
|
|
|
u8 *idlest_bit)
|
|
|
|
{
|
|
|
|
u32 r;
|
|
|
|
|
|
|
|
r = (((__force u32)clk->enable_reg & ~0xf0) | 0x20);
|
|
|
|
*idlest_reg = (__force void __iomem *)r;
|
|
|
|
*idlest_bit = OMAP3430ES2_ST_HSOTGUSB_IDLE_SHIFT;
|
|
|
|
}
|
|
|
|
|
2008-03-18 07:09:51 -06:00
|
|
|
/**
|
|
|
|
* omap3_dpll_recalc - recalculate DPLL rate
|
|
|
|
* @clk: DPLL struct clk
|
|
|
|
*
|
|
|
|
* Recalculate and propagate the DPLL rate.
|
|
|
|
*/
|
2009-02-12 03:12:59 -07:00
|
|
|
static unsigned long omap3_dpll_recalc(struct clk *clk)
|
2008-03-18 07:09:51 -06:00
|
|
|
{
|
2009-02-12 03:12:59 -07:00
|
|
|
return omap2_get_dpll_rate(clk);
|
2008-03-18 07:09:51 -06:00
|
|
|
}
|
|
|
|
|
2008-07-03 03:24:45 -06:00
|
|
|
/* _omap3_dpll_write_clken - write clken_bits arg to a DPLL's enable bits */
|
|
|
|
static void _omap3_dpll_write_clken(struct clk *clk, u8 clken_bits)
|
|
|
|
{
|
|
|
|
const struct dpll_data *dd;
|
2008-08-19 02:08:40 -06:00
|
|
|
u32 v;
|
2008-07-03 03:24:45 -06:00
|
|
|
|
|
|
|
dd = clk->dpll_data;
|
|
|
|
|
2008-08-19 02:08:40 -06:00
|
|
|
v = __raw_readl(dd->control_reg);
|
|
|
|
v &= ~dd->enable_mask;
|
|
|
|
v |= clken_bits << __ffs(dd->enable_mask);
|
|
|
|
__raw_writel(v, dd->control_reg);
|
2008-07-03 03:24:45 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/* _omap3_wait_dpll_status: wait for a DPLL to enter a specific state */
|
|
|
|
static int _omap3_wait_dpll_status(struct clk *clk, u8 state)
|
|
|
|
{
|
|
|
|
const struct dpll_data *dd;
|
|
|
|
int i = 0;
|
|
|
|
int ret = -EINVAL;
|
|
|
|
|
|
|
|
dd = clk->dpll_data;
|
|
|
|
|
2009-01-28 12:08:17 -07:00
|
|
|
state <<= __ffs(dd->idlest_mask);
|
2008-07-03 03:24:45 -06:00
|
|
|
|
2009-01-28 12:08:17 -07:00
|
|
|
while (((__raw_readl(dd->idlest_reg) & dd->idlest_mask) != state) &&
|
2008-07-03 03:24:45 -06:00
|
|
|
i < MAX_DPLL_WAIT_TRIES) {
|
|
|
|
i++;
|
|
|
|
udelay(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i == MAX_DPLL_WAIT_TRIES) {
|
|
|
|
printk(KERN_ERR "clock: %s failed transition to '%s'\n",
|
|
|
|
clk->name, (state) ? "locked" : "bypassed");
|
|
|
|
} else {
|
|
|
|
pr_debug("clock: %s transition to '%s' in %d loops\n",
|
|
|
|
clk->name, (state) ? "locked" : "bypassed", i);
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-01-27 19:12:47 -07:00
|
|
|
/* From 3430 TRM ES2 4.7.6.2 */
|
|
|
|
static u16 _omap3_dpll_compute_freqsel(struct clk *clk, u8 n)
|
|
|
|
{
|
|
|
|
unsigned long fint;
|
|
|
|
u16 f = 0;
|
|
|
|
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
fint = clk->dpll_data->clk_ref->rate / (n + 1);
|
2009-01-27 19:12:47 -07:00
|
|
|
|
|
|
|
pr_debug("clock: fint is %lu\n", fint);
|
|
|
|
|
|
|
|
if (fint >= 750000 && fint <= 1000000)
|
|
|
|
f = 0x3;
|
|
|
|
else if (fint > 1000000 && fint <= 1250000)
|
|
|
|
f = 0x4;
|
|
|
|
else if (fint > 1250000 && fint <= 1500000)
|
|
|
|
f = 0x5;
|
|
|
|
else if (fint > 1500000 && fint <= 1750000)
|
|
|
|
f = 0x6;
|
|
|
|
else if (fint > 1750000 && fint <= 2100000)
|
|
|
|
f = 0x7;
|
|
|
|
else if (fint > 7500000 && fint <= 10000000)
|
|
|
|
f = 0xB;
|
|
|
|
else if (fint > 10000000 && fint <= 12500000)
|
|
|
|
f = 0xC;
|
|
|
|
else if (fint > 12500000 && fint <= 15000000)
|
|
|
|
f = 0xD;
|
|
|
|
else if (fint > 15000000 && fint <= 17500000)
|
|
|
|
f = 0xE;
|
|
|
|
else if (fint > 17500000 && fint <= 21000000)
|
|
|
|
f = 0xF;
|
|
|
|
else
|
|
|
|
pr_debug("clock: unknown freqsel setting for %d\n", n);
|
|
|
|
|
|
|
|
return f;
|
|
|
|
}
|
|
|
|
|
2008-07-03 03:24:45 -06:00
|
|
|
/* Non-CORE DPLL (e.g., DPLLs that do not control SDRC) clock functions */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* _omap3_noncore_dpll_lock - instruct a DPLL to lock and wait for readiness
|
|
|
|
* @clk: pointer to a DPLL struct clk
|
|
|
|
*
|
|
|
|
* Instructs a non-CORE DPLL to lock. Waits for the DPLL to report
|
|
|
|
* readiness before returning. Will save and restore the DPLL's
|
|
|
|
* autoidle state across the enable, per the CDP code. If the DPLL
|
|
|
|
* locked successfully, return 0; if the DPLL did not lock in the time
|
|
|
|
* allotted, or DPLL3 was passed in, return -EINVAL.
|
|
|
|
*/
|
|
|
|
static int _omap3_noncore_dpll_lock(struct clk *clk)
|
|
|
|
{
|
|
|
|
u8 ai;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
if (clk == &dpll3_ck)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
pr_debug("clock: locking DPLL %s\n", clk->name);
|
|
|
|
|
|
|
|
ai = omap3_dpll_autoidle_read(clk);
|
|
|
|
|
2009-01-28 12:08:46 -07:00
|
|
|
omap3_dpll_deny_idle(clk);
|
|
|
|
|
2008-07-03 03:24:45 -06:00
|
|
|
_omap3_dpll_write_clken(clk, DPLL_LOCKED);
|
|
|
|
|
2009-01-28 12:08:46 -07:00
|
|
|
r = _omap3_wait_dpll_status(clk, 1);
|
|
|
|
|
|
|
|
if (ai)
|
2008-07-03 03:24:45 -06:00
|
|
|
omap3_dpll_allow_idle(clk);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
* _omap3_noncore_dpll_bypass - instruct a DPLL to bypass and wait for readiness
|
2008-07-03 03:24:45 -06:00
|
|
|
* @clk: pointer to a DPLL struct clk
|
|
|
|
*
|
|
|
|
* Instructs a non-CORE DPLL to enter low-power bypass mode. In
|
|
|
|
* bypass mode, the DPLL's rate is set equal to its parent clock's
|
|
|
|
* rate. Waits for the DPLL to report readiness before returning.
|
|
|
|
* Will save and restore the DPLL's autoidle state across the enable,
|
|
|
|
* per the CDP code. If the DPLL entered bypass mode successfully,
|
|
|
|
* return 0; if the DPLL did not enter bypass in the time allotted, or
|
|
|
|
* DPLL3 was passed in, or the DPLL does not support low-power bypass,
|
|
|
|
* return -EINVAL.
|
|
|
|
*/
|
|
|
|
static int _omap3_noncore_dpll_bypass(struct clk *clk)
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
u8 ai;
|
|
|
|
|
|
|
|
if (clk == &dpll3_ck)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_BYPASS)))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
pr_debug("clock: configuring DPLL %s for low-power bypass\n",
|
|
|
|
clk->name);
|
|
|
|
|
|
|
|
ai = omap3_dpll_autoidle_read(clk);
|
|
|
|
|
|
|
|
_omap3_dpll_write_clken(clk, DPLL_LOW_POWER_BYPASS);
|
|
|
|
|
|
|
|
r = _omap3_wait_dpll_status(clk, 0);
|
|
|
|
|
|
|
|
if (ai)
|
|
|
|
omap3_dpll_allow_idle(clk);
|
|
|
|
else
|
|
|
|
omap3_dpll_deny_idle(clk);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* _omap3_noncore_dpll_stop - instruct a DPLL to stop
|
|
|
|
* @clk: pointer to a DPLL struct clk
|
|
|
|
*
|
|
|
|
* Instructs a non-CORE DPLL to enter low-power stop. Will save and
|
|
|
|
* restore the DPLL's autoidle state across the stop, per the CDP
|
|
|
|
* code. If DPLL3 was passed in, or the DPLL does not support
|
|
|
|
* low-power stop, return -EINVAL; otherwise, return 0.
|
|
|
|
*/
|
|
|
|
static int _omap3_noncore_dpll_stop(struct clk *clk)
|
|
|
|
{
|
|
|
|
u8 ai;
|
|
|
|
|
|
|
|
if (clk == &dpll3_ck)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (!(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_STOP)))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
pr_debug("clock: stopping DPLL %s\n", clk->name);
|
|
|
|
|
|
|
|
ai = omap3_dpll_autoidle_read(clk);
|
|
|
|
|
|
|
|
_omap3_dpll_write_clken(clk, DPLL_LOW_POWER_STOP);
|
|
|
|
|
|
|
|
if (ai)
|
|
|
|
omap3_dpll_allow_idle(clk);
|
|
|
|
else
|
|
|
|
omap3_dpll_deny_idle(clk);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* omap3_noncore_dpll_enable - instruct a DPLL to enter bypass or lock mode
|
|
|
|
* @clk: pointer to a DPLL struct clk
|
|
|
|
*
|
|
|
|
* Instructs a non-CORE DPLL to enable, e.g., to enter bypass or lock.
|
|
|
|
* The choice of modes depends on the DPLL's programmed rate: if it is
|
|
|
|
* the same as the DPLL's parent clock, it will enter bypass;
|
|
|
|
* otherwise, it will enter lock. This code will wait for the DPLL to
|
|
|
|
* indicate readiness before returning, unless the DPLL takes too long
|
|
|
|
* to enter the target state. Intended to be used as the struct clk's
|
|
|
|
* enable function. If DPLL3 was passed in, or the DPLL does not
|
|
|
|
* support low-power stop, or if the DPLL took too long to enter
|
|
|
|
* bypass or lock, return -EINVAL; otherwise, return 0.
|
|
|
|
*/
|
|
|
|
static int omap3_noncore_dpll_enable(struct clk *clk)
|
|
|
|
{
|
|
|
|
int r;
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
struct dpll_data *dd;
|
2008-07-03 03:24:45 -06:00
|
|
|
|
|
|
|
if (clk == &dpll3_ck)
|
|
|
|
return -EINVAL;
|
|
|
|
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
dd = clk->dpll_data;
|
|
|
|
if (!dd)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (clk->rate == dd->clk_bypass->rate) {
|
|
|
|
WARN_ON(clk->parent != dd->clk_bypass);
|
2008-07-03 03:24:45 -06:00
|
|
|
r = _omap3_noncore_dpll_bypass(clk);
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
} else {
|
|
|
|
WARN_ON(clk->parent != dd->clk_ref);
|
2008-07-03 03:24:45 -06:00
|
|
|
r = _omap3_noncore_dpll_lock(clk);
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
}
|
|
|
|
/* FIXME: this is dubious - if clk->rate has changed, what about propagating? */
|
|
|
|
if (!r)
|
|
|
|
clk->rate = omap2_get_dpll_rate(clk);
|
2008-07-03 03:24:45 -06:00
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* omap3_noncore_dpll_enable - instruct a DPLL to enter bypass or lock mode
|
|
|
|
* @clk: pointer to a DPLL struct clk
|
|
|
|
*
|
|
|
|
* Instructs a non-CORE DPLL to enable, e.g., to enter bypass or lock.
|
|
|
|
* The choice of modes depends on the DPLL's programmed rate: if it is
|
|
|
|
* the same as the DPLL's parent clock, it will enter bypass;
|
|
|
|
* otherwise, it will enter lock. This code will wait for the DPLL to
|
|
|
|
* indicate readiness before returning, unless the DPLL takes too long
|
|
|
|
* to enter the target state. Intended to be used as the struct clk's
|
|
|
|
* enable function. If DPLL3 was passed in, or the DPLL does not
|
|
|
|
* support low-power stop, or if the DPLL took too long to enter
|
|
|
|
* bypass or lock, return -EINVAL; otherwise, return 0.
|
|
|
|
*/
|
|
|
|
static void omap3_noncore_dpll_disable(struct clk *clk)
|
|
|
|
{
|
|
|
|
if (clk == &dpll3_ck)
|
|
|
|
return;
|
|
|
|
|
|
|
|
_omap3_noncore_dpll_stop(clk);
|
|
|
|
}
|
|
|
|
|
2009-01-27 19:12:47 -07:00
|
|
|
|
|
|
|
/* Non-CORE DPLL rate set code */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* omap3_noncore_dpll_program - set non-core DPLL M,N values directly
|
|
|
|
* @clk: struct clk * of DPLL to set
|
|
|
|
* @m: DPLL multiplier to set
|
|
|
|
* @n: DPLL divider to set
|
|
|
|
* @freqsel: FREQSEL value to set
|
|
|
|
*
|
|
|
|
* Program the DPLL with the supplied M, N values, and wait for the DPLL to
|
|
|
|
* lock.. Returns -EINVAL upon error, or 0 upon success.
|
|
|
|
*/
|
|
|
|
static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel)
|
|
|
|
{
|
|
|
|
struct dpll_data *dd = clk->dpll_data;
|
|
|
|
u32 v;
|
|
|
|
|
|
|
|
/* 3430 ES2 TRM: 4.7.6.9 DPLL Programming Sequence */
|
|
|
|
_omap3_noncore_dpll_bypass(clk);
|
|
|
|
|
2009-01-28 12:08:11 -07:00
|
|
|
/* Set jitter correction */
|
|
|
|
v = __raw_readl(dd->control_reg);
|
|
|
|
v &= ~dd->freqsel_mask;
|
|
|
|
v |= freqsel << __ffs(dd->freqsel_mask);
|
|
|
|
__raw_writel(v, dd->control_reg);
|
|
|
|
|
|
|
|
/* Set DPLL multiplier, divider */
|
2009-01-27 19:12:47 -07:00
|
|
|
v = __raw_readl(dd->mult_div1_reg);
|
|
|
|
v &= ~(dd->mult_mask | dd->div1_mask);
|
|
|
|
v |= m << __ffs(dd->mult_mask);
|
2009-01-28 12:08:11 -07:00
|
|
|
v |= (n - 1) << __ffs(dd->div1_mask);
|
2009-01-27 19:12:47 -07:00
|
|
|
__raw_writel(v, dd->mult_div1_reg);
|
|
|
|
|
|
|
|
/* We let the clock framework set the other output dividers later */
|
|
|
|
|
|
|
|
/* REVISIT: Set ramp-up delay? */
|
|
|
|
|
|
|
|
_omap3_noncore_dpll_lock(clk);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* omap3_noncore_dpll_set_rate - set non-core DPLL rate
|
|
|
|
* @clk: struct clk * of DPLL to set
|
|
|
|
* @rate: rounded target rate
|
|
|
|
*
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
* Set the DPLL CLKOUT to the target rate. If the DPLL can enter
|
|
|
|
* low-power bypass, and the target rate is the bypass source clock
|
|
|
|
* rate, then configure the DPLL for bypass. Otherwise, round the
|
|
|
|
* target rate if it hasn't been done already, then program and lock
|
|
|
|
* the DPLL. Returns -EINVAL upon error, or 0 upon success.
|
2009-01-27 19:12:47 -07:00
|
|
|
*/
|
|
|
|
static int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate)
|
|
|
|
{
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
struct clk *new_parent = NULL;
|
2009-01-27 19:12:47 -07:00
|
|
|
u16 freqsel;
|
|
|
|
struct dpll_data *dd;
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
int ret;
|
2009-01-27 19:12:47 -07:00
|
|
|
|
|
|
|
if (!clk || !rate)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
dd = clk->dpll_data;
|
|
|
|
if (!dd)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (rate == omap2_get_dpll_rate(clk))
|
|
|
|
return 0;
|
|
|
|
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
/*
|
|
|
|
* Ensure both the bypass and ref clocks are enabled prior to
|
|
|
|
* doing anything; we need the bypass clock running to reprogram
|
|
|
|
* the DPLL.
|
|
|
|
*/
|
|
|
|
omap2_clk_enable(dd->clk_bypass);
|
|
|
|
omap2_clk_enable(dd->clk_ref);
|
2009-01-27 19:12:47 -07:00
|
|
|
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
if (dd->clk_bypass->rate == rate &&
|
|
|
|
(clk->dpll_data->modes & (1 << DPLL_LOW_POWER_BYPASS))) {
|
|
|
|
pr_debug("clock: %s: set rate: entering bypass.\n", clk->name);
|
|
|
|
|
|
|
|
ret = _omap3_noncore_dpll_bypass(clk);
|
|
|
|
if (!ret)
|
|
|
|
new_parent = dd->clk_bypass;
|
|
|
|
} else {
|
|
|
|
if (dd->last_rounded_rate != rate)
|
|
|
|
omap2_dpll_round_rate(clk, rate);
|
2009-01-27 19:12:47 -07:00
|
|
|
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
if (dd->last_rounded_rate == 0)
|
|
|
|
return -EINVAL;
|
2009-01-27 19:12:47 -07:00
|
|
|
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
freqsel = _omap3_dpll_compute_freqsel(clk, dd->last_rounded_n);
|
|
|
|
if (!freqsel)
|
|
|
|
WARN_ON(1);
|
|
|
|
|
|
|
|
pr_debug("clock: %s: set rate: locking rate to %lu.\n",
|
|
|
|
clk->name, rate);
|
|
|
|
|
|
|
|
ret = omap3_noncore_dpll_program(clk, dd->last_rounded_m,
|
|
|
|
dd->last_rounded_n, freqsel);
|
|
|
|
if (!ret)
|
|
|
|
new_parent = dd->clk_ref;
|
|
|
|
}
|
|
|
|
if (!ret) {
|
|
|
|
/*
|
|
|
|
* Switch the parent clock in the heirarchy, and make sure
|
|
|
|
* that the new parent's usecount is correct. Note: we
|
|
|
|
* enable the new parent before disabling the old to avoid
|
|
|
|
* any unnecessary hardware disable->enable transitions.
|
|
|
|
*/
|
|
|
|
if (clk->usecount) {
|
|
|
|
omap2_clk_enable(new_parent);
|
|
|
|
omap2_clk_disable(clk->parent);
|
|
|
|
}
|
|
|
|
clk_reparent(clk, new_parent);
|
|
|
|
clk->rate = rate;
|
|
|
|
}
|
|
|
|
omap2_clk_disable(dd->clk_ref);
|
|
|
|
omap2_clk_disable(dd->clk_bypass);
|
2009-01-27 19:12:47 -07:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int omap3_dpll4_set_rate(struct clk *clk, unsigned long rate)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* According to the 12-5 CDP code from TI, "Limitation 2.5"
|
|
|
|
* on 3430ES1 prevents us from changing DPLL multipliers or dividers
|
|
|
|
* on DPLL4.
|
|
|
|
*/
|
|
|
|
if (omap_rev() == OMAP3430_REV_ES1_0) {
|
|
|
|
printk(KERN_ERR "clock: DPLL4 cannot change rate due to "
|
|
|
|
"silicon 'Limitation 2.5' on 3430ES1.\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
return omap3_noncore_dpll_set_rate(clk, rate);
|
|
|
|
}
|
|
|
|
|
2009-01-28 12:27:42 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* CORE DPLL (DPLL3) rate programming functions
|
|
|
|
*
|
|
|
|
* These call into SRAM code to do the actual CM writes, since the SDRAM
|
|
|
|
* is clocked from DPLL3.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* omap3_core_dpll_m2_set_rate - set CORE DPLL M2 divider
|
|
|
|
* @clk: struct clk * of DPLL to set
|
|
|
|
* @rate: rounded target rate
|
|
|
|
*
|
|
|
|
* Program the DPLL M2 divider with the rounded target rate. Returns
|
|
|
|
* -EINVAL upon error, or 0 upon success.
|
|
|
|
*/
|
|
|
|
static int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate)
|
|
|
|
{
|
|
|
|
u32 new_div = 0;
|
2009-05-12 17:26:32 -06:00
|
|
|
u32 unlock_dll = 0;
|
2009-06-19 19:08:26 -06:00
|
|
|
u32 c;
|
|
|
|
unsigned long validrate, sdrcrate, mpurate;
|
2009-07-24 19:43:25 -06:00
|
|
|
struct omap_sdrc_params *sdrc_cs0;
|
|
|
|
struct omap_sdrc_params *sdrc_cs1;
|
|
|
|
int ret;
|
2009-01-28 12:27:42 -07:00
|
|
|
|
|
|
|
if (!clk || !rate)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (clk != &dpll3_m2_ck)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
validrate = omap2_clksel_round_rate_div(clk, rate, &new_div);
|
|
|
|
if (validrate != rate)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
sdrcrate = sdrc_ick.rate;
|
|
|
|
if (rate > clk->rate)
|
2009-06-19 19:08:29 -06:00
|
|
|
sdrcrate <<= ((rate / clk->rate) >> 1);
|
2009-01-28 12:27:42 -07:00
|
|
|
else
|
2009-06-19 19:08:29 -06:00
|
|
|
sdrcrate >>= ((clk->rate / rate) >> 1);
|
2009-01-28 12:27:42 -07:00
|
|
|
|
2009-07-24 19:43:25 -06:00
|
|
|
ret = omap2_sdrc_get_params(sdrcrate, &sdrc_cs0, &sdrc_cs1);
|
|
|
|
if (ret)
|
2009-01-28 12:27:42 -07:00
|
|
|
return -EINVAL;
|
|
|
|
|
2009-05-12 17:26:32 -06:00
|
|
|
if (sdrcrate < MIN_SDRC_DLL_LOCK_FREQ) {
|
|
|
|
pr_debug("clock: will unlock SDRC DLL\n");
|
|
|
|
unlock_dll = 1;
|
|
|
|
}
|
|
|
|
|
2009-06-19 19:08:26 -06:00
|
|
|
/*
|
|
|
|
* XXX This only needs to be done when the CPU frequency changes
|
|
|
|
*/
|
|
|
|
mpurate = arm_fck.rate / CYCLES_PER_MHZ;
|
|
|
|
c = (mpurate << SDRC_MPURATE_SCALE) >> SDRC_MPURATE_BASE_SHIFT;
|
|
|
|
c += 1; /* for safety */
|
|
|
|
c *= SDRC_MPURATE_LOOPS;
|
|
|
|
c >>= SDRC_MPURATE_SCALE;
|
|
|
|
if (c == 0)
|
|
|
|
c = 1;
|
|
|
|
|
2009-05-12 17:27:10 -06:00
|
|
|
pr_debug("clock: changing CORE DPLL rate from %lu to %lu\n", clk->rate,
|
|
|
|
validrate);
|
2009-07-24 19:43:25 -06:00
|
|
|
pr_debug("clock: SDRC CS0 timing params used:"
|
|
|
|
" RFR %08x CTRLA %08x CTRLB %08x MR %08x\n",
|
|
|
|
sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla,
|
|
|
|
sdrc_cs0->actim_ctrlb, sdrc_cs0->mr);
|
|
|
|
if (sdrc_cs1)
|
|
|
|
pr_debug("clock: SDRC CS1 timing params used: "
|
|
|
|
" RFR %08x CTRLA %08x CTRLB %08x MR %08x\n",
|
|
|
|
sdrc_cs1->rfr_ctrl, sdrc_cs1->actim_ctrla,
|
|
|
|
sdrc_cs1->actim_ctrlb, sdrc_cs1->mr);
|
|
|
|
|
|
|
|
if (sdrc_cs1)
|
|
|
|
omap3_configure_core_dpll(
|
|
|
|
new_div, unlock_dll, c, rate > clk->rate,
|
|
|
|
sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla,
|
|
|
|
sdrc_cs0->actim_ctrlb, sdrc_cs0->mr,
|
|
|
|
sdrc_cs1->rfr_ctrl, sdrc_cs1->actim_ctrla,
|
|
|
|
sdrc_cs1->actim_ctrlb, sdrc_cs1->mr);
|
|
|
|
else
|
|
|
|
omap3_configure_core_dpll(
|
|
|
|
new_div, unlock_dll, c, rate > clk->rate,
|
|
|
|
sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla,
|
|
|
|
sdrc_cs0->actim_ctrlb, sdrc_cs0->mr,
|
|
|
|
0, 0, 0, 0);
|
2009-01-28 12:27:42 -07:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-11-04 07:02:46 -07:00
|
|
|
static const struct clkops clkops_noncore_dpll_ops = {
|
|
|
|
.enable = &omap3_noncore_dpll_enable,
|
|
|
|
.disable = &omap3_noncore_dpll_disable,
|
|
|
|
};
|
|
|
|
|
2009-01-27 19:12:47 -07:00
|
|
|
/* DPLL autoidle read/set code */
|
|
|
|
|
|
|
|
|
2008-07-03 03:24:45 -06:00
|
|
|
/**
|
|
|
|
* omap3_dpll_autoidle_read - read a DPLL's autoidle bits
|
|
|
|
* @clk: struct clk * of the DPLL to read
|
|
|
|
*
|
|
|
|
* Return the DPLL's autoidle bits, shifted down to bit 0. Returns
|
|
|
|
* -EINVAL if passed a null pointer or if the struct clk does not
|
|
|
|
* appear to refer to a DPLL.
|
|
|
|
*/
|
|
|
|
static u32 omap3_dpll_autoidle_read(struct clk *clk)
|
|
|
|
{
|
|
|
|
const struct dpll_data *dd;
|
|
|
|
u32 v;
|
|
|
|
|
|
|
|
if (!clk || !clk->dpll_data)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
dd = clk->dpll_data;
|
|
|
|
|
2008-08-19 02:08:40 -06:00
|
|
|
v = __raw_readl(dd->autoidle_reg);
|
2008-07-03 03:24:45 -06:00
|
|
|
v &= dd->autoidle_mask;
|
|
|
|
v >>= __ffs(dd->autoidle_mask);
|
|
|
|
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* omap3_dpll_allow_idle - enable DPLL autoidle bits
|
|
|
|
* @clk: struct clk * of the DPLL to operate on
|
|
|
|
*
|
|
|
|
* Enable DPLL automatic idle control. This automatic idle mode
|
|
|
|
* switching takes effect only when the DPLL is locked, at least on
|
|
|
|
* OMAP3430. The DPLL will enter low-power stop when its downstream
|
|
|
|
* clocks are gated. No return value.
|
|
|
|
*/
|
|
|
|
static void omap3_dpll_allow_idle(struct clk *clk)
|
|
|
|
{
|
|
|
|
const struct dpll_data *dd;
|
2008-08-19 02:08:40 -06:00
|
|
|
u32 v;
|
2008-07-03 03:24:45 -06:00
|
|
|
|
|
|
|
if (!clk || !clk->dpll_data)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dd = clk->dpll_data;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* REVISIT: CORE DPLL can optionally enter low-power bypass
|
|
|
|
* by writing 0x5 instead of 0x1. Add some mechanism to
|
|
|
|
* optionally enter this mode.
|
|
|
|
*/
|
2008-08-19 02:08:40 -06:00
|
|
|
v = __raw_readl(dd->autoidle_reg);
|
|
|
|
v &= ~dd->autoidle_mask;
|
|
|
|
v |= DPLL_AUTOIDLE_LOW_POWER_STOP << __ffs(dd->autoidle_mask);
|
|
|
|
__raw_writel(v, dd->autoidle_reg);
|
2008-07-03 03:24:45 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* omap3_dpll_deny_idle - prevent DPLL from automatically idling
|
|
|
|
* @clk: struct clk * of the DPLL to operate on
|
|
|
|
*
|
|
|
|
* Disable DPLL automatic idle control. No return value.
|
|
|
|
*/
|
|
|
|
static void omap3_dpll_deny_idle(struct clk *clk)
|
|
|
|
{
|
|
|
|
const struct dpll_data *dd;
|
2008-08-19 02:08:40 -06:00
|
|
|
u32 v;
|
2008-07-03 03:24:45 -06:00
|
|
|
|
|
|
|
if (!clk || !clk->dpll_data)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dd = clk->dpll_data;
|
|
|
|
|
2008-08-19 02:08:40 -06:00
|
|
|
v = __raw_readl(dd->autoidle_reg);
|
|
|
|
v &= ~dd->autoidle_mask;
|
|
|
|
v |= DPLL_AUTOIDLE_DISABLE << __ffs(dd->autoidle_mask);
|
|
|
|
__raw_writel(v, dd->autoidle_reg);
|
2008-07-03 03:24:45 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Clock control for DPLL outputs */
|
|
|
|
|
2008-03-18 07:09:51 -06:00
|
|
|
/**
|
|
|
|
* omap3_clkoutx2_recalc - recalculate DPLL X2 output virtual clock rate
|
|
|
|
* @clk: DPLL output struct clk
|
|
|
|
*
|
|
|
|
* Using parent clock DPLL data, look up DPLL state. If locked, set our
|
|
|
|
* rate to the dpll_clk * 2; otherwise, just use dpll_clk.
|
|
|
|
*/
|
2009-02-12 03:12:59 -07:00
|
|
|
static unsigned long omap3_clkoutx2_recalc(struct clk *clk)
|
2008-03-18 07:09:51 -06:00
|
|
|
{
|
|
|
|
const struct dpll_data *dd;
|
2009-02-12 03:12:59 -07:00
|
|
|
unsigned long rate;
|
2008-03-18 07:09:51 -06:00
|
|
|
u32 v;
|
|
|
|
struct clk *pclk;
|
|
|
|
|
|
|
|
/* Walk up the parents of clk, looking for a DPLL */
|
|
|
|
pclk = clk->parent;
|
|
|
|
while (pclk && !pclk->dpll_data)
|
|
|
|
pclk = pclk->parent;
|
|
|
|
|
|
|
|
/* clk does not have a DPLL as a parent? */
|
|
|
|
WARN_ON(!pclk);
|
|
|
|
|
|
|
|
dd = pclk->dpll_data;
|
|
|
|
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
WARN_ON(!dd->enable_mask);
|
2008-03-18 07:09:51 -06:00
|
|
|
|
|
|
|
v = __raw_readl(dd->control_reg) & dd->enable_mask;
|
|
|
|
v >>= __ffs(dd->enable_mask);
|
[ARM] omap: add support for bypassing DPLLs
This roughly corresponds with OMAP commits: 7d06c48, 3241b19,
88b5d9b, 18a5500, 9c909ac, 5c6497b, 8b1f0bd, 2ac1da8.
For both OMAP2 and OMAP3, we note the reference and bypass clocks in
the DPLL data structure. Whenever we modify the DPLL rate, we first
ensure that both the reference and bypass clocks are enabled. Then,
we decide whether to use the reference and DPLL, or the bypass clock
if the desired rate is identical to the bypass rate, and program the
DPLL appropriately. Finally, we update the clock's parent, and then
disable the unused clocks.
This keeps the parents correctly balanced, and more importantly ensures
that the bypass clock is running whenever we reprogram the DPLL. This
is especially important because the procedure for reprogramming the DPLL
involves switching to the bypass clock.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-02-19 06:29:22 -07:00
|
|
|
if (v != OMAP3XXX_EN_DPLL_LOCKED)
|
2009-02-12 03:12:59 -07:00
|
|
|
rate = clk->parent->rate;
|
2008-03-18 07:09:51 -06:00
|
|
|
else
|
2009-02-12 03:12:59 -07:00
|
|
|
rate = clk->parent->rate * 2;
|
|
|
|
return rate;
|
2008-03-18 07:09:51 -06:00
|
|
|
}
|
|
|
|
|
2008-07-03 03:24:45 -06:00
|
|
|
/* Common clock code */
|
|
|
|
|
2008-03-18 07:09:51 -06:00
|
|
|
/*
|
|
|
|
* As it is structured now, this will prevent an OMAP2/3 multiboot
|
|
|
|
* kernel from compiling. This will need further attention.
|
|
|
|
*/
|
|
|
|
#if defined(CONFIG_ARCH_OMAP3)
|
|
|
|
|
|
|
|
static struct clk_functions omap2_clk_functions = {
|
|
|
|
.clk_enable = omap2_clk_enable,
|
|
|
|
.clk_disable = omap2_clk_disable,
|
|
|
|
.clk_round_rate = omap2_clk_round_rate,
|
|
|
|
.clk_set_rate = omap2_clk_set_rate,
|
|
|
|
.clk_set_parent = omap2_clk_set_parent,
|
|
|
|
.clk_disable_unused = omap2_clk_disable_unused,
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set clocks for bypass mode for reboot to work.
|
|
|
|
*/
|
|
|
|
void omap2_clk_prepare_for_reboot(void)
|
|
|
|
{
|
|
|
|
/* REVISIT: Not ready for 343x */
|
|
|
|
#if 0
|
|
|
|
u32 rate;
|
|
|
|
|
|
|
|
if (vclk == NULL || sclk == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
rate = clk_get_rate(sclk);
|
|
|
|
clk_set_rate(vclk, rate);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/* REVISIT: Move this init stuff out into clock.c */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Switch the MPU rate if specified on cmdline.
|
|
|
|
* We cannot do this early until cmdline is parsed.
|
|
|
|
*/
|
|
|
|
static int __init omap2_clk_arch_init(void)
|
|
|
|
{
|
|
|
|
if (!mpurate)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* REVISIT: not yet ready for 343x */
|
|
|
|
#if 0
|
2009-01-28 12:27:48 -07:00
|
|
|
if (clk_set_rate(&virt_prcm_set, mpurate))
|
2008-03-18 07:09:51 -06:00
|
|
|
printk(KERN_ERR "Could not find matching MPU rate\n");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
recalculate_root_clocks();
|
|
|
|
|
|
|
|
printk(KERN_INFO "Switched to new clocking rate (Crystal/DPLL3/MPU): "
|
|
|
|
"%ld.%01ld/%ld/%ld MHz\n",
|
|
|
|
(osc_sys_ck.rate / 1000000), (osc_sys_ck.rate / 100000) % 10,
|
|
|
|
(core_ck.rate / 1000000), (dpll1_fck.rate / 1000000)) ;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
arch_initcall(omap2_clk_arch_init);
|
|
|
|
|
|
|
|
int __init omap2_clk_init(void)
|
|
|
|
{
|
|
|
|
/* struct prcm_config *prcm; */
|
2009-01-19 08:51:11 -07:00
|
|
|
struct omap_clk *c;
|
2008-03-18 07:09:51 -06:00
|
|
|
/* u32 clkrate; */
|
|
|
|
u32 cpu_clkflg;
|
|
|
|
|
|
|
|
if (cpu_is_omap34xx()) {
|
|
|
|
cpu_mask = RATE_IN_343X;
|
2009-01-19 08:51:11 -07:00
|
|
|
cpu_clkflg = CK_343X;
|
2008-03-18 07:09:51 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Update this if there are further clock changes between ES2
|
|
|
|
* and production parts
|
|
|
|
*/
|
2008-12-10 18:36:31 -07:00
|
|
|
if (omap_rev() == OMAP3430_REV_ES1_0) {
|
2008-03-18 07:09:51 -06:00
|
|
|
/* No 3430ES1-only rates exist, so no RATE_IN_3430ES1 */
|
2009-01-19 08:51:11 -07:00
|
|
|
cpu_clkflg |= CK_3430ES1;
|
2008-03-18 07:09:51 -06:00
|
|
|
} else {
|
|
|
|
cpu_mask |= RATE_IN_3430ES2;
|
2009-01-19 08:51:11 -07:00
|
|
|
cpu_clkflg |= CK_3430ES2;
|
2008-03-18 07:09:51 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
clk_init(&omap2_clk_functions);
|
|
|
|
|
2009-01-31 03:05:51 -07:00
|
|
|
for (c = omap34xx_clks; c < omap34xx_clks + ARRAY_SIZE(omap34xx_clks); c++)
|
2009-05-12 17:50:30 -06:00
|
|
|
clk_preinit(c->lk.clk);
|
2009-01-31 03:05:51 -07:00
|
|
|
|
2009-01-19 08:51:11 -07:00
|
|
|
for (c = omap34xx_clks; c < omap34xx_clks + ARRAY_SIZE(omap34xx_clks); c++)
|
|
|
|
if (c->cpu & cpu_clkflg) {
|
|
|
|
clkdev_add(&c->lk);
|
|
|
|
clk_register(c->lk.clk);
|
|
|
|
omap2_init_clk_clkdm(c->lk.clk);
|
2008-08-19 02:08:45 -06:00
|
|
|
}
|
2008-03-18 07:09:51 -06:00
|
|
|
|
|
|
|
/* REVISIT: Not yet ready for OMAP3 */
|
|
|
|
#if 0
|
|
|
|
/* Check the MPU rate set by bootloader */
|
|
|
|
clkrate = omap2_get_dpll_rate_24xx(&dpll_ck);
|
|
|
|
for (prcm = rate_table; prcm->mpu_speed; prcm++) {
|
|
|
|
if (!(prcm->flags & cpu_mask))
|
|
|
|
continue;
|
|
|
|
if (prcm->xtal_speed != sys_ck.rate)
|
|
|
|
continue;
|
|
|
|
if (prcm->dpll_speed <= clkrate)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
curr_prcm_set = prcm;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
recalculate_root_clocks();
|
|
|
|
|
2008-03-13 13:35:09 -06:00
|
|
|
printk(KERN_INFO "Clocking rate (Crystal/DPLL/ARM core): "
|
2008-03-18 07:09:51 -06:00
|
|
|
"%ld.%01ld/%ld/%ld MHz\n",
|
|
|
|
(osc_sys_ck.rate / 1000000), (osc_sys_ck.rate / 100000) % 10,
|
2008-03-13 13:35:09 -06:00
|
|
|
(core_ck.rate / 1000000), (arm_fck.rate / 1000000));
|
2008-03-18 07:09:51 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Only enable those clocks we will need, let the drivers
|
|
|
|
* enable other clocks as necessary
|
|
|
|
*/
|
|
|
|
clk_enable_init_clocks();
|
|
|
|
|
|
|
|
/* Avoid sleeping during omap2_clk_prepare_for_reboot() */
|
|
|
|
/* REVISIT: not yet ready for 343x */
|
|
|
|
#if 0
|
|
|
|
vclk = clk_get(NULL, "virt_prcm_set");
|
|
|
|
sclk = clk_get(NULL, "sys_ck");
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|