Merge tag 'imx-cleanup-3.9' into imx/soc

diff --combined arch/arm/mach-imx/Kconfig
index 0a2349dc70184021e268db86ef9c3cb0e966f8a3,5f3f07ee4b2971ba0fd2d66c98fa59fe80318b8f..7b11d3329e81dee99447f87277b7b6309d795354
--- 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 c0c4e723b7f5dee0a34526fd280cab2e8b3966b1,c7e429bd32d065012f94b4b968b90d58e7dba35f..19644f6524dc41689f41cd49fd33f6495dfe653a
--- 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 fa36fb84ab193f2fb8480bf3cc70d68232824844,972c9f8cc97a9ccc43bbb07cf87c8a13397db840..1ef0a26bf161870b049a8321a986275c4db23ef7
--- 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,18 -105,12 +105,12 @@@ 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
@@@ -139,10 -129,8 +129,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);