Skip to content

Commit

Permalink
[POWERPC] Add support for PCI-Express nodes in the device tree
Browse files Browse the repository at this point in the history
This adds support to recognize the PCIe device_type "pciex" and made
the portdrv buildable.

Signed-off-by: Jake Moilanen <moilanen@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Jake Moilanen authored and Paul Mackerras committed Jun 15, 2006
1 parent 0f582bc commit bb53bb3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,8 @@ config 8260_PCI9_IDMA4

endchoice

source "drivers/pci/pcie/Kconfig"

source "drivers/pci/Kconfig"

source "drivers/pcmcia/Kconfig"
Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/kernel/pci_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion arch/powerpc/kernel/rtas_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bb53bb3

Please sign in to comment.