Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: BCM63xx: Register SSB SPROM fallback in board's first stage callback

Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>
To: Maxime Bizon <mbizon@freebox.fr>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1017/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Florian Fainelli and committed by
Ralf Baechle
e23a90eb 4fe67e44

+11 -11
+11 -11
arch/mips/bcm63xx/boards/board_bcm963xx.c
··· 716 } 717 718 bcm_gpio_writel(val, GPIO_MODE_REG); 719 } 720 721 /* ··· 879 880 if (board.has_dsp) 881 bcm63xx_dsp_register(&board.dsp); 882 - 883 - /* Generate MAC address for WLAN and 884 - * register our SPROM */ 885 - #ifdef CONFIG_SSB_PCIHOST 886 - if (!board_get_mac_address(bcm63xx_sprom.il0mac)) { 887 - memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); 888 - memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); 889 - if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0) 890 - printk(KERN_ERR "failed to register fallback SPROM\n"); 891 - } 892 - #endif 893 894 /* read base address of boot chip select (0) */ 895 if (BCMCPU_IS_6345())
··· 716 } 717 718 bcm_gpio_writel(val, GPIO_MODE_REG); 719 + 720 + /* Generate MAC address for WLAN and 721 + * register our SPROM */ 722 + #ifdef CONFIG_SSB_PCIHOST 723 + if (!board_get_mac_address(bcm63xx_sprom.il0mac)) { 724 + memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN); 725 + memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN); 726 + if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0) 727 + printk(KERN_ERR "failed to register fallback SPROM\n"); 728 + } 729 + #endif 730 } 731 732 /* ··· 868 869 if (board.has_dsp) 870 bcm63xx_dsp_register(&board.dsp); 871 872 /* read base address of boot chip select (0) */ 873 if (BCMCPU_IS_6345())