From: Olof Johansson <olof@lixom.net>
Date: Tue, 5 Feb 2013 06:24:20 +0000 (-0800)
Subject: Merge tag 'imx6q-cpudile-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into... 
X-Git-Tag: v3.9-rc1~118^2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4227961650884a06757f80877d5dce0bddc723d4;p=linux.git

Merge tag 'imx6q-cpudile-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

From Shawn Guo:
imx6q cpuidle support for 3.9

 - It's based on imx-cleanup-3.9 to avoid conflicts.

* tag 'imx6q-cpudile-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx6q: support WAIT mode using cpuidle
  ARM: imx: move imx6q_cpuidle_driver into a separate file
  ARM: imx: mask gpc interrupts initially
  ARM: imx: return zero in case next event gets a large increment
  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>

Still, two delete/change conflicts caused by imx/cleanup:

	arch/arm/mach-imx/mach-mx50_rdp.c
	arch/arm/mach-imx/mach-mx51_3ds.c
---

4227961650884a06757f80877d5dce0bddc723d4
diff --cc arch/arm/mach-imx/common.h
index b0164da63b0c,c04ec845e3a3..166e6d5ce42a
--- 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);
diff --cc arch/arm/mach-imx/mach-imx6q.c
index 8d3d06e0e8a1,77a3b4bfff20..1786b2d1257e
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -27,10 -25,11 +26,10 @@@
  #include <linux/regmap.h>
  #include <linux/micrel_phy.h>
  #include <linux/mfd/syscon.h>
- #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 -212,15 +212,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);