aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-08-29 10:11:55 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-08-29 10:11:55 +0000
commit5fdbb33db4080baa66eec736647c9028cb215750 (patch)
treec766290320b43b5388161666265e24ed993fbadd /target
parent803b98f7a3c20f307b91f22a9cfa5ef37bee7150 (diff)
downloadupstream-5fdbb33db4080baa66eec736647c9028cb215750.tar.gz
upstream-5fdbb33db4080baa66eec736647c9028cb215750.tar.bz2
upstream-5fdbb33db4080baa66eec736647c9028cb215750.zip
ar71xx: Buffalo WZR-HP-AG300H LED support
An improved LED support for Buffalo WZR-HP-AG300H. There will be two new packages to go with this patch (ar922x-led-fix-hotplug and ar922x-led-fix-init). These packages essentially perform the same task of disabling "JTAG over GPIO pins" function which is currently required for LEDs on AR922x emac GPIO to work, and are both considered a temporary fix that circumvent this problem. [juhosg: add the hotplug script from the proposed ar922x-led-fix-hotplug package to ar71xx/base-files] Signed-off-by: Yoichi Shinoda <shinoda@jaist.ac.jp> SVN-Revision: 33294
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/diag.sh1
-rw-r--r--target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix51
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/uci-defaults/leds6
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c56
4 files changed, 114 insertions, 0 deletions
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 6759cf0437..420d690245 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -150,6 +150,7 @@ get_status_led() {
wlae-ag300n)
status_led="buffalo:green:status"
;;
+ wzr-hp-ag300h | \
wzr-hp-g300nh2)
status_led="buffalo:red:diag"
;;
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix b/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
new file mode 100644
index 0000000000..102415009b
--- /dev/null
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# For AR9220 and AR9223, GPIO JTAG must explicit be disabled
+# before LEDs start working. Do this when wifi device is
+# detected.
+
+#
+# $DEVPATH is not valid for some boards (including WZR-HP-AG300H).
+# Manipulate the $DEVPATH to reach the corresponding phyN.
+#
+
+devdir=`dirname $DEVPATH`
+devdir=`dirname $devdir`
+phydir=/sys$devdir/ieee80211
+phyname=`cat $phydir/phy*/name`
+
+if [ -z $phyname -o $ACTION != "add" ]; then exit 0; fi
+
+#
+# ar922x_disable_gpio_jtag():
+#
+# Emulate
+# REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
+# for AR9220 and AR9223.
+#
+
+ar922x_disable_gpio_jtag()
+{
+ local regidx=0x4054
+
+ [ -f /sys/kernel/debug/ieee80211/$1/ath9k/regidx ] && {
+ echo $regidx > /sys/kernel/debug/ieee80211/$1/ath9k/regidx
+ regval=`cat /sys/kernel/debug/ieee80211/$1/ath9k/regval`
+ regval=$((regval | 0x20000))
+ echo regval $regval
+ echo $regval > /sys/kernel/debug/ieee80211/$1/ath9k/regval
+ }
+}
+
+if [ $phyname -a $ACTION = "add" ]; then
+
+ . /lib/ar71xx.sh
+
+ case $(ar71xx_board_name) in
+ wzr-hp-ag300h)
+ ar922x_disable_gpio_jtag $phyname
+ ;;
+ esac;
+fi
+
+exit 0
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/leds b/target/linux/ar71xx/base-files/etc/uci-defaults/leds
index 5e2548e520..0082ffe898 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/leds
@@ -165,6 +165,12 @@ wlae-ag300n)
ucidef_set_led_netdev "wireless" "WIRELESS" "buffalo:green:wireless" "wlan0"
;;
+wzr-hp-ag300h)
+ ucidef_set_led_default "diag" "DIAG" "buffalo:red:diag" "0"
+ ucidef_set_led_netdev "router" "ROUTER" "buffalo:green:router" "eth1"
+ ucidef_set_led_usbdev "usb" "USB" "buffalo:green:usb" "1-1"
+ ;;
+
wzr-hp-g300nh)
ucidef_set_led_wlan "wlan" "Wireless" "buffalo:green:wireless" "phy0tpt"
ucidef_set_led_netdev "router" "Router" "buffalo:green:router" "eth1"
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
index 5941d5ca92..868514c959 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
@@ -75,6 +75,47 @@ static struct gpio_led wzrhpag300h_leds_gpio[] __initdata = {
},
};
+static struct gpio_led wzrhpag300h_wmac0_leds_gpio[] = {
+ {
+ .name = "buffalo:amber:band2g",
+ .gpio = 1,
+ .active_low = 1,
+ },
+ {
+ .name = "buffalo:green:usb",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
+ .name = "buffalo:green:band2g",
+ .gpio = 5,
+ .active_low = 1,
+ },
+};
+
+static struct gpio_led wzrhpag300h_wmac1_leds_gpio[] = {
+ {
+ .name = "buffalo:green:band5g",
+ .gpio = 1,
+ .active_low = 1,
+ },
+ {
+ .name = "buffalo:green:router",
+ .gpio = 3,
+ .active_low = 1,
+ },
+ {
+ .name = "buffalo:blue:movie_engine",
+ .gpio = 4,
+ .active_low = 1,
+ },
+ {
+ .name = "buffalo:amber:band5g",
+ .gpio = 5,
+ .active_low = 1,
+ },
+};
+
static struct gpio_keys_button wzrhpag300h_gpio_keys[] __initdata = {
{
.desc = "reset",
@@ -111,6 +152,13 @@ static struct gpio_keys_button wzrhpag300h_gpio_keys[] __initdata = {
.debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
.gpio = 7,
.active_low = 1,
+ }, {
+ .desc = "movie_engine",
+ .type = EV_KEY,
+ .code = BTN_7,
+ .debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = 8,
+ .active_low = 1,
}
};
@@ -150,6 +198,14 @@ static void __init wzrhpag300h_setup(void)
ath79_register_m25p80_multi(&wzrhpag300h_flash_data);
ap94_pci_init(eeprom1, mac1, eeprom2, mac2);
+
+ ap9x_pci_setup_wmac_led_pin(0, 1);
+ ap9x_pci_setup_wmac_led_pin(1, 5);
+
+ ap9x_pci_setup_wmac_leds(0, wzrhpag300h_wmac0_leds_gpio,
+ ARRAY_SIZE(wzrhpag300h_wmac0_leds_gpio));
+ ap9x_pci_setup_wmac_leds(1, wzrhpag300h_wmac1_leds_gpio,
+ ARRAY_SIZE(wzrhpag300h_wmac1_leds_gpio));
}
MIPS_MACHINE(ATH79_MACH_WZR_HP_AG300H, "WZR-HP-AG300H",