]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: si5351: Rename internal plls to avoid name collisions
authorSergej Sawazki <sergej@taudac.com>
Tue, 25 Jul 2017 21:21:02 +0000 (23:21 +0200)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:33:52 +0000 (21:33 -0400)
[ Upstream commit cdba9a4fb0b53703959ac861e415816cb61aded4 ]

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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/clk/clk-si5351.c

index 30335d3b99afb197332505d5be045f2d5d75be4c..9db6d57f7ccccd835c900df48e0bc91cd8e628e8 100644 (file)
@@ -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"