mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-20 01:20:54 +00:00
Code Issues Releases Wiki Activity

ARM i.MX fixes for v3.5-rc5

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABCAAGBQJP8/MZAAoJEPFlmONMx+ezZTcP/jfrj7N0U1PNeVQu74rvHSiT
 5mghsau6D9Yc7JN1z7JX4XgzRMCFZlKj3/o6A0tXMvBrGYbnynLpkKlf6ubQEN+6
 O3iBM1IS12A0NKe3dS/9yWbGrak3jX+GBP4aMP3+84EGXw7BbQy8s5+wvzTAsOv9
 Dmf6JHwiT6yWqPUYnb96dPQKOaM4XrZERZYoPq3v1npG3njXRwGtg2/HubALPVRJ
 IfXjZzmVW6DVoVeRrjKCtQsla7SIb28yjJLOBeMFsJRfEFO45l87iufZY0cpuvZH
 5kuTwBankmCx1aKLllVvtNPlPXz04PY7pr5GI8McWvKkNYbC9jWwshvHvKPgmwdW
 JOIJnb9EGGjBh3CJlEkx3T9zB6FTEHizIv7rlCy2AW1PvH8/zwzxZJerfP6t9xe3
 rxo3JPxoEnb7R9KCONCUnAQNcFRol9FVPHHA5aUj9NDAMGUTXi494p/Askah4fGX
 7uN6FASkx/lv1hhe1yCyARquOeJffZsyAnVRJSTKj64PQCcDy3JfeASna78Cf4qb
 qGMxmJU+7ARHsGmO4Faf65QJpZqkkCnmjMh8/14ZzrRFSlF0qJ5/wJSSiuqVKGLI
 /Ro8zmH21rIb9I9tj/wy0Z7MdsrfB1jY0a4Si2TqND03TBRinfzGC6i6XVrn+l4d
 z9iSa2Vtnn+/CrGtn0IC
 =Sb4Z
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2012-07-04 13:46:05 +02:00
commit 811dde659f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/mach-imx/clk-imx35.c
View file

@ -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

2
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
View file

@ -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>