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

Commit 811dde65 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v3.5-imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes 

From Sascha Hauer <s.hauer@pengutronix.de>:

ARM i.MX fixes for v3.5-rc5

* tag 'v3.5-imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6

:
  ARM: imx: assert SCC gate stays enabled
  ARM: imx27_visstrim_m10: Do not include <asm/system.h>

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1e0c1ce0 c520c921

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

+8 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ int __init mx35_clocks_init() 
			pr_err("i.MX35 clk %d: register failed with %ld\n",

				i, PTR_ERR(clk[i]));





	clk_register_clkdev(clk[pata_gate], NULL, "pata_imx");

	clk_register_clkdev(clk[can1_gate], NULL, "flexcan.0");

	clk_register_clkdev(clk[can2_gate], NULL, "flexcan.1");
@@ -264,6 +263,14 @@ int __init mx35_clocks_init() 
	clk_prepare_enable(clk[iim_gate]);

	clk_prepare_enable(clk[emi_gate]);



	/*

	 * SCC is needed to boot via mmc after a watchdog reset. The clock code

	 * before conversion to common clk also enabled UART1 (which isn't

	 * handled here and not needed for mmc) and IIM (which is enabled

	 * unconditionally above).

	 */

	clk_prepare_enable(clk[scc_gate]);



	imx_print_silicon_rev("i.MX35", mx35_revision());



#ifdef CONFIG_MXC_USE_EPIT

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/system.h>

#include <asm/system_info.h>

#include <mach/common.h>

#include <mach/iomux-mx27.h>