Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3397c2c4 authored by Alexander Kurz's avatar Alexander Kurz Committed by Shawn Guo
Browse files

ARM: dts: imx35: restore existing used clock enumeration 



A new element got inserted into enum mx35_clks with commit 3713e3f5
("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: default avatarAlexander Kurz <akurz@blala.de>
Fixes: 3713e3f5 ("clk: imx35: define two clocks for rtc")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 7196c52c

Documentation/devicetree/bindings/clock/imx35-clock.txt

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ clocks and IDs. 
	csi_sel			79

	iim_gate		80

	gpu2d_gate		81

	ckli_gate		82



Examples:

drivers/clk/imx/clk-imx35.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static const char *std_sel[] = {"ppll", "arm"}; 
static const char *ipg_per_sel[] = {"ahb_per_div", "arm_per_div"};



enum mx35_clks {

	ckih, ckil, mpll, ppll, mpll_075, arm, hsp, hsp_div, hsp_sel, ahb, ipg,

	ckih, mpll, ppll, mpll_075, arm, hsp, hsp_div, hsp_sel, ahb, ipg,

	arm_per_div, ahb_per_div, ipg_per, uart_sel, uart_div, esdhc_sel,

	esdhc1_div, esdhc2_div, esdhc3_div, spdif_sel, spdif_div_pre,

	spdif_div_post, ssi_sel, ssi1_div_pre, ssi1_div_post, ssi2_div_pre,
@@ -79,7 +79,7 @@ enum mx35_clks { 
	rtc_gate, rtic_gate, scc_gate, sdma_gate, spba_gate, spdif_gate,

	ssi1_gate, ssi2_gate, uart1_gate, uart2_gate, uart3_gate, usbotg_gate,

	wdog_gate, max_gate, admux_gate, csi_gate, csi_div, csi_sel, iim_gate,

	gpu2d_gate, clk_max

	gpu2d_gate, ckil, clk_max

};



static struct clk *clk[clk_max];