]>
Commit | Line | Data |
---|---|---|
375caec0 GKH |
1 | From 3397c2c45b1b6f54834dfeae30a73046f33ca943 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kurz <akurz@blala.de> | |
3 | Date: Thu, 14 Apr 2016 23:30:49 +0200 | |
4 | Subject: ARM: dts: imx35: restore existing used clock enumeration | |
5 | ||
6 | From: Alexander Kurz <akurz@blala.de> | |
7 | ||
8 | commit 3397c2c45b1b6f54834dfeae30a73046f33ca943 upstream. | |
9 | ||
10 | A new element got inserted into enum mx35_clks with commit 3713e3f5e927 | |
11 | ("clk: imx35: define two clocks for rtc"). This insertion shifted most | |
12 | nummerical clock assignments to a new nummerical value which in turn | |
13 | rendered most hardcoded nummeric values in imx35.dtsi incorrect. | |
14 | ||
15 | Restore the existing order by moving the newly introduced clock to the | |
16 | end of the enum. Update the dts documentation accordingly. | |
17 | ||
18 | Signed-off-by: Alexander Kurz <akurz@blala.de> | |
19 | Fixes: 3713e3f5e927 ("clk: imx35: define two clocks for rtc") | |
20 | Signed-off-by: Shawn Guo <shawnguo@kernel.org> | |
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
22 | ||
23 | --- | |
24 | Documentation/devicetree/bindings/clock/imx35-clock.txt | 1 + | |
25 | drivers/clk/imx/clk-imx35.c | 4 ++-- | |
26 | 2 files changed, 3 insertions(+), 2 deletions(-) | |
27 | ||
28 | --- a/Documentation/devicetree/bindings/clock/imx35-clock.txt | |
29 | +++ b/Documentation/devicetree/bindings/clock/imx35-clock.txt | |
30 | @@ -94,6 +94,7 @@ clocks and IDs. | |
31 | csi_sel 79 | |
32 | iim_gate 80 | |
33 | gpu2d_gate 81 | |
34 | + ckli_gate 82 | |
35 | ||
36 | Examples: | |
37 | ||
38 | --- a/drivers/clk/imx/clk-imx35.c | |
39 | +++ b/drivers/clk/imx/clk-imx35.c | |
40 | @@ -66,7 +66,7 @@ static const char *std_sel[] = {"ppll", | |
41 | static const char *ipg_per_sel[] = {"ahb_per_div", "arm_per_div"}; | |
42 | ||
43 | enum mx35_clks { | |
44 | - ckih, ckil, mpll, ppll, mpll_075, arm, hsp, hsp_div, hsp_sel, ahb, ipg, | |
45 | + ckih, mpll, ppll, mpll_075, arm, hsp, hsp_div, hsp_sel, ahb, ipg, | |
46 | arm_per_div, ahb_per_div, ipg_per, uart_sel, uart_div, esdhc_sel, | |
47 | esdhc1_div, esdhc2_div, esdhc3_div, spdif_sel, spdif_div_pre, | |
48 | spdif_div_post, ssi_sel, ssi1_div_pre, ssi1_div_post, ssi2_div_pre, | |
49 | @@ -79,7 +79,7 @@ enum mx35_clks { | |
50 | rtc_gate, rtic_gate, scc_gate, sdma_gate, spba_gate, spdif_gate, | |
51 | ssi1_gate, ssi2_gate, uart1_gate, uart2_gate, uart3_gate, usbotg_gate, | |
52 | wdog_gate, max_gate, admux_gate, csi_gate, csi_div, csi_sel, iim_gate, | |
53 | - gpu2d_gate, clk_max | |
54 | + gpu2d_gate, ckil, clk_max | |
55 | }; | |
56 | ||
57 | static struct clk *clk[clk_max]; |