Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308239
b: refs/heads/master
c: 6c7b068
h: refs/heads/master
i:
  308237: e1cda89
  308235: 0de7738
  308231: 4288726
  308223: 0939018
v: v3
  • Loading branch information
Sascha Hauer committed Apr 25, 2012
1 parent 34f9207 commit 30447dc
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eb92044eb3d59d29c9812e85e3a4bf41f6f38e3a
refs/heads/master: 6c7b06850c5a1615cc9e660e0d24ce2025bb9bcf
44 changes: 44 additions & 0 deletions trunk/arch/arm/mach-imx/clk.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#ifndef __MACH_IMX_CLK_H
#define __MACH_IMX_CLK_H

#include <linux/spinlock.h>
#include <linux/clk-provider.h>
#include <mach/clock.h>

struct clk *imx_clk_pllv1(const char *name, char *parent,
void __iomem *base);

static inline struct clk *imx_clk_fixed(const char *name, int rate)
{
return clk_register_fixed_rate(NULL, name, NULL, CLK_IS_ROOT, rate);
}

static inline struct clk *imx_clk_divider(const char *name, const char *parent,
void __iomem *reg, u8 shift, u8 width)
{
return clk_register_divider(NULL, name, parent, CLK_SET_RATE_PARENT,
reg, shift, width, 0, &imx_ccm_lock);
}

static inline struct clk *imx_clk_gate(const char *name, const char *parent,
void __iomem *reg, u8 shift)
{
return clk_register_gate(NULL, name, parent, CLK_SET_RATE_PARENT, reg,
shift, 0, &imx_ccm_lock);
}

static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg,
u8 shift, u8 width, const char **parents, int num_parents)
{
return clk_register_mux(NULL, name, parents, num_parents, 0, reg, shift,
width, 0, &imx_ccm_lock);
}

static inline struct clk *imx_clk_fixed_factor(const char *name,
const char *parent, unsigned int mult, unsigned int div)
{
return clk_register_fixed_factor(NULL, name, parent,
CLK_SET_RATE_PARENT, mult, div);
}

#endif
11 changes: 11 additions & 0 deletions trunk/arch/arm/plat-mxc/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <mach/clock.h>
#include <mach/hardware.h>

#ifndef CONFIG_COMMON_CLK
static LIST_HEAD(clocks);
static DEFINE_MUTEX(clocks_mutex);

Expand Down Expand Up @@ -200,6 +201,16 @@ struct clk *clk_get_parent(struct clk *clk)
}
EXPORT_SYMBOL(clk_get_parent);

#else

/*
* Lock to protect the clock module (ccm) registers. Used
* on all i.MXs
*/
DEFINE_SPINLOCK(imx_ccm_lock);

#endif /* CONFIG_COMMON_CLK */

/*
* Get the resulting clock rate from a PLL register value and the input
* frequency. PLLs with this register layout can at least be found on
Expand Down
4 changes: 4 additions & 0 deletions trunk/arch/arm/plat-mxc/include/mach/clock.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#ifndef __ASSEMBLY__
#include <linux/list.h>

#ifndef CONFIG_COMMON_CLK
struct module;

struct clk {
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 30447dc

Please sign in to comment.