aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-02-28 19:59:50 +0000
committerJonas Gorski <jogo@openwrt.org>2015-02-28 19:59:50 +0000
commitdd618e499f395a9aa5aa532cdac5402563971501 (patch)
treee4a8d551f660a353a8207d883f05ff2a3caabbba
parent40e6eae61fe4412ac14c19f0f4b5fbf6b84c841e (diff)
downloadupstream-dd618e499f395a9aa5aa532cdac5402563971501.tar.gz
upstream-dd618e499f395a9aa5aa532cdac5402563971501.tar.bz2
upstream-dd618e499f395a9aa5aa532cdac5402563971501.zip
brcm63xx: fix DTS LEDs and buttons
- A4001N/A4001N1: fix swapped green and red LEDs - CVG834G: add missing LED - RTA1320: reorder LEDs by GPIO# - V2500V: add missing LEDs and buttons - WAP-5813n: fix WPS button (GPIO 35) Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 44577
-rw-r--r--target/linux/brcm63xx/dts/a4001n.dts10
-rw-r--r--target/linux/brcm63xx/dts/a4001n1.dts10
-rw-r--r--target/linux/brcm63xx/dts/cvg834g.dts10
-rw-r--r--target/linux/brcm63xx/dts/rta1320.dts17
-rw-r--r--target/linux/brcm63xx/dts/v2500v-bb.dts39
-rw-r--r--target/linux/brcm63xx/dts/wap-5813n.dts2
6 files changed, 68 insertions, 20 deletions
diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/a4001n.dts
index 1f8eaf66e9..cb172bba84 100644
--- a/target/linux/brcm63xx/dts/a4001n.dts
+++ b/target/linux/brcm63xx/dts/a4001n.dts
@@ -32,15 +32,15 @@
label = "A4001N:red:inet";
gpios = <&gpio0 1 0>;
};
- power_red {
- label = "A4001N:red:power";
- gpios = <&gpio0 4 0>;
- };
power_green {
label = "A4001N:green:power";
- gpios = <&gpio0 8 0>;
+ gpios = <&gpio0 4 0>;
default-state = "on";
};
+ power_red {
+ label = "A4001N:red:power";
+ gpios = <&gpio0 8 0>;
+ };
usb_green {
label = "A4001N:green:usb";
gpios = <&gpio0 10 1>;
diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/a4001n1.dts
index d45210f56d..17bd64321b 100644
--- a/target/linux/brcm63xx/dts/a4001n1.dts
+++ b/target/linux/brcm63xx/dts/a4001n1.dts
@@ -36,9 +36,10 @@
label = "A4001N1:green:ppp";
gpios = <&gpio0 3 1>;
};
- power_red {
- label = "A4001N1:red:power";
+ power_green {
+ label = "A4001N1:green:power";
gpios = <&gpio0 4 1>;
+ default-state = "on";
};
ppp_red {
label = "A4001N1:red:ppp";
@@ -52,10 +53,9 @@
label = "A4001N1:red:3g";
gpios = <&gpio0 7 1>;
};
- power_green {
- label = "A4001N1:green:power";
+ power_red {
+ label = "A4001N1:red:power";
gpios = <&gpio0 8 1>;
- default-state = "on";
};
wlan_green {
label = "A4001N1:green:wlan";
diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/brcm63xx/dts/cvg834g.dts
index 84810033bf..d75316b38b 100644
--- a/target/linux/brcm63xx/dts/cvg834g.dts
+++ b/target/linux/brcm63xx/dts/cvg834g.dts
@@ -5,6 +5,16 @@
/ {
model = "Netgear CVG834G";
compatible = "netgear,cvg834g", "brcm,bcm6348";
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ power_green {
+ label = "CVG834G:green:power";
+ gpios = <&gpio1 5 0>;
+ default-state = "on";
+ };
+ };
};
&pflash {
diff --git a/target/linux/brcm63xx/dts/rta1320.dts b/target/linux/brcm63xx/dts/rta1320.dts
index aa98da111b..30c1f14052 100644
--- a/target/linux/brcm63xx/dts/rta1320.dts
+++ b/target/linux/brcm63xx/dts/rta1320.dts
@@ -9,24 +9,23 @@
gpio-leds {
compatible = "gpio-leds";
- green_adsl {
- label = "RTA1320_16M:green:adsl";
- gpios = <&gpio0 3 1>;
- };
- green_ppp {
- label = "RTA1320_16M:green:ppp";
- gpios = <&gpio0 4 1>;
- };
green_power {
label = "RTA1320_16M:green:power";
gpios = <&gpio0 0 1>;
default-state = "on";
};
-
green_stop {
label = "RTA1320_16M:green:stop";
gpios = <&gpio0 1 1>;
};
+ green_adsl {
+ label = "RTA1320_16M:green:adsl";
+ gpios = <&gpio0 3 1>;
+ };
+ green_ppp {
+ label = "RTA1320_16M:green:ppp";
+ gpios = <&gpio0 4 1>;
+ };
};
};
diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/brcm63xx/dts/v2500v-bb.dts
index 3959ffb3ed..5f06c6361f 100644
--- a/target/linux/brcm63xx/dts/v2500v-bb.dts
+++ b/target/linux/brcm63xx/dts/v2500v-bb.dts
@@ -5,6 +5,45 @@
/ {
model = "BT Voyager V2500V";
compatible = "bt,v2500v-bb", "brcm,bcm6348";
+
+ gpio-keys-polled {
+ compatible = "gpio-keys-polled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <20>;
+ debounce-interval = <60>;
+
+ reset {
+ label = "reset";
+ gpios = <&gpio0 31 1>;
+ linux,code = <0x198>;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ power_green {
+ label = "V2500V_BB:green:power";
+ gpios = <&gpio0 0 1>;
+ };
+ power_red {
+ label = "V2500V_BB:red:power";
+ gpios = <&gpio0 1 1>;
+ };
+ adsl_green {
+ label = "V2500V_BB:green:adsl";
+ gpios = <&gpio0 2 1>;
+ };
+ ppp_green {
+ label = "V2500V_BB:green:ppp";
+ gpios = <&gpio0 3 1>;
+ };
+ wireless_green {
+ label = "V2500V_BB:green:wireless";
+ gpios = <&gpio0 6 1>;
+ };
+ };
};
&pflash {
diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/wap-5813n.dts
index 0d168d2338..f7765d59cb 100644
--- a/target/linux/brcm63xx/dts/wap-5813n.dts
+++ b/target/linux/brcm63xx/dts/wap-5813n.dts
@@ -25,7 +25,7 @@
};
wps {
label = "wps";
- gpios = <&gpio1 1 1>;
+ gpios = <&gpio1 3 1>;
linux,code = <0x211>;
};
};