summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtarget/linux/ramips/base-files/etc/diag.sh5
-rwxr-xr-xtarget/linux/ramips/base-files/lib/upgrade/platform.sh2
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c20
3 files changed, 15 insertions, 12 deletions
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index c69cb9e1c4..051c884de1 100755
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -42,7 +42,10 @@ get_status_led() {
whr-g300n)
status_led="whr-g300n:red:diag"
;;
- esac;
+ hw550-3g)
+ status_led="hw550-3g:green:status"
+ ;;
+ esac
}
set_state() {
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index d0094286b5..bf8a9865be 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -14,7 +14,7 @@ platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1
case "$board" in
- dir-300-b1 | fonera20n | v22rw-2x2 | whr-g300n)
+ dir-300-b1 | fonera20n | v22rw-2x2 | whr-g300n | hw550-3g)
[ "$magic" != "2705" ] && {
echo "Invalid image type."
return 1
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
index ffb209456a..3770760fdc 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-hw550-3g.c
@@ -23,12 +23,12 @@
#include "devices.h"
#define HW550_3G_GPIO_LED_USB 8
-#define HW550_3G_GPIO_LED_3G_STAT 11
-#define HW550_3G_GPIO_LED_3G_TOGGLE 12
+#define HW550_3G_GPIO_LED_3G 11
+#define HW550_3G_GPIO_LED_STATUS 12
#define HW550_3G_GPIO_LED_WPS 14
#define HW550_3G_GPIO_BUTTON_RESET 10
-#define HW550_3G_GPIO_BUTTON_3G 7
+#define HW550_3G_GPIO_BUTTON_CONNECT 7
#define HW550_3G_GPIO_BUTTON_WPS 0
#define HW550_3G_BUTTONS_POLL_INTERVAL 20
@@ -83,12 +83,12 @@ static struct gpio_led hw550_3g_leds_gpio[] __initdata = {
.gpio = HW550_3G_GPIO_LED_USB,
.active_low = 1,
}, {
- .name = "hw550-3g:green:3g-stat",
- .gpio = HW550_3G_GPIO_LED_3G_STAT,
+ .name = "hw550-3g:green:3g",
+ .gpio = HW550_3G_GPIO_LED_3G,
.active_low = 1,
}, {
- .name = "hw550-3g:green:3g-toggle",
- .gpio = HW550_3G_GPIO_LED_3G_TOGGLE,
+ .name = "hw550-3g:green:status",
+ .gpio = HW550_3G_GPIO_LED_STATUS,
.active_low = 1,
}, {
.name = "hw550-3g:green:wps",
@@ -106,11 +106,11 @@ static struct gpio_button hw550_3g_gpio_buttons[] __initdata = {
.gpio = HW550_3G_GPIO_BUTTON_RESET,
.active_low = 1,
}, {
- .desc = "3g",
+ .desc = "connect",
.type = EV_KEY,
- .code = BTN_1,
+ .code = KEY_CONNECT,
.threshold = 3,
- .gpio = HW550_3G_GPIO_BUTTON_3G,
+ .gpio = HW550_3G_GPIO_BUTTON_CONNECT,
.active_low = 1,
}, {
.desc = "wps",