From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 4 Oct 2011 08:55:53 +0000 (+0200)
Subject: Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=05d900c9d8ce536c6792efb323c82b1c97b54bf9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup
---

05d900c9d8ce536c6792efb323c82b1c97b54bf9
diff --cc arch/arm/mach-imx/Makefile
index db6394a77e85,0aa86d22236b,e9eb36dad888..6cc821384ccd
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@@@ -1,16 -1,15 -1,16 +1,15 @@@@
   obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o
   
 --obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o
 --obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o
 ++obj-$(CONFIG_SOC_IMX1) += clock-imx1.o mm-imx1.o
 ++obj-$(CONFIG_SOC_IMX21) += clock-imx21.o mm-imx21.o
   
 --obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o
 ++obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o
   
 --obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o
 --obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o ehci-imx27.o
 ++obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
 ++obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o
   
- -obj-$(CONFIG_SOC_IMX31) += mm-imx31.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o
- -obj-$(CONFIG_SOC_IMX35) += mm-imx35.o cpu-imx35.o clock-imx35.o ehci-imx35.o
- -obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
+ +obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o
+ +obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clock-imx35.o ehci-imx35.o
   
   # Support for CMOS sensor interface
   obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
diff --cc arch/arm/mach-mx5/mm.c
index fb653395624d,379593e19e33,baea6e5cddd9..26eacc9d0d90
--- a/arch/arm/mach-mx5/mm.c
+++ b/arch/arm/mach-mx5/mm.c
@@@@ -21,16 -21,11 -21,6 +21,21 @@@@
   #include <mach/devices-common.h>
   #include <mach/iomux-v3.h>
   
+ +static void imx5_idle(void)
+ +{
+ +	mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
+ +}
+ +
 ++/*
 ++ * Define the MX50 memory map.
 ++ */
 ++static struct map_desc mx50_io_desc[] __initdata = {
 ++	imx_map_entry(MX50, TZIC, MT_DEVICE),
 ++	imx_map_entry(MX50, SPBA0, MT_DEVICE),
 ++	imx_map_entry(MX50, AIPS1, MT_DEVICE),
 ++	imx_map_entry(MX50, AIPS2, MT_DEVICE),
 ++};
 ++
   /*
    * Define the MX51 memory map.
    */
@@@@ -84,8 -61,14 -56,13 +89,9 @@@@ void __init imx51_init_early(void
   	mxc_set_cpu_type(MXC_CPU_MX51);
   	mxc_iomux_v3_init(MX51_IO_ADDRESS(MX51_IOMUXC_BASE_ADDR));
   	mxc_arch_reset_init(MX51_IO_ADDRESS(MX51_WDOG1_BASE_ADDR));
  -}
  -
  -void __init mx53_map_io(void)
  -{
  -	iotable_init(mx53_io_desc, ARRAY_SIZE(mx53_io_desc));
+ +	imx_idle = imx5_idle;
   }
   
 - void __init mx53_map_io(void)
 - {
 - 	iotable_init(mx53_io_desc, ARRAY_SIZE(mx53_io_desc));
 - }
 - 
   void __init imx53_init_early(void)
   {
   	mxc_set_cpu_type(MXC_CPU_MX53);