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-mmp2.c | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-dev-2bd1e256e45052f2244403f822fd85aa64a6aa00.tar.xz linux-dev-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-mmp2.c')
| -rw-r--r-- | drivers/clk/mmp/clk-mmp2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/mmp/clk-mmp2.c b/drivers/clk/mmp/clk-mmp2.c index b2721cae257a..7083f12ef422 100644 --- a/drivers/clk/mmp/clk-mmp2.c +++ b/drivers/clk/mmp/clk-mmp2.c @@ -54,7 +54,7 @@ static DEFINE_SPINLOCK(clk_lock); -static struct clk_factor_masks uart_factor_masks = { +static struct mmp_clk_factor_masks uart_factor_masks = { .factor = 2, .num_mask = 0x1fff, .den_mask = 0x1fff, @@ -62,7 +62,7 @@ static struct clk_factor_masks uart_factor_masks = { .den_shift = 0, }; -static struct clk_factor_tbl uart_factor_tbl[] = { +static struct mmp_clk_factor_tbl uart_factor_tbl[] = { {.num = 14634, .den = 2165}, /*14.745MHZ */ {.num = 3521, .den = 689}, /*19.23MHZ */ {.num = 9679, .den = 5728}, /*58.9824MHZ */ |