mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-20 11:00:15 +03:00
[brcm63xx] only register fallback sprom and enable PCI if we actually have support for PCI
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16581 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
92e1f331ae
commit
98724ee830
@ -378,13 +378,13 @@ void __init board_prom_init(void)
|
||||
* this has to be done this early since PCI init is done
|
||||
* inside arch_initcall */
|
||||
val = 0;
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
if (board.has_pci) {
|
||||
bcm63xx_pci_enabled = 1;
|
||||
if (BCMCPU_IS_6348())
|
||||
val |= GPIO_MODE_6348_G2_PCI;
|
||||
}
|
||||
|
||||
#endif
|
||||
if (board.has_pccard) {
|
||||
if (BCMCPU_IS_6348())
|
||||
val |= GPIO_MODE_6348_G1_MII_PCCARD;
|
||||
@ -538,12 +538,14 @@ int __init board_register_devices(void)
|
||||
bcm63xx_udc_register();
|
||||
/* Generate MAC address for WLAN and
|
||||
* register our SPROM */
|
||||
#ifdef CONFIG_PCI
|
||||
if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
|
||||
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0)
|
||||
printk(KERN_ERR "failed to register fallback SPROM\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
/* read base address of boot chip select (0) */
|
||||
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||
|
Loading…
Reference in New Issue
Block a user