X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F561-board_WAP-5813n.patch;h=7d40b8c19bf29b52e80e34a19996a7e3b048b215;hb=d8c4cc64ba6cabb2e3be28c7b4539a95115119ce;hp=b0160c548b936c425206105494bac15fa9f3b53b;hpb=49106504d279ad91b1c66305a54c3fa9165c7b3c;p=15.05%2Fopenwrt.git

diff --git a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
index b0160c548b..7d40b8c19b 100644
--- a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
+++ b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
@@ -1,14 +1,16 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -13,6 +13,7 @@
- #include <linux/gpio_keys.h>
+@@ -14,7 +14,9 @@
  #include <linux/input.h>
  #include <linux/pci_ids.h>
-+#include <linux/platform_data/b53.h>
  #include <linux/platform_device.h>
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_gpio.h>
-@@ -4477,6 +4478,99 @@ static struct board_info __initdata boar
++#include <linux/platform_data/b53.h>
+ #include <linux/rtl8367.h>
++#include <linux/spi/spi.h>
+ #include <asm/addrspace.h>
+ #include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+@@ -1861,6 +1863,65 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,
  };
@@ -27,12 +29,22 @@
 +	}
 +};
 +
++static struct sprom_fixup __initdata wap5813n_fixups[] = {
++	{ .offset = 97, .value = 0xfeed },
++	{ .offset = 98, .value = 0x15d1 },
++	{ .offset = 99, .value = 0xfb0d },
++	{ .offset = 113, .value = 0xfef7 },
++	{ .offset = 114, .value = 0x15f7 },
++	{ .offset = 115, .value = 0xfb1a },
++};
++
 +static struct board_info __initdata board_WAP5813n = {
 +	.name				= "96369R-1231N",
 +	.expected_cpu_id		= 0x6368,
 +
 +	.has_uart0			= 1,
 +	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
 +	.has_ohci0			= 1,
 +	.has_ehci0			= 1,
 +
@@ -50,65 +62,21 @@
 +		},
 +	},
 +
-+	.leds = {
-+		{
-+			.name		= "WAP-5813n:green:power",
-+			.gpio		= 22,
-+			.default_trigger = "default-on",
-+		},
-+		{
-+			.name		= "WAP-5813n:red:power",
-+			.gpio		= 24,
-+		},
-+		{
-+			.name		= "WAP-5813n:green:inet",
-+			.gpio		= 5,
-+		},
-+		{
-+			.name		= "WAP-5813n:red:inet",
-+			.gpio		= 31,
-+		},
-+		{
-+			.name		= "WAP-5813n:green:wps",
-+			.gpio		= 23,
-+			.active_low	= 1,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc		= "wlan",
-+			.gpio		= 32,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= KEY_WLAN,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc		= "reset",
-+			.gpio		= 34,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= KEY_RESTART,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc		= "wps",
-+			.gpio		= 35,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= KEY_WPS_BUTTON,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
++	.fallback_sprom = {
++		.type 				= SPROM_BCM43222,
++		.pci_bus			= 0,
++		.pci_dev			= 1,
++		.board_fixups			= wap5813n_fixups,
++		.num_board_fixups		= ARRAY_SIZE(wap5813n_fixups),
 +	},
 +
 +	.spis = WAP5813n_spi_devices,
 +	.num_spis = ARRAY_SIZE(WAP5813n_spi_devices),
 +};
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -4860,6 +4954,7 @@ static const struct board_info __initcon
+@@ -2175,6 +2236,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -116,3 +84,11 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
+@@ -2260,6 +2322,7 @@ static struct of_device_id const bcm963x
+ #ifdef CONFIG_BCM63XX_CPU_6368
+ 	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
+ 	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
++	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_63268
+  	{ .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, },