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

Commit c06e51db authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 8dda05cc 5dc2eb7d

arch/arm/mach-imx/clk-imx35.c

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-imx/imx25-dt.c

+5 −0
Original line number Diff line number Diff line
@@ -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,