Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2...

Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-imx/mach-cpuimx27.c
Simple merge

diff --cc arch/arm/mach-imx/mach-cpuimx35.c
Simple merge

diff --cc arch/arm/mach-imx/mach-eukrea_cpuimx25.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx53_ard.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx53_loco.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx53_smd.c
Simple merge

diff --cc arch/arm/mach-mx5/clock-mx51-mx53.c
index 2b9bd1fabaf91e98cda6f4f2ebae7d0a170805d9,1ef7e97e0015c7e4d4d5de327e316d8596a23e77..b94879e8679fadc2f2203fbda1ac130a136aff88
--- 1/arch/arm/mach-mx5/clock-mx51-mx53.c
--- 2/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
@@@ -1512,7 -1523,9 +1528,10 @@@ static struct clk_lookup mx53_lookups[
        _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
        _REGISTER_CLOCK("imx-ssi.2", NULL, ssi3_clk)
        _REGISTER_CLOCK("imx-keypad", NULL, dummy_clk)
 +      _REGISTER_CLOCK("pata_imx", NULL, pata_clk)
+       _REGISTER_CLOCK("imx53-ahci.0", "ahci", sata_clk)
+       _REGISTER_CLOCK("imx53-ahci.0", "ahci_phy", ahci_phy_clk)
+       _REGISTER_CLOCK("imx53-ahci.0", "ahci_dma", ahci_dma_clk)
  };
  
  static void clk_tree_init(void)

diff --cc arch/arm/mach-mx5/devices-imx53.h
index 7ca5d0c76f8b800397a87004403efdc830290fc5,1ab399e73caa8b6be46189808d4969c3eaf12dee..6e1e5d1f8c3a9886cd40f47c29e768431d5b416d
--- 1/arch/arm/mach-mx5/devices-imx53.h
--- 2/arch/arm/mach-mx5/devices-imx53.h
+++ b/arch/arm/mach-mx5/devices-imx53.h
@@@ -41,6 -41,4 +41,8 @@@ extern const struct imx_imx_keypad_dat
  #define imx53_add_imx_keypad(pdata)   \
        imx_add_imx_keypad(&imx53_imx_keypad_data, pdata)
  
 +extern const struct imx_pata_imx_data imx53_pata_imx_data;
 +#define imx53_add_pata_imx() \
 +      imx_add_pata_imx(&imx53_pata_imx_data)
++
+ extern struct platform_device *__init imx53_add_ahci_imx(void);

diff --cc arch/arm/mach-mxs/Kconfig
index fdf104f083b7a4ced04e43577f9a68fc62abdab1,ea5ec0f3b5b1c0233157ea79827575483c06798a..cf00b3e3be85177cd089bee0ec41b876069bf7da
--- 1/arch/arm/mach-mxs/Kconfig
--- 2/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@@ -68,8 -63,20 +68,21 @@@ config MODULE_TX2
        select MXS_HAVE_PLATFORM_MXS_I2C
        select MXS_HAVE_PLATFORM_MXS_MMC
        select MXS_HAVE_PLATFORM_MXS_PWM
 +      select MXS_HAVE_PLATFORM_RTC_STMP3XXX
  
+ config MODULE_M28
+       bool
+       select SOC_IMX28
+       select LEDS_GPIO_REGISTER
+       select MXS_HAVE_AMBA_DUART
+       select MXS_HAVE_PLATFORM_AUART
+       select MXS_HAVE_PLATFORM_FEC
+       select MXS_HAVE_PLATFORM_FLEXCAN
+       select MXS_HAVE_PLATFORM_MXS_I2C
+       select MXS_HAVE_PLATFORM_MXS_MMC
+       select MXS_HAVE_PLATFORM_MXSFB
+       select MXS_OCOTP
+ 
  config MACH_TX28
        bool "Ka-Ro TX28 module"
        select MODULE_TX28

diff --cc arch/arm/mach-mxs/Makefile
Simple merge

diff --cc arch/arm/mach-mxs/clock-mx28.c
Simple merge

diff --cc arch/arm/mach-mxs/include/mach/mxs.h
Simple merge

diff --cc arch/arm/plat-mxc/devices/Kconfig
Simple merge

diff --cc arch/arm/plat-mxc/devices/Makefile
Simple merge

diff --cc arch/arm/plat-mxc/include/mach/devices-common.h
Simple merge