Commit 742b50f9 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Stephen Boyd

clk: mmp2: fix link error without mmp2

The newly added function is only built into the kernel if mmp2
is enabled, causing a link error otherwise.

arm-linux-gnueabi-ld: drivers/clk/mmp/clk.o: in function `mmp_register_pll_clks':
clk.c:(.text+0x6dc): undefined reference to `mmp_clk_register_pll'

Move it to a different file to get it to link.

Fixes: 5d34d0b3 ("clk: mmp2: Add support for PLL clock sources")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lkml.kernel.org/r/20200408160518.2798571-1-arnd@arndb.deReported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 924ed1f5
...@@ -97,7 +97,7 @@ static const struct clk_ops mmp_clk_pll_ops = { ...@@ -97,7 +97,7 @@ static const struct clk_ops mmp_clk_pll_ops = {
.recalc_rate = mmp_clk_pll_recalc_rate, .recalc_rate = mmp_clk_pll_recalc_rate,
}; };
struct clk *mmp_clk_register_pll(char *name, static struct clk *mmp_clk_register_pll(char *name,
unsigned long default_rate, unsigned long default_rate,
void __iomem *enable_reg, u32 enable, void __iomem *enable_reg, u32 enable,
void __iomem *reg, u8 shift, void __iomem *reg, u8 shift,
...@@ -137,3 +137,34 @@ struct clk *mmp_clk_register_pll(char *name, ...@@ -137,3 +137,34 @@ struct clk *mmp_clk_register_pll(char *name,
return clk; return clk;
} }
void mmp_register_pll_clks(struct mmp_clk_unit *unit,
struct mmp_param_pll_clk *clks,
void __iomem *base, int size)
{
struct clk *clk;
int i;
for (i = 0; i < size; i++) {
void __iomem *reg = NULL;
if (clks[i].offset)
reg = base + clks[i].offset;
clk = mmp_clk_register_pll(clks[i].name,
clks[i].default_rate,
base + clks[i].enable_offset,
clks[i].enable,
reg, clks[i].shift,
clks[i].input_rate,
base + clks[i].postdiv_offset,
clks[i].postdiv_shift);
if (IS_ERR(clk)) {
pr_err("%s: failed to register clock %s\n",
__func__, clks[i].name);
continue;
}
if (clks[i].id)
unit->clk_table[clks[i].id] = clk;
}
}
...@@ -176,37 +176,6 @@ void mmp_register_div_clks(struct mmp_clk_unit *unit, ...@@ -176,37 +176,6 @@ void mmp_register_div_clks(struct mmp_clk_unit *unit,
} }
} }
void mmp_register_pll_clks(struct mmp_clk_unit *unit,
struct mmp_param_pll_clk *clks,
void __iomem *base, int size)
{
struct clk *clk;
int i;
for (i = 0; i < size; i++) {
void __iomem *reg = NULL;
if (clks[i].offset)
reg = base + clks[i].offset;
clk = mmp_clk_register_pll(clks[i].name,
clks[i].default_rate,
base + clks[i].enable_offset,
clks[i].enable,
reg, clks[i].shift,
clks[i].input_rate,
base + clks[i].postdiv_offset,
clks[i].postdiv_shift);
if (IS_ERR(clk)) {
pr_err("%s: failed to register clock %s\n",
__func__, clks[i].name);
continue;
}
if (clks[i].id)
unit->clk_table[clks[i].id] = clk;
}
}
void mmp_clk_add(struct mmp_clk_unit *unit, unsigned int id, void mmp_clk_add(struct mmp_clk_unit *unit, unsigned int id,
struct clk *clk) struct clk *clk)
{ {
......
...@@ -238,13 +238,6 @@ void mmp_register_pll_clks(struct mmp_clk_unit *unit, ...@@ -238,13 +238,6 @@ void mmp_register_pll_clks(struct mmp_clk_unit *unit,
struct mmp_param_pll_clk *clks, struct mmp_param_pll_clk *clks,
void __iomem *base, int size); void __iomem *base, int size);
extern struct clk *mmp_clk_register_pll(char *name,
unsigned long default_rate,
void __iomem *enable_reg, u32 enable,
void __iomem *reg, u8 shift,
unsigned long input_rate,
void __iomem *postdiv_reg, u8 postdiv_shift);
#define DEFINE_MIX_REG_INFO(w_d, s_d, w_m, s_m, fc) \ #define DEFINE_MIX_REG_INFO(w_d, s_d, w_m, s_m, fc) \
{ \ { \
.width_div = (w_d), \ .width_div = (w_d), \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment