Messages in this thread | | | Date | Fri, 14 Sep 2012 16:41:22 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the dma-mapping tree with the libata tree |
| |
Hi all,
Today's linux-next merge of the dma-mapping tree got a conflict in Documentation/devicetree/bindings/ata/ahci-platform.txt between commit 8996b89d6bc9 ("ata: add platform driver for Calxeda AHCI controller") from the tree and commit 33e4628cc333 ("ARM: highbank: add coherent DMA setup") from the dma-mapping tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc Documentation/devicetree/bindings/ata/ahci-platform.txt index 147c1f6,6c1ad01..0000000 --- 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 { [unhandled content-type:application/pgp-signature] | |