ARM: imx31: clock initialization fixes

i.MX31 Clock Control Module controller is found on AIPS2 bus, move it there from SPBA bus to avoid a conflict of device IO space mismatch.

Fixes ef0e4a606fb6 ("ARM: mx31: Replace clk_register_clkdev with clock DT lookup")

Signed-off-by Vladimir Zapolskiy <[email protected]>

Function mx31_clocks_init() is called during clock intialization on legacy boards with reference clock frequency passed as its input argument, this can be verified by examination of the function declaration found in arch/arm/mach-imx/common.h and actual function users which include that header file.

Inside CCF driver the function ignores its input argument, by chance the used value in the function body is the same as input arguments on side of all callers.

Fixes d9388c843237 ("clk: imx31: Do not call mxc_timer_init twice when booting with DT")

Signed-off-by Vladimir Zapolskiy <[email protected]>

Function mx31_clocks_init() is called during clock intialization on legacy boards with reference clock frequency passed as its input argument, this can be verified by examination of the function declaration found in arch/arm/mach-imx/common.h and actual function users which include that header file.

Inside CCF driver the function ignores its input argument, by chance the used value in the function body is the same as input arguments on side of all callers.

Fixes d9388c843237 ("clk: imx31: Do not call mxc_timer_init twice when booting with DT")

Signed-off-by Vladimir Zapolskiy <[email protected]>

---

Clock initialization for i.MX31 powered machines with DT support should be done by a call of an init function registered with CLK_OF_DECLARE() in common clock framework.

The change converts exported mx31_clocks_init_dt() into a static initialization function registered by CLK_OF_DECLARE().

Signed-off-by Vladimir Zapolskiy <[email protected]>

---

The change is tested on qemu kzm target and mx31lite board, while both targets don't have DTS in upstream, I had to write simple DTS files for them, because the proposed change is for i.MX31 targets with OF support.

i.MX31/OF/clock initialization seems to be broken currently, if the series is not applied I can not get a working clock source during early boot stage on a board with DTB supplied.

Changes from v1 to v2, thanks to Uwe and Stephen for review:
* added one more new fix in imx31.dtsi which moves CCM device node to AIPS2 bus,
* included to the series a fix of CCM interrupts in imx31.dtsi, the change was sent as a separate patch, the change is included to avoid a patch application dependency,
* as suggested by Uwe reworded one of the commits removing "stack corruption" mentioning, the overwritten value is passed in a register,
* as suggested by Uwe squashed clk-imx31.c and imx31-dt.c changes to avoid a runtime problem if only one of two patches are applied

Vladimir Zapolskiy (4):
ARM: dts: imx31: fix clock control module interrupts description
ARM: dts: imx31: move CCM device node to AIPS2 bus devices
clk: imx31: fix rewritten input argument of mx31_clocks_init()
ARM: clk: imx31: properly init clocks for machines with DT

 .../devicetree/bindings/clock/imx31-clock.txt      |  2 +-
 arch/arm/boot/dts/imx31.dtsi                       | 14 +++---
 arch/arm/mach-imx/common.h                         |  1 -
 arch/arm/mach-imx/imx31-dt.c                       |  6 ---
 drivers/clk/imx/clk-imx31.c                        | 52 +++++++++++-----------

Quoted 25 lines · Vladimir Zapolskiy

The change is tested on qemu kzm target and mx31lite board, while both targets don't have DTS in upstream, I had to write simple DTS files for them, because the proposed change is for i.MX31 targets with OF support.

i.MX31/OF/clock initialization seems to be broken currently, if the series is not applied I can not get a working clock source during early boot stage on a board with DTB supplied.

Changes from v1 to v2, thanks to Uwe and Stephen for review:
* added one more new fix in imx31.dtsi which moves CCM device node to AIPS2 bus,
* included to the series a fix of CCM interrupts in imx31.dtsi, the change was sent as a separate patch, the change is included to avoid a patch application dependency,
* as suggested by Uwe reworded one of the commits removing "stack corruption" mentioning, the overwritten value is passed in a register,
* as suggested by Uwe squashed clk-imx31.c and imx31-dt.c changes to avoid a runtime problem if only one of two patches are applied

Vladimir Zapolskiy (4):
ARM: dts: imx31: fix clock control module interrupts description
ARM: dts: imx31: move CCM device node to AIPS2 bus devices
clk: imx31: fix rewritten input argument of mx31_clocks_init()
ARM: clk: imx31: properly init clocks for machines with DT

Quoted 5 lines

 .../devicetree/bindings/clock/imx31-clock.txt      |  2 +-
 arch/arm/boot/dts/imx31.dtsi                       | 14 +++---
 arch/arm/mach-imx/common.h                         |  1 -
 arch/arm/mach-imx/imx31-dt.c                       |  6 ---
 drivers/clk/imx/clk-imx31.c                        | 52 +++++++++++-----------

Hi Stephen,

Can I have you ACK on the clk file, so that we can merge the series from arm-soc tree? Thanks.

Vladimir Zapolskiy (4):
ARM: dts: imx31: fix clock control module interrupts description
ARM: dts: imx31: move CCM device node to AIPS2 bus devices
clk: imx31: fix rewritten input argument of mx31_clocks_init()
ARM: clk: imx31: properly init clocks for machines with DT