From: Olof Johansson <olof@lixom.net>
Date: Tue, 29 Jan 2013 17:41:02 +0000 (-0800)
Subject: Merge tag 'imx-cleanup-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into... 
X-Git-Tag: v3.9-rc1~122^2~21
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=c1353ef200fcc222f3b76b78a44ebb8f16e75ea6

Merge tag 'imx-cleanup-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/cleanup

From Shawn Guo:

IMX cleanup for 3.9:
 * Remove lluart.c by using debug_ll_io_init()
 * Remove mach-mx51_3ds board support
 * Remove imx50 support which has been BROKEN for cycles
 * Other trival cleanups

* tag 'imx-cleanup-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx: Remove mx508 support
  ARM: imx: Remove mach-mx51_3ds board
  ARM: imx: use debug_ll_io_init() for imx6q
  ARM: imx: remove unused imx6q_clock_map_io()
  ARM: mach-imx: Kconfig: Do not select Babbage for MACH_IMX51_DT

Signed-off-by: Olof Johansson <olof@lixom.net>

Change/delete conflicts due to some of the previous sweeping cleanups in:
	arch/arm/mach-imx/mach-mx50_rdp.c
	arch/arm/mach-imx/mach-mx51_3ds.c
---

c1353ef200fcc222f3b76b78a44ebb8f16e75ea6
diff --cc arch/arm/mach-imx/common.h
index e17dbc50c85f,972c9f8cc97a..76c420043289
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@@ -109,9 -105,9 +105,8 @@@ void tzic_handle_irq(struct pt_regs *)
  #define imx27_handle_irq avic_handle_irq
  #define imx31_handle_irq avic_handle_irq
  #define imx35_handle_irq avic_handle_irq
- #define imx50_handle_irq tzic_handle_irq
  #define imx51_handle_irq tzic_handle_irq
  #define imx53_handle_irq tzic_handle_irq
 -#define imx6q_handle_irq gic_handle_irq
  
  extern void imx_enable_cpu(int cpu, bool enable);
  extern void imx_set_cpu_jump(int cpu, void *jump_addr);
@@@ -138,10 -129,8 +128,9 @@@ extern void imx_gpc_init(void)
  extern void imx_gpc_pre_suspend(void);
  extern void imx_gpc_post_resume(void);
  extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
- extern void imx6q_clock_map_io(void);
  
  extern void imx_cpu_die(unsigned int cpu);
 +extern int imx_cpu_kill(unsigned int cpu);
  
  #ifdef CONFIG_PM
  extern void imx6q_pm_init(void);
diff --cc arch/arm/mach-imx/mach-imx6q.c
index 8d3d06e0e8a1,ce7476d49271..5a18e7e5c564
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -30,7 -29,9 +30,8 @@@
  #include <asm/cpuidle.h>
  #include <asm/smp_twd.h>
  #include <asm/hardware/cache-l2x0.h>
 -#include <asm/hardware/gic.h>
  #include <asm/mach/arch.h>
+ #include <asm/mach/map.h>
  #include <asm/mach/time.h>
  #include <asm/system_misc.h>
  
@@@ -216,11 -217,15 +217,10 @@@ static void __init imx6q_init_late(void
  
  static void __init imx6q_map_io(void)
  {
- 	imx_lluart_map_io();
+ 	debug_ll_io_init();
  	imx_scu_map_io();
- 	imx6q_clock_map_io();
  }
  
 -static const struct of_device_id imx6q_irq_match[] __initconst = {
 -	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
 -	{ /* sentinel */ }
 -};
 -
  static void __init imx6q_init_irq(void)
  {
  	l2x0_of_init(0, ~0UL);