Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only register fallback sprom and enable PCI if we actually have support for PCI

Browse source 
SVN-Revision: 16581
This commit is contained in:
Florian Fainelli 2009-06-27 16:17:18 +00:00
parent bf0942ce5c
commit 7da8855c79
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
View file

@ -378,13 +378,13 @@ void __init board_prom_init(void)
* this has to be done this early since PCI init is done * this has to be done this early since PCI init is done
* inside arch_initcall */ * inside arch_initcall */
val = 0; val = 0;
#ifdef CONFIG_PCI
if (board.has_pci) { if (board.has_pci) {
bcm63xx_pci_enabled = 1; bcm63xx_pci_enabled = 1;
if (BCMCPU_IS_6348()) if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G2_PCI; val |= GPIO_MODE_6348_G2_PCI;
} }
#endif
if (board.has_pccard) { if (board.has_pccard) {
if (BCMCPU_IS_6348()) if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G1_MII_PCCARD; val |= GPIO_MODE_6348_G1_MII_PCCARD;
@ -538,12 +538,14 @@ int __init board_register_devices(void)
bcm63xx_udc_register(); bcm63xx_udc_register();
/* Generate MAC address for WLAN and /* Generate MAC address for WLAN and
* register our SPROM */ * register our SPROM */
#ifdef CONFIG_PCI
if (!board_get_mac_address(bcm63xx_sprom.il0mac)) { if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0) if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0)
printk(KERN_ERR "failed to register fallback SPROM\n"); printk(KERN_ERR "failed to register fallback SPROM\n");
} }
#endif
/* read base address of boot chip select (0) */ /* read base address of boot chip select (0) */
val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val = bcm_mpi_readl(MPI_CSBASE_REG(0));