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

[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
...@@ -853,6 +853,8 @@ config 8260_PCI9_IDMA4 ...@@ -853,6 +853,8 @@ config 8260_PCI9_IDMA4
endchoice endchoice
source "drivers/pci/pcie/Kconfig"
source "drivers/pci/Kconfig" source "drivers/pci/Kconfig"
source "drivers/pcmcia/Kconfig" source "drivers/pcmcia/Kconfig"
......
...@@ -388,7 +388,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, ...@@ -388,7 +388,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
dev->current_state = 4; /* unknown power state */ dev->current_state = 4; /* unknown power state */
if (!strcmp(type, "pci")) { if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
/* a PCI-PCI bridge */ /* a PCI-PCI bridge */
dev->hdr_type = PCI_HEADER_TYPE_BRIDGE; dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
dev->rom_base_reg = PCI_ROM_ADDRESS1; dev->rom_base_reg = PCI_ROM_ADDRESS1;
......
...@@ -313,7 +313,9 @@ unsigned long __init find_and_init_phbs(void) ...@@ -313,7 +313,9 @@ unsigned long __init find_and_init_phbs(void)
for (node = of_get_next_child(root, NULL); for (node = of_get_next_child(root, NULL);
node != NULL; node != NULL;
node = of_get_next_child(root, node)) { 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; continue;
phb = pcibios_alloc_controller(node); phb = pcibios_alloc_controller(node);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment