From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Oct 2011 13:17:34 +0000 (+0200)
Subject: Merge branches 'imx/pata' and 'imx/sata' into next/driver
X-Git-Tag: v3.2-rc1~97^2~1
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=a32750c2ca6f697903b19063fc86f4272865e3a1;p=sfrench%2Fcifs-2.6.git

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

a32750c2ca6f697903b19063fc86f4272865e3a1
diff --cc arch/arm/mach-mx5/clock-mx51-mx53.c
index 3fcb5960ac11,1ef7e97e0015..5955ca33b9c5
--- a/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 7ca5d0c76f8b,1ab399e73caa..7fe5e462fdca
--- a/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);