projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: reduce button threshold values
[librecmc/librecmc.git]
/
target
/
linux
/
ar71xx
/
files
/
arch
/
mips
/
ar71xx
/
mach-ubnt.c
diff --git
a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
index e3285cf94c6cde9c5ae583f650454299fe6d913b..5b1c504f39b2d49443766d630962ebd784718542 100644
(file)
--- a/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@
-10,17
+10,16
@@
* by the Free Software Foundation.
*/
* by the Free Software Foundation.
*/
-#include <linux/pci.h>
-#include <linux/platform_device.h>
-#include <linux/input.h>
-
-#include <asm/mips_machine.h>
#include <asm/mach-ar71xx/ar71xx.h>
#include <asm/mach-ar71xx/ar71xx.h>
+#include "machtype.h"
#include "devices.h"
#include "dev-m25p80.h"
#include "dev-ap91-pci.h"
#include "devices.h"
#include "dev-m25p80.h"
#include "dev-ap91-pci.h"
+#include "dev-gpio-buttons.h"
#include "dev-pb42-pci.h"
#include "dev-pb42-pci.h"
+#include "dev-leds-gpio.h"
+#include "dev-usb.h"
#define UBNT_RS_GPIO_LED_RF 2
#define UBNT_RS_GPIO_SW4 8
#define UBNT_RS_GPIO_LED_RF 2
#define UBNT_RS_GPIO_SW4 8
@@
-106,7
+105,7
@@
static struct gpio_button ubnt_gpio_buttons[] __initdata = {
.desc = "sw4",
.type = EV_KEY,
.code = BTN_0,
.desc = "sw4",
.type = EV_KEY,
.code = BTN_0,
- .threshold =
5
,
+ .threshold =
3
,
.gpio = UBNT_RS_GPIO_SW4,
.active_low = 1,
}
.gpio = UBNT_RS_GPIO_SW4,
.active_low = 1,
}
@@
-117,7
+116,7
@@
static struct gpio_button ubnt_m_gpio_buttons[] __initdata = {
.desc = "reset",
.type = EV_KEY,
.code = BTN_0,
.desc = "reset",
.type = EV_KEY,
.code = BTN_0,
- .threshold =
5
,
+ .threshold =
3
,
.gpio = UBNT_M_GPIO_BTN_RESET,
.active_low = 1,
}
.gpio = UBNT_M_GPIO_BTN_RESET,
.active_low = 1,
}
@@
-164,7
+163,11
@@
static void __init ubnt_rs_setup(void)
ubnt_rs_leds_gpio);
}
ubnt_rs_leds_gpio);
}
-MIPS_MACHINE(AR71XX_MACH_UBNT_RS, "Ubiquiti RouterStation", ubnt_rs_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_RS, "UBNT-RS", "Ubiquiti RouterStation",
+ ubnt_rs_setup);
+
+MIPS_MACHINE(AR71XX_MACH_UBNT_AR71XX, "Ubiquiti AR71xx-based board",
+ "Ubiquiti RouterStation", ubnt_rs_setup);
static void __init ubnt_rspro_setup(void)
{
static void __init ubnt_rspro_setup(void)
{
@@
-190,7
+193,7
@@
static void __init ubnt_rspro_setup(void)
ubnt_rs_leds_gpio);
}
ubnt_rs_leds_gpio);
}
-MIPS_MACHINE(AR71XX_MACH_UBNT_RSPRO, "Ubiquiti RouterStation Pro",
+MIPS_MACHINE(AR71XX_MACH_UBNT_RSPRO, "U
BNT-RSPRO", "U
biquiti RouterStation Pro",
ubnt_rspro_setup);
static void __init ubnt_lsx_setup(void)
ubnt_rspro_setup);
static void __init ubnt_lsx_setup(void)
@@
-198,7
+201,7
@@
static void __init ubnt_lsx_setup(void)
ubnt_generic_setup();
}
ubnt_generic_setup();
}
-MIPS_MACHINE(AR71XX_MACH_UBNT_LSX, "Ubiquiti LSX", ubnt_lsx_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_LSX, "U
BNT-LSX", "U
biquiti LSX", ubnt_lsx_setup);
#define UBNT_LSSR71_PHY_MASK (1 << 1)
#define UBNT_LSSR71_PHY_MASK (1 << 1)
@@
-217,7
+220,8
@@
static void __init ubnt_lssr71_setup(void)
ubnt_ls_sr71_leds_gpio);
}
ubnt_ls_sr71_leds_gpio);
}
-MIPS_MACHINE(AR71XX_MACH_UBNT_LSSR71, "Ubiquiti LS-SR71", ubnt_lssr71_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_LSSR71, "UBNT-LS-SR71", "Ubiquiti LS-SR71",
+ ubnt_lssr71_setup);
static void __init ubnt_m_setup(void)
{
static void __init ubnt_m_setup(void)
{
@@
-256,8
+260,10
@@
static void __init ubnt_rocket_m_setup(void)
ar71xx_add_device_usb();
}
ar71xx_add_device_usb();
}
-MIPS_MACHINE(AR71XX_MACH_UBNT_BULLET_M, "Ubiquiti Bullet M", ubnt_m_setup);
-MIPS_MACHINE(AR71XX_MACH_UBNT_ROCKET_M, "Ubiquiti Rocket M", ubnt_rocket_m_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_BULLET_M, "UBNT-BM", "Ubiquiti Bullet M",
+ ubnt_m_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_ROCKET_M, "UBNT-RM", "Ubiquiti Rocket M",
+ ubnt_rocket_m_setup);
/* TODO detect the second ethernet port and use one
init function for all Ubiquiti MIMO series products */
/* TODO detect the second ethernet port and use one
init function for all Ubiquiti MIMO series products */
@@
-276,4
+282,5
@@
static void __init ubnt_nano_m_setup(void)
ar71xx_add_device_eth(1);
}
ar71xx_add_device_eth(1);
}
-MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "Ubiquiti Nanostation M", ubnt_nano_m_setup);
+MIPS_MACHINE(AR71XX_MACH_UBNT_NANO_M, "UBNT-NM", "Ubiquiti Nanostation M",
+ ubnt_nano_m_setup);