| From foo@baz Thu Mar 22 14:57:33 CET 2018 |
| From: Sergej Sawazki <sergej@taudac.com> |
| Date: Tue, 25 Jul 2017 23:21:02 +0200 |
| Subject: clk: si5351: Rename internal plls to avoid name collisions |
| |
| From: Sergej Sawazki <sergej@taudac.com> |
| |
| |
| [ 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/clk/clk-si5351.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/clk/clk-si5351.c |
| +++ b/drivers/clk/clk-si5351.c |
| @@ -72,7 +72,7 @@ static const char * const si5351_input_n |
| "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" |