summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergej Sawazki <sergej@taudac.com>2017-07-25 23:21:02 +0200
committerStephen Boyd <sboyd@codeaurora.org>2017-12-22 03:09:20 +0100
commitcdba9a4fb0b53703959ac861e415816cb61aded4 (patch)
tree8f5e7b089f7f4e7283ff883686ff7062418c8c7a
parentclk: si5351: Apply PLL soft reset before enabling the outputs (diff)
downloadlinux-cdba9a4fb0b53703959ac861e415816cb61aded4.tar.xz
linux-cdba9a4fb0b53703959ac861e415816cb61aded4.zip
clk: si5351: Rename internal plls to avoid name collisions
This drivers probe fails due to a clock name collision if a clock named 'plla' or 'pllb' is already registered when registering this drivers internal plls. Fix it by renaming internal plls to avoid name collisions. Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: Rabeeh Khoury <rabeeh@solid-run.com> Signed-off-by: Sergej Sawazki <sergej@taudac.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r--drivers/clk/clk-si5351.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c
index 79b770fabe05..841d9fe9bfea 100644
--- a/drivers/clk/clk-si5351.c
+++ b/drivers/clk/clk-si5351.c
@@ -72,7 +72,7 @@ static const char * const si5351_input_names[] = {
"xtal", "clkin"
};
static const char * const si5351_pll_names[] = {
- "plla", "pllb", "vxco"
+ "si5351_plla", "si5351_pllb", "si5351_vxco"
};
static const char * const si5351_msynth_names[] = {
"ms0", "ms1", "ms2", "ms3", "ms4", "ms5", "ms6", "ms7"