From 88cb43d61004f3aaad839de832256b9e8030e884 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 22 Nov 2012 17:10:45 -0200 Subject: [PATCH] --- yaml --- r: 355487 b: refs/heads/master c: 8a1a9540384e06ca94296ec571f42ebcdc6c33ce h: refs/heads/master i: 355485: 3d188ee96a3ac3797692307f387988ff8f2444ef 355483: e678bd1d97c551eece588d3625d8cde2a57cbd1f 355479: e04c31df20a72c2d0b08476bdcc91d0e83ff684e 355471: 6456a08991a8658d01795128c96e25abad647744 355455: 04c5140b0c3d821b93ed2f4450fb9a644bd5e0c6 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/clk-imx31.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0d1a3f1c8eb8..ecb01c363191 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a81dbde4df4e2fd94a5424b25bc78c19f446691 +refs/heads/master: 8a1a9540384e06ca94296ec571f42ebcdc6c33ce diff --git a/trunk/arch/arm/mach-imx/clk-imx31.c b/trunk/arch/arm/mach-imx/clk-imx31.c index 8be64e0a4ace..590dd876d66a 100644 --- a/trunk/arch/arm/mach-imx/clk-imx31.c +++ b/trunk/arch/arm/mach-imx/clk-imx31.c @@ -34,8 +34,8 @@ static const char *csi_sel[] = { "upll", "spll", }; static const char *fir_sel[] = { "mcu_main", "upll", "spll" }; enum mx31_clks { - ckih, ckil, mpll, spll, upll, mcu_main, hsp, ahb, nfc, ipg, per_div, - per, csi, fir, csi_div, usb_div_pre, usb_div_post, fir_div_pre, + dummy, ckih, ckil, mpll, spll, upll, mcu_main, hsp, ahb, nfc, ipg, + per_div, per, csi, fir, csi_div, usb_div_pre, usb_div_post, fir_div_pre, fir_div_post, sdhc1_gate, sdhc2_gate, gpt_gate, epit1_gate, epit2_gate, iim_gate, ata_gate, sdma_gate, cspi3_gate, rng_gate, uart1_gate, uart2_gate, ssi1_gate, i2c1_gate, i2c2_gate, i2c3_gate, hantro_gate, @@ -52,6 +52,7 @@ int __init mx31_clocks_init(unsigned long fref) void __iomem *base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR); int i; + clk[dummy] = imx_clk_fixed("dummy", 0); clk[ckih] = imx_clk_fixed("ckih", fref); clk[ckil] = imx_clk_fixed("ckil", 32768); clk[mpll] = imx_clk_pllv1("mpll", "ckih", base + MXC_CCM_MPCTL);