Merge branch 'imx/cleanup' into next/cleanup

diff --combined arch/arm/mach-imx/mach-kzm_arm11_01.c
index 7c20e9e,05da82e..4e030ac
--- 1/arch/arm/mach-imx/mach-kzm_arm11_01.c
--- 2/arch/arm/mach-imx/mach-kzm_arm11_01.c
+++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c
@@@ -36,6 -36,7 +36,7 @@@
  
  #include <mach/clock.h>
  #include <mach/common.h>
+ #include <mach/hardware.h>
  #include <mach/iomux-mx3.h>
  
  #include "devices-imx31.h"
@@@ -271,7 -272,7 +272,7 @@@ static struct sys_timer kzm_timer = 
  };
  
  MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")
 -      .boot_params = MX3x_PHYS_OFFSET + 0x100,
 +      .atag_offset = 0x100,
        .map_io = kzm_map_io,
        .init_early = imx31_init_early,
        .init_irq = mx31_init_irq,

diff --combined arch/arm/mach-imx/mach-pcm038.c
index 091bcf8,5a38e09..a497a29
--- 1/arch/arm/mach-imx/mach-pcm038.c
--- 2/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
@@@ -176,7 -176,9 +176,9 @@@ static struct platform_device *platform
   * setup other stuffs to access the sram. */
  static void __init pcm038_init_sram(void)
  {
-       mx27_setup_weimcs(1, 0x0000d843, 0x22252521, 0x22220a00);
+       __raw_writel(0x0000d843, MX27_IO_ADDRESS(MX27_WEIM_CSCRxU(1)));
+       __raw_writel(0x22252521, MX27_IO_ADDRESS(MX27_WEIM_CSCRxL(1)));
+       __raw_writel(0x22220a00, MX27_IO_ADDRESS(MX27_WEIM_CSCRxA(1)));
  }
  
  static const struct imxi2c_platform_data pcm038_i2c1_data __initconst = {
@@@ -349,7 -351,7 +351,7 @@@ static struct sys_timer pcm038_timer = 
  };
  
  MACHINE_START(PCM038, "phyCORE-i.MX27")
 -      .boot_params = MX27_PHYS_OFFSET + 0x100,
 +      .atag_offset = 0x100,
        .map_io = mx27_map_io,
        .init_early = imx27_init_early,
        .init_irq = mx27_init_irq,

diff --combined arch/arm/mach-imx/mach-qong.c
index 9e11359,05b74a7..c33ab00
--- 1/arch/arm/mach-imx/mach-qong.c
--- 2/arch/arm/mach-imx/mach-qong.c
+++ b/arch/arm/mach-imx/mach-qong.c
@@@ -190,7 -190,10 +190,10 @@@ static struct platform_device qong_nand
  static void __init qong_init_nand_mtd(void)
  {
        /* init CS */
-       mx31_setup_weimcs(3, 0x00004f00, 0x20013b31, 0x00020800);
+       __raw_writel(0x00004f00, MX31_IO_ADDRESS(MX31_WEIM_CSCRxU(3)));
+       __raw_writel(0x20013b31, MX31_IO_ADDRESS(MX31_WEIM_CSCRxL(3)));
+       __raw_writel(0x00020800, MX31_IO_ADDRESS(MX31_WEIM_CSCRxA(3)));
+ 
        mxc_iomux_set_gpr(MUX_SDCTL_CSD1_SEL, true);
  
        /* enable pin */
@@@ -262,7 -265,7 +265,7 @@@ static struct sys_timer qong_timer = 
  
  MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")
        /* Maintainer: DENX Software Engineering GmbH */
 -      .boot_params = MX3x_PHYS_OFFSET + 0x100,
 +      .atag_offset = 0x100,
        .map_io = mx31_map_io,
        .init_early = imx31_init_early,
        .init_irq = mx31_init_irq,