ARM: imx: fix struct clk pointer comparing
Since commit035a61c314
("clk: Make clk API return per-user struct clk instances"), clk API users can no longer check if two struct clk pointers are pointing to the same hardware clock, i.e. struct clk_hw, by simply comparing two pointers. That's because with the per-user clk change, a brand new struct clk is created whenever clients try to look up the clock by calling clk_get() or sister functions like clk_get_sys() and of_clk_get(). This changes the original behavior where the struct clk is only created for once when clock driver registers the clock to CCF in the first place. The net change here is before commit035a61c314
the struct clk pointer is unique for given hardware clock, while after the commit the pointers returned by clk lookup calls become different for the same hardware clock. That said, the struct clk pointer comparing in the code doesn't work any more. Call helper function clk_is_match() instead to fix the problem. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Michael Turquette <mturquette@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
parent
3d3801effd
commit
a51139fdbc
|
@ -211,8 +211,9 @@ static void __init imx6q_1588_init(void)
|
||||||
* set bit IOMUXC_GPR1[21]. Or the PTP clock must be from pad
|
* set bit IOMUXC_GPR1[21]. Or the PTP clock must be from pad
|
||||||
* (external OSC), and we need to clear the bit.
|
* (external OSC), and we need to clear the bit.
|
||||||
*/
|
*/
|
||||||
clksel = ptp_clk == enet_ref ? IMX6Q_GPR1_ENET_CLK_SEL_ANATOP :
|
clksel = clk_is_match(ptp_clk, enet_ref) ?
|
||||||
IMX6Q_GPR1_ENET_CLK_SEL_PAD;
|
IMX6Q_GPR1_ENET_CLK_SEL_ANATOP :
|
||||||
|
IMX6Q_GPR1_ENET_CLK_SEL_PAD;
|
||||||
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
|
gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
|
||||||
if (!IS_ERR(gpr))
|
if (!IS_ERR(gpr))
|
||||||
regmap_update_bits(gpr, IOMUXC_GPR1,
|
regmap_update_bits(gpr, IOMUXC_GPR1,
|
||||||
|
|
Loading…
Reference in New Issue