diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-01-26 12:10:03 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-01-29 00:51:10 -0500 |
commit | bb209c8287d2d55ec4a67e3933346e0a3ee0da76 (patch) | |
tree | 2e444f273e631fa4dded4ee13ac779565e5efb43 /arch/powerpc/kernel/pci_of_scan.c | |
parent | b04da8bfdfbbd79544cab2fadfdc12e87eb01600 (diff) |
powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()
We are missing these when building the pci_dev from scratch off
the Open Firmware device-tree
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_of_scan.c')
-rw-r--r-- | arch/powerpc/kernel/pci_of_scan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c index 7311fdfb9bf8..693eb9a25bfa 100644 --- a/arch/powerpc/kernel/pci_of_scan.c +++ b/arch/powerpc/kernel/pci_of_scan.c | |||
@@ -140,6 +140,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, | |||
140 | dev->devfn = devfn; | 140 | dev->devfn = devfn; |
141 | dev->multifunction = 0; /* maybe a lie? */ | 141 | dev->multifunction = 0; /* maybe a lie? */ |
142 | dev->needs_freset = 0; /* pcie fundamental reset required */ | 142 | dev->needs_freset = 0; /* pcie fundamental reset required */ |
143 | set_pcie_port_type(dev); | ||
143 | 144 | ||
144 | dev->vendor = get_int_prop(node, "vendor-id", 0xffff); | 145 | dev->vendor = get_int_prop(node, "vendor-id", 0xffff); |
145 | dev->device = get_int_prop(node, "device-id", 0xffff); | 146 | dev->device = get_int_prop(node, "device-id", 0xffff); |
@@ -164,6 +165,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, | |||
164 | /* a PCI-PCI bridge */ | 165 | /* a PCI-PCI bridge */ |
165 | dev->hdr_type = PCI_HEADER_TYPE_BRIDGE; | 166 | dev->hdr_type = PCI_HEADER_TYPE_BRIDGE; |
166 | dev->rom_base_reg = PCI_ROM_ADDRESS1; | 167 | dev->rom_base_reg = PCI_ROM_ADDRESS1; |
168 | set_pcie_hotplug_bridge(dev); | ||
167 | } else if (!strcmp(type, "cardbus")) { | 169 | } else if (!strcmp(type, "cardbus")) { |
168 | dev->hdr_type = PCI_HEADER_TYPE_CARDBUS; | 170 | dev->hdr_type = PCI_HEADER_TYPE_CARDBUS; |
169 | } else { | 171 | } else { |