diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:37 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:37 +0000 |
| commit | dc230d9b0f9ba046fb1e9e51de21ae35504a9aab (patch) | |
| tree | 8d43a35b2fbe9a47e9c75f708017d651d47d4fa1 /target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch | |
| parent | 44ef9f778994e1b9bd37c8525045b53d82b6a504 (diff) | |
| download | mtk-20170518-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.zip mtk-20170518-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.tar.gz mtk-20170518-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.tar.bz2 | |
brcm63xx: 3.10: backport multi-board support
There have been no reported regressions, so backport it to 3.10.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 41422
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch index 7991fad..4a3a4e9 100644 --- a/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch +++ b/target/linux/brcm63xx/patches-3.10/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch @@ -8,17 +8,17 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +--- a/arch/mips/bcm63xx/boards/board_common.c ++++ b/arch/mips/bcm63xx/boards/board_common.c @@ -33,6 +33,7 @@ #include <bcm63xx_dev_usb_ohci.h> #include <bcm63xx_dev_usb_usbd.h> #include <board_bcm963xx.h> +#include <pci_ath9k_fixup.h> - #include <uapi/linux/bcm933xx_hcs.h> - #include <uapi/linux/bcm963xx_tag.h> -@@ -969,6 +970,7 @@ int __init board_register_devices(void) + #include "board_common.h" + +@@ -197,6 +198,7 @@ int __init board_register_devices(void) int button_count = 0; int led_count = 0; int usbh_ports = 0; @@ -26,17 +26,17 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data if (board.has_uart0) bcm63xx_uart_register(0); -@@ -1014,7 +1016,8 @@ int __init board_register_devices(void) +@@ -242,7 +244,8 @@ int __init board_register_devices(void) * do this after registering enet devices */ #ifdef CONFIG_SSB_PCIHOST -- if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) { +- if (!board_get_mac_address(bcm63xx_sprom.il0mac)) { + if (!board.has_caldata && -+ !bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) { ++ !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_register_fallback_sprom( -@@ -1061,5 +1064,9 @@ int __init board_register_devices(void) +@@ -289,5 +292,9 @@ int __init board_register_devices(void) platform_device_register(&bcm63xx_gpio_keys_device); } |