[v5, 5/6] powerpc/mpc85xx: Add FSL QorIQ DPAA BMan support to device tree(s)

[Scott Wood]

On Mon, Dec 08, 2014 at 04:29:20AM -0600, Emil Medve wrote:
> From: Kumar Gala <galak at kernel.crashing.org>
> 
> Change-Id: If643fa5ba0a903aef8f5056a2c90ebecc995b760
> Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
> Signed-off-by: Geoff Thorpe <Geoff.Thorpe at freescale.com>
> Signed-off-by: Hai-Ying Wang <Haiying.Wang at freescale.com>
> Signed-off-by: Chunhe Lan <Chunhe.Lan at freescale.com>
> Signed-off-by: Poonam Aggrwal <poonam.aggrwal at freescale.com>
> [Emil Medve: Sync with the upstream binding]
> Signed-off-by: Emil Medve <Emilian.Medve at Freescale.com>

Doesn't apply cleanly

> @@ -408,6 +415,8 @@ crypto: crypto at 300000 {
>  		fsl,iommu-parent = <&pamu1>;
>  	};
>  
> +/include/ "qoriq-bman1.dtsi"
> +
>  /include/ "qoriq-fman-0.dtsi"
>  /include/ "qoriq-fman-0-1g-0.dtsi"
>  /include/ "qoriq-fman-0-1g-1.dtsi"

What tree did you base these patches on?  There's no fman in the upstream
device trees yet (just a binding).

-Scott