diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-03-07 21:01:28 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-25 17:03:46 +0200 |
| commit | 6c7b06850c5a1615cc9e660e0d24ce2025bb9bcf (patch) | |
| tree | 985229601193226b294602a7a1c19337607d2300 /arch/arm/plat-mxc/include/mach | |
| parent | eb92044eb3d59d29c9812e85e3a4bf41f6f38e3a (diff) | |
| download | linux-3.10-6c7b06850c5a1615cc9e660e0d24ce2025bb9bcf.tar.gz linux-3.10-6c7b06850c5a1615cc9e660e0d24ce2025bb9bcf.tar.bz2 linux-3.10-6c7b06850c5a1615cc9e660e0d24ce2025bb9bcf.zip | |
ARM i.MX: prepare for common clock framework
- Add necessary #ifdefs for CONFIG_COMMON_CLOCK
- Add a global spinlock to protect the CCM registers
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/clock.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/clock.h b/arch/arm/plat-mxc/include/mach/clock.h index 753a5988d85..bd940c795cb 100644 --- a/arch/arm/plat-mxc/include/mach/clock.h +++ b/arch/arm/plat-mxc/include/mach/clock.h @@ -23,6 +23,7 @@ #ifndef __ASSEMBLY__ #include <linux/list.h> +#ifndef CONFIG_COMMON_CLK struct module; struct clk { @@ -59,6 +60,9 @@ struct clk { int clk_register(struct clk *clk); void clk_unregister(struct clk *clk); +#endif /* CONFIG_COMMON_CLK */ + +extern spinlock_t imx_ccm_lock; unsigned long mxc_decode_pll(unsigned int pll, u32 f_ref); |