Merge branches 'imx/pata' and 'imx/sata' into next/driver

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

diff --cc arch/arm/mach-mx5/clock-mx51-mx53.c
index 3fcb5960ac11c51b78caa598b4b2a4505d338584,1ef7e97e0015c7e4d4d5de327e316d8596a23e77..5955ca33b9c5e12c994c4cebb00f52589165f207
--- 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
@@@ -1508,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..7fe5e462fdcac55dad6261e50c072100ab33dc11
--- 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,7 @@@ 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-mx5/mx51_efika.c
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