summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/clk-imx51-imx53.c
AgeCommit message (Collapse)Author
2012-06-07Merge tag 'imx-clk-common-fixes' of ↵Olof Johansson
git://git.pengutronix.de/git/imx/linux-2.6 into fixes From Sascha Hauer: "Some fixes for the fresh i.MX common clock support" Resolved trivial conflict in arch/arm/plat-mxc/include/mach/common.h. * tag 'imx-clk-common-fixes' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: imx6q: prepare and enable init on clks directly instead of clk_get first ARM i.MX: remove now unnecessary argument from mxc_timer_init ARM: i.MX: change timer clock from ipg to perclk ARM i.MX5: fix gpt peripheral clock path Signed-off-by: Olof Johansson <olof@lixom.net>
2012-05-16ARM i.MX: remove now unnecessary argument from mxc_timer_initSascha Hauer
As the timer code now does a clk_get to get its clock we don't need the struct clk argument anymore. This also changes the alternative EPIT timer to do a clk_get. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-05-16ARM i.MX5: fix gpt peripheral clock pathSascha Hauer
- The gpt peripheral clk parent is per_root, not ipg - The register for selectin per_lp_apm and per_root is MXC_CCM_CBCMR, not MXC_CCM_CBCDR Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-05-11ARM: imx: add more imx5 ssi clocksShawn Guo
Add more imx5 ssi clocks and lookup for device tree probe. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
2012-05-09ARM i.MX5: implement clocks using common clock frameworkSascha Hauer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>