Commit 55913c2d authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-imx6ul' into clk-next 

* clk-imx6ul:
  clk: imx6ul: fix periph clk2 clock mux selection
parents b2ac878a a43e8683

drivers/clk/imx/clk-imx6ul.c

+1 −1
Original line number Diff line number Diff line
@@ -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", };