diff options
| author | Stephen Boyd | 2018-06-04 21:41:57 +0200 |
|---|---|---|
| committer | Stephen Boyd | 2018-06-04 21:41:57 +0200 |
| commit | 55913c2d33307ac11797531ebbe7c122a73cc0fd (patch) | |
| tree | 7cc8b4f224e75f9e26ca6a7bd73e200581965894 /drivers/clk | |
| parent | Merge branches 'clk-davinci-psc-da830', 'clk-renesas', 'clk-at91-recalc', 'cl... (diff) | |
| parent | clk: imx6ul: fix periph clk2 clock mux selection (diff) | |
| download | kernel-qcow2-linux-55913c2d33307ac11797531ebbe7c122a73cc0fd.tar.gz kernel-qcow2-linux-55913c2d33307ac11797531ebbe7c122a73cc0fd.tar.xz kernel-qcow2-linux-55913c2d33307ac11797531ebbe7c122a73cc0fd.zip | |
Merge branch 'clk-imx6ul' into clk-next
* clk-imx6ul:
clk: imx6ul: fix periph clk2 clock mux selection
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/imx/clk-imx6ul.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index 9bfef1acee63..51a28ef06c40 100644 --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -40,7 +40,7 @@ static const char *axi_alt_sels[] = { "pll2_pfd2_396m", "pll3_pfd1_540m", }; static const char *axi_sels[] = {"periph", "axi_alt_sel", }; static const char *periph_pre_sels[] = { "pll2_bus", "pll2_pfd2_396m", "pll2_pfd0_352m", "pll2_198m", }; static const char *periph2_pre_sels[] = { "pll2_bus", "pll2_pfd2_396m", "pll2_pfd0_352m", "pll4_audio_div", }; -static const char *periph_clk2_sels[] = { "pll3_usb_otg", "osc", "osc", }; +static const char *periph_clk2_sels[] = { "pll3_usb_otg", "osc", "pll2_bypass_src", }; static const char *periph2_clk2_sels[] = { "pll3_usb_otg", "osc", }; static const char *periph_sels[] = { "periph_pre", "periph_clk2", }; static const char *periph2_sels[] = { "periph2_pre", "periph2_clk2", }; |