[PATCH V3 3/5] powerpc/mpc85xx: convert to unified PCI init

[Kumar Gala]

On Jul 26, 2012, at 7:30 AM, Jia Hongtao wrote:

> PCI initialization is now done by PCI controller driver. In board_setup_arch
> stage we don't need PCI init any more but swiotlb should be determined at this
> stage.
> 
> Signed-off-by: Jia Hongtao <B38951 at freescale.com>
> Signed-off-by: Li Yang <leoli at freescale.com>
> ---
> We now just apply this for mpc85xx_ds and qemu
> 
> arch/powerpc/kernel/iommu.c.rej          |   22 -----------------
> arch/powerpc/platforms/85xx/common.c     |    9 +++++++
> arch/powerpc/platforms/85xx/mpc85xx_ds.c |   38 +++++++----------------------
> arch/powerpc/platforms/85xx/qemu_e500.c  |    5 +++-
> 4 files changed, 22 insertions(+), 52 deletions(-)
> delete mode 100644 arch/powerpc/kernel/iommu.c.rej
> 
> diff --git a/arch/powerpc/kernel/iommu.c.rej b/arch/powerpc/kernel/iommu.c.rej
> deleted file mode 100644
> index 9d10d34..0000000
> --- a/arch/powerpc/kernel/iommu.c.rej
> +++ /dev/null
> @@ -1,22 +0,0 @@
> ---- arch/powerpc/kernel/iommu.c	2012-06-08 09:01:02.785709100 +1000
> -+++ arch/powerpc/kernel/iommu.c	2012-06-08 09:01:07.489784856 +1000
> -@@ -33,7 +33,9 @@
> - #include <linux/bitmap.h>
> - #include <linux/iommu-helper.h>
> - #include <linux/crash_dump.h>
> -+#include <linux/fault-inject.h>
> - #include <asm/io.h>
> -+#include <asm/vio.h>
> - #include <asm/prom.h>
> - #include <asm/iommu.h>
> - #include <asm/pci-bridge.h>
> -@@ -171,6 +261,9 @@
> - 		return DMA_ERROR_CODE;
> - 	}
> - 
> -+	if (should_fail_iommu(dev))
> -+		return DMA_ERROR_CODE;
> -+
> - 	if (handle && *handle)
> - 		start = *handle;
> - 	else
> diff --git a/arch/powerpc/platforms/85xx/common.c b/arch/powerpc/platforms/85xx/common.c
> index 67dac22..303fedb 100644
> --- a/arch/powerpc/platforms/85xx/common.c
> +++ b/arch/powerpc/platforms/85xx/common.c
> @@ -27,6 +27,15 @@ static struct of_device_id __initdata mpc85xx_common_ids[] = {
> 	{ .compatible = "fsl,mpc8548-guts", },
> 	/* Probably unnecessary? */
> 	{ .compatible = "gpio-leds", },
> +	/* For all PCI controllers */
> +	{ .compatible = "fsl,mpc8540-pci", },
> +	{ .compatible = "fsl,mpc8548-pcie", },
> +	{ .compatible = "fsl,p1022-pcie", },
> +	{ .compatible = "fsl,p1010-pcie", },
> +	{ .compatible = "fsl,p1023-pcie", },
> +	{ .compatible = "fsl,p4080-pcie", },

Add:

	{ .compatible = "fsl,qoriq-pcie-v2.4", },

> +	{ .compatible = "fsl,qoriq-pcie-v2.3", },
> +	{ .compatible = "fsl,qoriq-pcie-v2.2", },


> 	{},
> };

- k