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

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

diff --combined arch/arm/mach-imx/Kconfig
index 0a2349d,5f3f07e..7b11d33
--- 1/arch/arm/mach-imx/Kconfig
--- 2/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -95,9 -95,6 +95,6 @@@ config MACH_MX2
  config ARCH_MX5
        bool
  
- config ARCH_MX50
-       bool
- 
  config ARCH_MX51
        bool
  
@@@ -164,11 -161,6 +161,6 @@@ config SOC_IMX
        select CPU_V7
        select MXC_TZIC
  
- config SOC_IMX50
-       bool
-       select ARCH_MX50
-       select SOC_IMX5
- 
  config        SOC_IMX51
        bool
        select ARCH_MX5
@@@ -738,25 -730,10 +730,10 @@@ endi
  
  if ARCH_MULTI_V7
  
- comment "i.MX5 platforms:"
- 
- config MACH_MX50_RDP
-       bool "Support MX50 reference design platform"
-       depends on BROKEN
-       select IMX_HAVE_PLATFORM_IMX_I2C
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-       select IMX_HAVE_PLATFORM_SPI_IMX
-       select SOC_IMX50
-       help
-         Include support for MX50 reference design platform (RDP) board. This
-         includes specific configurations for the board and its peripherals.
- 
  comment "i.MX51 machines:"
  
  config MACH_IMX51_DT
        bool "Support i.MX51 platforms from device tree"
-       select MACH_MX51_BABBAGE
        select SOC_IMX51
        help
          Include support for Freescale i.MX51 based platforms
@@@ -777,19 -754,6 +754,6 @@@ config MACH_MX51_BABBAG
          u-boot. This includes specific configurations for the board and its
          peripherals.
  
- config MACH_MX51_3DS
-       bool "Support MX51PDK (3DS)"
-       select IMX_HAVE_PLATFORM_IMX2_WDT
-       select IMX_HAVE_PLATFORM_IMX_KEYPAD
-       select IMX_HAVE_PLATFORM_IMX_UART
-       select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-       select IMX_HAVE_PLATFORM_SPI_IMX
-       select MXC_DEBUG_BOARD
-       select SOC_IMX51
-       help
-         Include support for MX51PDK (3DS) platform. This includes specific
-         configurations for the board and its peripherals.
- 
  config MACH_EUKREA_CPUIMX51SD
        bool "Support Eukrea CPUIMX51SD module"
        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
@@@ -841,6 -805,8 +805,6 @@@ config SOC_IMX6
        select ARCH_HAS_CPUFREQ
        select ARCH_HAS_OPP
        select ARM_CPU_SUSPEND if PM
 -      select ARM_ERRATA_743622
 -      select ARM_ERRATA_751472
        select ARM_ERRATA_754322
        select ARM_ERRATA_764369 if SMP
        select ARM_ERRATA_775420
@@@ -851,7 -817,6 +815,7 @@@
        select HAVE_CAN_FLEXCAN if CAN
        select HAVE_IMX_GPC
        select HAVE_IMX_MMDC
 +      select HAVE_IMX_SRC
        select HAVE_SMP
        select MFD_SYSCON
        select PINCTRL

diff --combined arch/arm/mach-imx/clk-imx6q.c
index c0c4e72,c7e429b..19644f6
--- 1/arch/arm/mach-imx/clk-imx6q.c
--- 2/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@@ -56,8 -56,6 +56,6 @@@
  
  static void __iomem *ccm_base;
  
- void __init imx6q_clock_map_io(void) { }
- 
  int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode)
  {
        u32 val = readl_relaxed(ccm_base + CLPCR);
@@@ -436,9 -434,6 +434,9 @@@ int __init mx6q_clocks_init(void
        for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)
                clk_prepare_enable(clk[clks_init_on[i]]);
  
 +      /* Set initial power mode */
 +      imx6q_set_lpm(WAIT_CLOCKED);
 +
        np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt");
        base = of_iomap(np, 0);
        WARN_ON(!base);

diff --combined arch/arm/mach-imx/common.h
index e17dbc5,972c9f8..76c4200
--- 1/arch/arm/mach-imx/common.h
--- 2/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@@ -21,7 -21,6 +21,6 @@@ extern void mx25_map_io(void)
  extern void mx27_map_io(void);
  extern void mx31_map_io(void);
  extern void mx35_map_io(void);
- extern void mx50_map_io(void);
  extern void mx51_map_io(void);
  extern void mx53_map_io(void);
  extern void imx1_init_early(void);
@@@ -30,7 -29,6 +29,6 @@@ extern void imx25_init_early(void)
  extern void imx27_init_early(void);
  extern void imx31_init_early(void);
  extern void imx35_init_early(void);
- extern void imx50_init_early(void);
  extern void imx51_init_early(void);
  extern void imx53_init_early(void);
  extern void mxc_init_irq(void __iomem *);
@@@ -41,7 -39,6 +39,6 @@@ extern void mx25_init_irq(void)
  extern void mx27_init_irq(void);
  extern void mx31_init_irq(void);
  extern void mx35_init_irq(void);
- extern void mx50_init_irq(void);
  extern void mx51_init_irq(void);
  extern void mx53_init_irq(void);
  extern void imx1_soc_init(void);
@@@ -50,7 -47,6 +47,6 @@@ extern void imx25_soc_init(void)
  extern void imx27_soc_init(void);
  extern void imx31_soc_init(void);
  extern void imx35_soc_init(void);
- extern void imx50_soc_init(void);
  extern void imx51_soc_init(void);
  extern void imx51_init_late(void);
  extern void imx53_init_late(void);
@@@ -109,17 -105,12 +105,11 @@@ 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);
- #ifdef CONFIG_DEBUG_LL
- extern void imx_lluart_map_io(void);
- #else
- static inline void imx_lluart_map_io(void) {}
- #endif
  extern void v7_cpu_resume(void);
  extern u32 *pl310_get_save_ptr(void);
  #ifdef CONFIG_SMP
@@@ -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 --combined arch/arm/mach-imx/mach-imx6q.c
index 8d3d06e,ce7476d..5a18e7e
--- 1/arch/arm/mach-imx/mach-imx6q.c
--- 2/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -18,7 -18,6 +18,7 @@@
  #include <linux/init.h>
  #include <linux/io.h>
  #include <linux/irq.h>
 +#include <linux/irqchip.h>
  #include <linux/of.h>
  #include <linux/of_address.h>
  #include <linux/of_irq.h>
@@@ -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,17 -217,21 +217,16 @@@ 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);
        imx_src_init();
        imx_gpc_init();
 -      of_irq_init(imx6q_irq_match);
 +      irqchip_init();
  }
  
  static void __init imx6q_timer_init(void)
@@@ -236,6 -241,10 +236,6 @@@
        imx_print_silicon_rev("i.MX6Q", imx6q_revision());
  }
  
 -static struct sys_timer imx6q_timer = {
 -      .init = imx6q_timer_init,
 -};
 -
  static const char *imx6q_dt_compat[] __initdata = {
        "fsl,imx6q",
        NULL,
@@@ -245,7 -254,8 +245,7 @@@ DT_MACHINE_START(IMX6Q, "Freescale i.MX
        .smp            = smp_ops(imx_smp_ops),
        .map_io         = imx6q_map_io,
        .init_irq       = imx6q_init_irq,
 -      .handle_irq     = imx6q_handle_irq,
 -      .timer          = &imx6q_timer,
 +      .init_time      = imx6q_timer_init,
        .init_machine   = imx6q_init_machine,
        .init_late      = imx6q_init_late,
        .dt_compat      = imx6q_dt_compat,