diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 15:31:20 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 15:31:20 +0100 |
| commit | c06e51db93a9fe018b58204125e08627011a8316 (patch) | |
| tree | 550872b22535a55b06ffdbb2ebac4a551b6b541f | |
| parent | 8dda05ccd8a227e2b56ce6b26d52b1af88437f9e (diff) | |
| parent | 5dc2eb7da1e387e31ce54f54af580c6a6f512ca6 (diff) | |
| download | linux-next-c06e51db93a9fe018b58204125e08627011a8316.tar.gz | |
Merge tag 'arm-imx-fixes-for-3.9-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer <s.hauer@pengutronix.de>:
Two small ARM i.MX fixes for v3.9-rc
- Fix i.MX25 DT compilation
- Enable MAX clk on i.MX35
* tag 'arm-imx-fixes-for-3.9-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: i.MX35: enable MAX clock
ARM: i.MX25: Fix DT compilation
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-imx/clk-imx35.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx25-dt.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c index 74e3a34d78b8..e13a8fa5e62c 100644 --- a/arch/arm/mach-imx/clk-imx35.c +++ b/arch/arm/mach-imx/clk-imx35.c @@ -264,6 +264,7 @@ int __init mx35_clocks_init(void) clk_prepare_enable(clk[gpio3_gate]); clk_prepare_enable(clk[iim_gate]); clk_prepare_enable(clk[emi_gate]); + clk_prepare_enable(clk[max_gate]); /* * SCC is needed to boot via mmc after a watchdog reset. The clock code diff --git a/arch/arm/mach-imx/imx25-dt.c b/arch/arm/mach-imx/imx25-dt.c index 03b65e5ea541..82348391582a 100644 --- a/arch/arm/mach-imx/imx25-dt.c +++ b/arch/arm/mach-imx/imx25-dt.c @@ -27,6 +27,11 @@ static const char * const imx25_dt_board_compat[] __initconst = { NULL }; +static void __init imx25_timer_init(void) +{ + mx25_clocks_init_dt(); +} + DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)") .map_io = mx25_map_io, .init_early = imx25_init_early, |