Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx35: restore existing used clock enumeration

A new element got inserted into enum mx35_clks with commit 3713e3f5e927
("clk: imx35: define two clocks for rtc"). This insertion shifted most
nummerical clock assignments to a new nummerical value which in turn
rendered most hardcoded nummeric values in imx35.dtsi incorrect.

Restore the existing order by moving the newly introduced clock to the
end of the enum. Update the dts documentation accordingly.

Signed-off-by: Alexander Kurz <akurz@blala.de>
Fixes: 3713e3f5e927 ("clk: imx35: define two clocks for rtc")
Cc: <stable@vger.kernel.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Alexander Kurz and committed by
Shawn Guo
3397c2c4 7196c52c

+3 -2
+1
Documentation/devicetree/bindings/clock/imx35-clock.txt
··· 94 94 csi_sel 79 95 95 iim_gate 80 96 96 gpu2d_gate 81 97 + ckli_gate 82 97 98 98 99 Examples: 99 100
+2 -2
drivers/clk/imx/clk-imx35.c
··· 66 66 static const char *ipg_per_sel[] = {"ahb_per_div", "arm_per_div"}; 67 67 68 68 enum mx35_clks { 69 - ckih, ckil, mpll, ppll, mpll_075, arm, hsp, hsp_div, hsp_sel, ahb, ipg, 69 + ckih, mpll, ppll, mpll_075, arm, hsp, hsp_div, hsp_sel, ahb, ipg, 70 70 arm_per_div, ahb_per_div, ipg_per, uart_sel, uart_div, esdhc_sel, 71 71 esdhc1_div, esdhc2_div, esdhc3_div, spdif_sel, spdif_div_pre, 72 72 spdif_div_post, ssi_sel, ssi1_div_pre, ssi1_div_post, ssi2_div_pre, ··· 79 79 rtc_gate, rtic_gate, scc_gate, sdma_gate, spba_gate, spdif_gate, 80 80 ssi1_gate, ssi2_gate, uart1_gate, uart2_gate, uart3_gate, usbotg_gate, 81 81 wdog_gate, max_gate, admux_gate, csi_gate, csi_div, csi_sel, iim_gate, 82 - gpu2d_gate, clk_max 82 + gpu2d_gate, ckil, clk_max 83 83 }; 84 84 85 85 static struct clk *clk[clk_max];