From a9d023be0165824f8ab0986da7023508ffb96fd5 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 2 May 2012 15:40:26 +0000 Subject: [brcm63xx] use a define for the poll and debounce interval git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31550 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/brcm63xx/patches-3.3/501-board-NB4.patch | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'target/linux/brcm63xx/patches-3.3/501-board-NB4.patch') diff --git a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch index 0ac69f1567..7e288ff61c 100644 --- a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch +++ b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch @@ -10,7 +10,7 @@ #include #include #include -@@ -38,6 +41,12 @@ +@@ -41,6 +44,12 @@ #define CFE_OFFSET_64K 0x10000 #define CFE_OFFSET_128K 0x20000 @@ -23,7 +23,7 @@ static struct bcm963xx_nvram nvram; static unsigned int mac_addr_used; static struct board_info board; -@@ -664,6 +673,496 @@ static struct board_info __initdata boar +@@ -667,6 +676,496 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -140,14 +140,14 @@ + .gpio = 34, + .type = EV_KEY, + .code = KEY_RESTART, -+ .debounce_interval = 60, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, + }, + { + .desc = "wps", + .gpio = 37, + .type = EV_KEY, + .code = KEY_WPS_BUTTON, -+ .debounce_interval = 60, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, + }, + }, + .devs = nb4_devices, @@ -233,14 +233,14 @@ + .gpio = 34, + .type = EV_KEY, + .code = KEY_RESTART, -+ .debounce_interval = 60, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, + }, + { + .desc = "wps", + .gpio = 37, + .type = EV_KEY, + .code = KEY_WPS_BUTTON, -+ .debounce_interval = 60, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, + }, + }, + .devs = nb4_devices, @@ -326,14 +326,14 @@ + .gpio = 34, + .type = EV_KEY, + .code = KEY_RESTART, -+ .debounce_interval = 60, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, + }, + { + .desc = "wps", + .gpio = 37, + .type = EV_KEY, + .code = KEY_WPS_BUTTON, -+ .debounce_interval = 60, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, + }, + }, + .devs = nb4_devices, @@ -414,14 +414,14 @@ + .gpio = 34, + .type = EV_KEY, + .code = KEY_RESTART, -+ .debounce_interval = 60, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, + }, + { + .desc = "wps", + .gpio = 37, + .type = EV_KEY, + .code = KEY_WPS_BUTTON, -+ .debounce_interval = 60, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, + }, + }, + .devs = nb4_devices, @@ -502,14 +502,14 @@ + .gpio = 34, + .type = EV_KEY, + .code = KEY_RESTART, -+ .debounce_interval = 60, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, + }, + { + .desc = "wps", + .gpio = 37, + .type = EV_KEY, + .code = KEY_WPS_BUTTON, -+ .debounce_interval = 60, ++ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, + }, + }, + .devs = nb4_devices, @@ -520,7 +520,7 @@ #endif /* -@@ -694,9 +1193,30 @@ static const struct board_info __initdat +@@ -697,9 +1196,30 @@ static const struct board_info __initdat &board_96358vw2, &board_AGPFS0, &board_DWVS0, @@ -551,7 +551,7 @@ /* * Register a sane SPROMv2 to make the on-board * bcm4318 WLAN work -@@ -847,6 +1367,9 @@ void __init board_prom_init(void) +@@ -850,6 +1370,9 @@ void __init board_prom_init(void) boardid_fixup(boot_addr); } -- cgit v1.2.3