Messages in this thread | | | Date | Fri, 14 Sep 2012 16:43:33 +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 arch/arm/boot/dts/highbank.dts between commit 8996b89d6bc9 ("ata: add platform driver for Calxeda AHCI controller") from the libata 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 arch/arm/boot/dts/highbank.dts index 5204cf7,7414577..0000000 --- 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 { [unhandled content-type:application/pgp-signature] | |