From 8879e209111192c5e9752d7bd203cf7582693328 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Thu, 3 May 2012 14:40:03 +0200 Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data --- arch/mips/bcm63xx/boards/board_bcm963xx.c | 9 ++++++++- 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 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -958,6 +959,7 @@ int __init board_register_devices(void) { int button_count = 0; int led_count = 0; + int i; if (board.has_uart0) bcm63xx_uart_register(0); @@ -996,7 +998,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.has_caldata && + !bcm63xx_nvram_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( @@ -1042,5 +1045,9 @@ int __init board_register_devices(void) platform_device_register(&bcm63xx_gpio_keys_device); } + /* register any fixups */ + for (i = 0; i < board.has_caldata; i++) + pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset); + return 0; } --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h @@ -8,6 +8,7 @@ #include #include #include +#include /* * flash mapping @@ -15,6 +16,11 @@ #define BCM963XX_CFE_VERSION_OFFSET 0x570 #define BCM963XX_NVRAM_OFFSET 0x580 +struct ath9k_caldata { + unsigned int slot; + u32 caldata_offset; +}; + /* * board definition */ @@ -34,6 +40,10 @@ struct board_info { unsigned int has_dsp:1; unsigned int has_uart0:1; unsigned int has_uart1:1; + unsigned int has_caldata:2; + + /* wifi calibration data config */ + struct ath9k_caldata caldata[2]; /* ethernet config */ struct bcm63xx_enet_platform_data enet0; -96348gw_a_leds.patch'>stats
path: root/target/linux/brcm63xx/patches-3.10/551-96348gw_a_leds.patch
blob: 0466ee85dff8d02cb69f7bb2a174cab7056a85e5 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1641,6 +1641,19 @@ static struct board_info __initdata boar
 	},
 
 	.has_ohci0 = 1,
+
+	.leds = {
+		{
+			.name		= "96348GW-A::adsl",
+			.gpio		= 3,
+			.active_low	= 1,
+		},
+		{
+			.name		= "96348GW-A::usb",
+			.gpio		= 0,
+			.active_low	= 1,
+		}
+	},
 };
 
 static struct board_info __initdata board_96348_D4PW = {