From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 06:24:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'dma-mapping/dma-mapping-next'
X-Git-Tag: next-20121003~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8f554a9c2a08fd426a0624047e0397de3b3f51b1;p=karo-tx-linux.git

Merge remote-tracking branch 'dma-mapping/dma-mapping-next'

Conflicts:
	Documentation/devicetree/bindings/ata/ahci-platform.txt
	arch/arm/boot/dts/highbank.dts
---

8f554a9c2a08fd426a0624047e0397de3b3f51b1
diff --cc Documentation/devicetree/bindings/ata/ahci-platform.txt
index 147c1f6653fe,6c1ad01d27e8..b519f9b699c3
--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@@ -9,9 -9,7 +9,10 @@@ Required properties
  - reg               : <registers mapping>
  
  Optional properties:
 +- calxeda,port-phys: phandle-combophy and lane assignment, which maps each
 +			SATA port to a combophy and a lane within that
 +			combophy
+ - dma-coherent      : Present if dma operations are coherent
  
  Example:
          sata@ffe08000 {
diff --cc arch/arm/boot/dts/highbank.dts
index 5204cf73c2d8,7414577c177f..0c6fc34821f9
--- a/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@@ -121,9 -121,7 +121,10 @@@
  			compatible = "calxeda,hb-ahci";
  			reg = <0xffe08000 0x10000>;
  			interrupts = <0 83 4>;
 +			calxeda,port-phys = <&combophy5 0 &combophy0 0
 +					     &combophy0 1 &combophy0 2
 +					     &combophy0 3>;
+ 			dma-coherent;
  		};
  
  		sdhci@ffe0e000 {
diff --cc arch/arm/mach-highbank/highbank.c
index af1da34ccf9d,93617d61f4b1..40e36a50304c
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@@ -152,8 -201,10 +201,11 @@@ static struct notifier_block highbank_p
  static void __init highbank_init(void)
  {
  	pm_power_off = highbank_power_off;
 +	highbank_pm_init();
  
+ 	bus_register_notifier(&platform_bus_type, &highbank_platform_nb);
+ 	bus_register_notifier(&amba_bustype, &highbank_amba_nb);
+ 
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  }