Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9a43342 authored by Kumar Gala's avatar Kumar Gala
Browse files

powerpc/85xx: Cleanup PCIe support on corenet_ds boards 



Several changes on PCIe support on P3041DS/P4080DS/P5020DS boards:
* Add support for "fsl,qoriq-pcie-v2.2" needed by P3041 & P5020
* Removed support for setting primary_phb_addr as we have no ISA need
* Add PCI controller to of_platform_bus_probe (for EDAC)
* Cleanup building w/SWIOTLB off on P4080DS (not stricly PCIe related)

Signed-off-by: default avatarKai.Jiang <Kai.Jiang@freescale.com>
Signed-off-by: default avatarLaurentiu TUDOR <Laurentiu.Tudor@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 169296b3

arch/powerpc/platforms/85xx/corenet_ds.c

+14 −15
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Maintained by Kumar Gala (see MAINTAINERS for contact information)

 *

 * Copyright 2009 Freescale Semiconductor Inc.

 * Copyright 2009-2011 Freescale Semiconductor Inc.

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the
@@ -61,10 +61,6 @@ void __init corenet_ds_pic_init(void) 
	mpic_init(mpic);

}



#ifdef CONFIG_PCI

static int primary_phb_addr;

#endif



/*

 * Setup the architecture

 */
@@ -85,18 +81,15 @@ void __init corenet_ds_setup_arch(void) 
#endif



#ifdef CONFIG_PCI

	for_each_compatible_node(np, "pci", "fsl,p4080-pcie") {

		struct resource rsrc;

		of_address_to_resource(np, 0, &rsrc);

		if ((rsrc.start & 0xfffff) == primary_phb_addr)

			fsl_add_bridge(np, 1);

		else

	for_each_node_by_type(np, "pci") {

		if (of_device_is_compatible(np, "fsl,p4080-pcie") ||

		    of_device_is_compatible(np, "fsl,qoriq-pcie-v2.2")) {

			fsl_add_bridge(np, 0);



			hose = pci_find_hose_for_OF_device(np);

			max = min(max, hose->dma_window_base_cur +

					hose->dma_window_size);

		}

	}

#endif



#ifdef CONFIG_SWIOTLB
@@ -116,6 +109,12 @@ static const struct of_device_id of_device_ids[] __devinitconst = { 
	{

		.compatible	= "fsl,rapidio-delta",

	},

	{

		.compatible	= "fsl,p4080-pcie",

	},

	{

		.compatible	= "fsl,qoriq-pcie-v2.2",

	},

	{}

};

arch/powerpc/platforms/85xx/p4080_ds.c

+3 −15
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ 


#include "corenet_ds.h"



#ifdef CONFIG_PCI

static int primary_phb_addr;

#endif



/*

 * Called very early, device-tree isn't unflattened

 */
@@ -43,17 +39,7 @@ static int __init p4080_ds_probe(void) 
{

	unsigned long root = of_get_flat_dt_root();



	if (of_flat_dt_is_compatible(root, "fsl,P4080DS")) {

#ifdef CONFIG_PCI

		/* treat PCIe1 as primary,

		 * shouldn't matter as we have no ISA on the board

		 */

		primary_phb_addr = 0x0000;

#endif

		return 1;

	} else {

		return 0;

	}

	return of_flat_dt_is_compatible(root, "fsl,P4080DS");

}



define_machine(p4080_ds) {
@@ -71,4 +57,6 @@ define_machine(p4080_ds) { 
};



machine_device_initcall(p4080_ds, corenet_ds_publish_devices);

#ifdef CONFIG_SWIOTLB

machine_arch_initcall(p4080_ds, swiotlb_setup_bus_notifier);

#endif