Merge branch 'cleanups/assorted' into imx-fixes-for-arnd

Conflicts:
	arch/arm/mach-imx/mm-imx3.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

diff --cc arch/arm/mach-imx/mm-imx3.c
index 72613c4b0e72e4e856e240bda0c80b03d9086cf4,6d01de326f906b51b84dba7a559b369c09e0d9fd..31807d2a8b7bf1a65d57c8f4cb748bb9e6697934
--- 1/arch/arm/mach-imx/mm-imx3.c
--- 2/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@@@ -173,35 -202,6 +176,35 @@@ void __init imx31_soc_init(void
  
        imx_add_imx_sdma("imx31-sdma", MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata);
  }
-       imx_idle = imx3_idle;
 +#endif /* ifdef CONFIG_SOC_IMX31 */
 +
 +#ifdef CONFIG_SOC_IMX35
 +static struct map_desc mx35_io_desc[] __initdata = {
 +      imx_map_entry(MX35, X_MEMC, MT_DEVICE),
 +      imx_map_entry(MX35, AVIC, MT_DEVICE_NONSHARED),
 +      imx_map_entry(MX35, AIPS1, MT_DEVICE_NONSHARED),
 +      imx_map_entry(MX35, AIPS2, MT_DEVICE_NONSHARED),
 +      imx_map_entry(MX35, SPBA0, MT_DEVICE_NONSHARED),
 +};
 +
 +void __init mx35_map_io(void)
 +{
 +      iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc));
 +}
 +
 +void __init imx35_init_early(void)
 +{
 +      mxc_set_cpu_type(MXC_CPU_MX35);
 +      mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));
 +      mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR));
++      pm_idle = imx3_idle;
 +      imx_ioremap = imx3_ioremap;
 +}
 +
 +void __init mx35_init_irq(void)
 +{
 +      mxc_init_irq(MX35_IO_ADDRESS(MX35_AVIC_BASE_ADDR));
 +}
  
  static struct sdma_script_start_addrs imx35_to1_sdma_script __initdata = {
        .ap_2_ap_addr = 642,

diff --cc arch/arm/plat-mxc/system.c
index 45e1b5f6be4400591b45fc407b7c4419db1ee207,a0bcccf9b640d979bc0f6481addd79b00877c85b..d65fb31a55ca47ef350e38da864b6d34cf5295f9
--- 1/arch/arm/plat-mxc/system.c
--- 2/arch/arm/plat-mxc/system.c
+++ b/arch/arm/plat-mxc/system.c
@@@ -29,9 -28,7 +29,8 @@@
  #include <asm/system.h>
  #include <asm/mach-types.h>
  
- void (*imx_idle)(void) = NULL;
  void __iomem *(*imx_ioremap)(unsigned long, size_t, unsigned int) = NULL;
 +EXPORT_SYMBOL_GPL(imx_ioremap);
  
  static void __iomem *wdog_base;