aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.1
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-03-05 14:23:45 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-03-05 14:23:45 +0000
commitca1e59660ec9090b06dc778368848751b0ffb6c2 (patch)
treee64eb460f4f922ba1537f34e721b81d0f403180b /target/linux/brcm63xx/patches-3.1
parent631a035a76580af3755e0151cc94d6685ab89949 (diff)
downloadupstream-ca1e59660ec9090b06dc778368848751b0ffb6c2.tar.gz
upstream-ca1e59660ec9090b06dc778368848751b0ffb6c2.tar.bz2
upstream-ca1e59660ec9090b06dc778368848751b0ffb6c2.zip
wire bcm96348gw-10 reset button (#10854)
SVN-Revision: 30820
Diffstat (limited to 'target/linux/brcm63xx/patches-3.1')
-rw-r--r--target/linux/brcm63xx/patches-3.1/460-board_96348gw-10_reset_button.patch20
-rw-r--r--target/linux/brcm63xx/patches-3.1/977-ssb_export_fallback_sprom.patch4
2 files changed, 22 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-3.1/460-board_96348gw-10_reset_button.patch b/target/linux/brcm63xx/patches-3.1/460-board_96348gw-10_reset_button.patch
new file mode 100644
index 0000000000..77124c0a81
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.1/460-board_96348gw-10_reset_button.patch
@@ -0,0 +1,20 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -335,6 +335,17 @@ static struct board_info __initdata boar
+ .active_low = 1,
+ },
+ },
++
++ .buttons = {
++ {
++ .desc = "reset",
++ .gpio = 6,
++ .active_low = 1,
++ .type = EV_KEY,
++ .code = KEY_RESTART,
++ .threshold = 3,
++ },
++ },
+ };
+
+ static struct board_info __initdata board_96348gw_11 = {
diff --git a/target/linux/brcm63xx/patches-3.1/977-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.1/977-ssb_export_fallback_sprom.patch
index 6bfa419bfd..8b345200f2 100644
--- a/target/linux/brcm63xx/patches-3.1/977-ssb_export_fallback_sprom.patch
+++ b/target/linux/brcm63xx/patches-3.1/977-ssb_export_fallback_sprom.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2210,7 +2210,7 @@ static void __init nb4_nvram_fixup(void)
+@@ -2221,7 +2221,7 @@ static void __init nb4_nvram_fixup(void)
* bcm4318 WLAN work
*/
#ifdef CONFIG_SSB_PCIHOST
@@ -9,7 +9,7 @@
.revision = 0x02,
.board_rev = 0x17,
.country_code = 0x0,
-@@ -2230,6 +2230,7 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -2241,6 +2241,7 @@ static struct ssb_sprom bcm63xx_sprom =
.boardflags_lo = 0x2848,
.boardflags_hi = 0x0000,
};