diff options
| author | Chao Xie <chao.xie@marvell.com> | 2014-10-31 10:13:41 +0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2014-11-12 16:33:22 -0800 |
| commit | 2bd1e256e45052f2244403f822fd85aa64a6aa00 (patch) | |
| tree | db8a3a795d63d39557b39bc8ca0da34fe1a2457d /drivers/clk/mmp/clk.h | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
| download | lwn-2bd1e256e45052f2244403f822fd85aa64a6aa00.tar.gz lwn-2bd1e256e45052f2244403f822fd85aa64a6aa00.zip | |
clk: mmp: add prefix "mmp" for structures defined for clk-frac
The structures defined for clk-frac will be used out side
of clk-frac.c.
To avoid conflicts, add prefix "mmp" for these structures'
name.
Signed-off-by: Chao Xie <chao.xie@marvell.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/mmp/clk.h')
| -rw-r--r-- | drivers/clk/mmp/clk.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clk/mmp/clk.h b/drivers/clk/mmp/clk.h index ab86dd4a416a..3fe92be9e054 100644 --- a/drivers/clk/mmp/clk.h +++ b/drivers/clk/mmp/clk.h @@ -7,7 +7,7 @@ #define APBC_NO_BUS_CTRL BIT(0) #define APBC_POWER_CTRL BIT(1) -struct clk_factor_masks { +struct mmp_clk_factor_masks { unsigned int factor; unsigned int num_mask; unsigned int den_mask; @@ -15,7 +15,7 @@ struct clk_factor_masks { unsigned int den_shift; }; -struct clk_factor_tbl { +struct mmp_clk_factor_tbl { unsigned int num; unsigned int den; }; @@ -30,6 +30,6 @@ extern struct clk *mmp_clk_register_apmu(const char *name, spinlock_t *lock); extern struct clk *mmp_clk_register_factor(const char *name, const char *parent_name, unsigned long flags, - void __iomem *base, struct clk_factor_masks *masks, - struct clk_factor_tbl *ftbl, unsigned int ftbl_cnt); + void __iomem *base, struct mmp_clk_factor_masks *masks, + struct mmp_clk_factor_tbl *ftbl, unsigned int ftbl_cnt); #endif |