diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-10 20:33:06 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-10 20:33:06 +0200 |
| commit | 59530af55613a8c5fac3c4e0f5fbcf2f1611c483 (patch) | |
| tree | f16287c465c5f577cbfc22ae8ee3a1f979519af0 /cpu/mpc83xx/pci.c | |
| parent | c74b2108e31fe09bd1c5d291c3cf360510d4f13e (diff) | |
| parent | 99c2fdab91bc633e46fb41dbaa629f87ccf6e00f (diff) | |
| download | u-boot-imx-59530af55613a8c5fac3c4e0f5fbcf2f1611c483.zip u-boot-imx-59530af55613a8c5fac3c4e0f5fbcf2f1611c483.tar.gz u-boot-imx-59530af55613a8c5fac3c4e0f5fbcf2f1611c483.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu/mpc83xx/pci.c')
| -rw-r--r-- | cpu/mpc83xx/pci.c | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/cpu/mpc83xx/pci.c b/cpu/mpc83xx/pci.c index 785d612..2298218 100644 --- a/cpu/mpc83xx/pci.c +++ b/cpu/mpc83xx/pci.c @@ -25,7 +25,14 @@ #include <common.h> #include <pci.h> + +#if defined(CONFIG_OF_LIBFDT) +#include <libfdt.h> +#include <libfdt_env.h> +#elif defined(CONFIG_OF_FLAT_TREE) #include <ft_build.h> +#endif + #include <asm/mpc8349_pci.h> #ifdef CONFIG_83XX_GENERIC_PCI @@ -163,7 +170,34 @@ void mpc83xx_pci_init(int num_buses, struct pci_region **reg, int warmboot) pci_init_bus(i, reg[i]); } -#ifdef CONFIG_OF_FLAT_TREE +#if defined(CONFIG_OF_LIBFDT) +void ft_pci_setup(void *blob, bd_t *bd) +{ + int nodeoffset; + int err; + int tmp[2]; + + if (pci_num_buses < 1) + return; + + nodeoffset = fdt_find_node_by_path(blob, "/" OF_SOC "/pci@8500"); + if (nodeoffset >= 0) { + tmp[0] = cpu_to_be32(pci_hose[0].first_busno); + tmp[1] = cpu_to_be32(pci_hose[0].last_busno); + err = fdt_setprop(blob, nodeoffset, "bus-range", tmp, sizeof(tmp)); + } + + if (pci_num_buses < 2) + return; + + nodeoffset = fdt_find_node_by_path(blob, "/" OF_SOC "/pci@8600"); + if (nodeoffset >= 0) { + tmp[0] = cpu_to_be32(pci_hose[0].first_busno); + tmp[1] = cpu_to_be32(pci_hose[0].last_busno); + err = fdt_setprop(blob, nodeoffset, "bus-range", tmp, sizeof(tmp)); + } +} +#elif CONFIG_OF_FLAT_TREE void ft_pci_setup(void *blob, bd_t *bd) { u32 *p; |