From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 22 Nov 2011 10:32:39 +0000 (+0100)
Subject: Merge branch 'cleanups/assorted' into imx-fixes-for-arnd
X-Git-Tag: MMI-PSA29.97-13-9~17947^2~6^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743
diff --cc arch/arm/mach-imx/mm-imx3.c
index 72613c4b0e72,6d01de326f90..31807d2a8b7b
--- a/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);
  }
 +#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));
- 	imx_idle = imx3_idle;
++	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 45e1b5f6be44,a0bcccf9b640..d65fb31a55ca
--- a/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;