If the PCI controller wasn't configured or enabled delete from the
device tree (include its alias).

For the case that we didn't even configure u-boot with knowledge of
the controller we can use the fact that the pci_controller pointer
is NULL to delete the node in the device tree.  We determine that
a controller was not setup (because of HW config) based on the fact
that cfg_addr wasn't setup.

Signed-off-by: Kumar Gala <[email protected]>
---
* Use new fdt_del_node_and_alias helper

 drivers/pci/fsl_pci_init.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index fe57926..0d93686 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -513,10 +513,15 @@ void ft_fsl_pci_setup(void *blob, const char *pci_alias,
                        struct pci_controller *hose)
 {
        int off = fdt_path_offset(blob, pci_alias);
+       u32 bus_range[2];
 
-       if (off >= 0) {
-               u32 bus_range[2];
+       if (off < 0)
+               return;
 
+       /* We assume a cfg_addr not being set means we didn't setup the 
controller */
+       if ((hose == NULL) || (hose->cfg_addr == NULL)) {
+               fdt_del_node_and_alias(blob, pci_alias);
+       } else {
                bus_range[0] = 0;
                bus_range[1] = hose->last_busno - hose->first_busno;
                fdt_setprop(blob, off, "bus-range", &bus_range[0], 2*4);
-- 
1.6.0.6

_______________________________________________
U-Boot mailing list
[email protected]
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to