summaryrefslogtreecommitdiffstats
path: root/drivers/clk/imx/clk-imx31.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2017-02-13 09:26:04 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-02-13 09:26:04 +0100
commit30139163b75970fcd58df6b6b987883e36571046 (patch)
tree00bd354cefa617f8474cc73994b1a72c11e770a0 /drivers/clk/imx/clk-imx31.c
parentbb1a6a2fd3cc41be6db1a1362f311456019317b1 (diff)
parent19df384cec181be4407f82377ffbb3059b1ed748 (diff)
downloadbarebox-30139163b75970fcd58df6b6b987883e36571046.tar.gz
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers/clk/imx/clk-imx31.c')
-rw-r--r--drivers/clk/imx/clk-imx31.c28
1 files changed, 23 insertions, 5 deletions
diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c
index 8d135c9..dbb5c15 100644
--- a/drivers/clk/imx/clk-imx31.c
+++ b/drivers/clk/imx/clk-imx31.c
@@ -63,14 +63,27 @@ enum mx31_clks {
mstick1_gate, mstick2_gate, csi_gate, rtc_gate, wdog_gate, pwm_gate,
sim_gate, ect_gate, usb_gate, kpp_gate, ipu_gate, uart3_gate,
uart4_gate, uart5_gate, owire_gate, ssi2_gate, cspi1_gate, cspi2_gate,
- gacc_gate, emi_gate, rtic_gate, firi_gate, clk_max
+ gacc_gate, emi_gate, rtic_gate, firi_gate, fpm, pll_ref, mpll_byp,
+ clk_max
};
static struct clk *clks[clk_max];
+static const char *pll_ref_sel[] = {
+ "dummy",
+ "fpm",
+ "ckih",
+ "dummy",
+};
+
+static const char *mpll_byp_sel[] = {
+ "mpll",
+ "pll_ref",
+};
+
static const char *mcu_main_sel[] = {
"spll",
- "mpll",
+ "mpll_byp",
};
static const char *per_sel[] = {
@@ -94,9 +107,14 @@ static int imx31_ccm_probe(struct device_d *dev)
clks[ckih] = clk_fixed("ckih", 26000000);
clks[ckil] = clk_fixed("ckil", 32768);
- clks[mpll] = imx_clk_pllv1("mpll", "ckih", base + CCM_MPCTL);
- clks[spll] = imx_clk_pllv1("spll", "ckih", base + CCM_SRPCTL);
- clks[upll] = imx_clk_pllv1("upll", "ckih", base + CCM_UPCTL);
+ clks[fpm] = imx_clk_fixed_factor("fpm", "ckil", 1024, 1);
+ clks[pll_ref] = imx_clk_mux("pll_ref", base + CCM_CCMR, 1, 2,
+ pll_ref_sel, ARRAY_SIZE(pll_ref_sel));
+ clks[mpll] = imx_clk_pllv1("mpll", "pll_ref", base + CCM_MPCTL);
+ clks[spll] = imx_clk_pllv1("spll", "pll_ref", base + CCM_SRPCTL);
+ clks[upll] = imx_clk_pllv1("upll", "pll_ref", base + CCM_UPCTL);
+ clks[mpll_byp] = imx_clk_mux("mpll_byp", base + CCM_CCMR, 7, 1,
+ mpll_byp_sel, ARRAY_SIZE(mpll_byp_sel));
clks[mcu_main] = imx_clk_mux("mcu_main", base + CCM_PMCR0, 31, 1,
mcu_main_sel, ARRAY_SIZE(mcu_main_sel));
clks[hsp] = imx_clk_divider("hsp", "mcu_main", base + CCM_PDR0, 11, 3);