aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-05-02 15:40:26 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-05-02 15:40:26 +0000
commit5d9b44d1109f82db715078d66f603a1628f9ecb9 (patch)
tree5a3541f1e5df7585e24ec8756c471d108ddf1b56 /target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
parent643babfc3ca64d0fbb505cebbc1c1d92c270de1b (diff)
downloadupstream-5d9b44d1109f82db715078d66f603a1628f9ecb9.tar.gz
upstream-5d9b44d1109f82db715078d66f603a1628f9ecb9.tar.bz2
upstream-5d9b44d1109f82db715078d66f603a1628f9ecb9.zip
use a define for the poll and debounce interval
SVN-Revision: 31550
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch9
1 files changed, 6 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
index 227a852797..f561529434 100644
--- a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -29,9 +29,13 @@
+@@ -29,12 +29,16 @@
#include <bcm63xx_dev_pcmcia.h>
#include <bcm63xx_dev_spi.h>
#include <board_bcm963xx.h>
@@ -8,13 +8,16 @@
#define PFX "board_bcm963xx: "
+ #define BCM963XX_KEYS_POLL_INTERVAL 20
+ #define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3)
+
+#define CFE_OFFSET_64K 0x10000
+#define CFE_OFFSET_128K 0x20000
+
static struct bcm963xx_nvram nvram;
static unsigned int mac_addr_used;
static struct board_info board;
-@@ -722,6 +726,29 @@ static int board_get_mac_address(u8 *mac
+@@ -725,6 +729,29 @@ static int board_get_mac_address(u8 *mac
return 0;
}
@@ -44,7 +47,7 @@
/*
* early init callback, read nvram data from flash and checksum it
*/
-@@ -763,6 +790,11 @@ void __init board_prom_init(void)
+@@ -766,6 +793,11 @@ void __init board_prom_init(void)
return;
}