Patchwork ppc4xx: Allow 4xx PCI bridge to be disabled via device tree

login
register
mail settings
Submitter Matthias Fuchs
Date Sept. 10, 2008, 3:55 p.m.
Message ID <200809101755.46883.matthias.fuchs@esd-electronics.com>
Download mbox | patch
Permalink /patch/229/
State Accepted
Commit 5a013fc7bb48acefe94011f4b83fef95b381f875
Delegated to: Josh Boyer
Headers show

Comments

Matthias Fuchs - Sept. 10, 2008, 3:55 p.m.
This patch allows the 4xx (conventional) PCI bridge to be disabled
via the device tree. This is needed for 4xx PCI adapter hardware.

Use the PCI node's status property to disable the PCI bridge.

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Stefan Roese - Sept. 11, 2008, 4:30 a.m.
On Wednesday 10 September 2008, Matthias Fuchs wrote:
> This patch allows the 4xx (conventional) PCI bridge to be disabled
> via the device tree. This is needed for 4xx PCI adapter hardware.
>
> Use the PCI node's status property to disable the PCI bridge.
>
> Signed-off-by: Matthias Fuchs <matthias.fuchs@esd-electronics.com>

Acked-by: Stefan Roese <sr@denx.de>

Best regards,
Stefan

Patch

diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index fb368df..8c13d4f 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -277,9 +277,16 @@  static void __init ppc4xx_probe_pci_bridge(struct device_node *np)
 	const int *bus_range;
 	int primary = 0;
 
+	/* Check if device is enabled */
+	if (!of_device_is_available(np)) {
+		printk(KERN_INFO "%s: Port disabled via device-tree\n",
+		       np->full_name);
+		return;
+	}
+
 	/* Fetch config space registers address */
 	if (of_address_to_resource(np, 0, &rsrc_cfg)) {
-		printk(KERN_ERR "%s:Can't get PCI config register base !",
+		printk(KERN_ERR "%s: Can't get PCI config register base !",
 		       np->full_name);
 		return;
 	}