Commit bb53bb3d authored by Jake Moilanen's avatar Jake Moilanen Committed by Paul Mackerras
Browse files

[POWERPC] Add support for PCI-Express nodes in the device tree 



This adds support to recognize the PCIe device_type "pciex" and made
the portdrv buildable.

Signed-off-by: default avatarJake Moilanen <moilanen@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0f582bc1

arch/powerpc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -853,6 +853,8 @@ config 8260_PCI9_IDMA4 


endchoice



source "drivers/pci/pcie/Kconfig"



source "drivers/pci/Kconfig"



source "drivers/pcmcia/Kconfig"

arch/powerpc/kernel/pci_64.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 


	dev->current_state = 4;		/* unknown power state */



	if (!strcmp(type, "pci")) {

	if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {

		/* a PCI-PCI bridge */

		dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;

		dev->rom_base_reg = PCI_ROM_ADDRESS1;

arch/powerpc/kernel/rtas_pci.c

+3 −1
Original line number Diff line number Diff line
@@ -313,7 +313,9 @@ unsigned long __init find_and_init_phbs(void) 
	for (node = of_get_next_child(root, NULL);

	     node != NULL;

	     node = of_get_next_child(root, node)) {

		if (node->type == NULL || strcmp(node->type, "pci") != 0)



		if (node->type == NULL || (strcmp(node->type, "pci") != 0 &&

					   strcmp(node->type, "pciex") != 0))

			continue;



		phb = pcibios_alloc_controller(node);