[source] treewide: fix button keys codes used in dts
LEDE Commits
lede-commits at lists.infradead.org
Sun Nov 27 06:39:06 PST 2016
mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/18c64f41c7d84824a81bdcd730e1796d316355d1
commit 18c64f41c7d84824a81bdcd730e1796d316355d1
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Sun Nov 27 09:47:51 2016 +0100
treewide: fix button keys codes used in dts
Use keycodes that matches the intended use case based on the label.
Signed-off-by: Mathias Kresin <dev at kresin.me>
---
target/linux/lantiq/dts/ARV452CQW.dts | 2 +-
target/linux/lantiq/dts/ARV7510PW22.dts | 2 +-
target/linux/lantiq/dts/ARV752DPW.dts | 4 ++--
target/linux/lantiq/dts/ARV752DPW22.dts | 4 ++--
target/linux/lantiq/dts/ARV8539PW22.dts | 1 +
target/linux/lantiq/dts/BTHOMEHUBV2B.dts | 2 +-
target/linux/lantiq/dts/BTHOMEHUBV3A.dts | 2 +-
target/linux/lantiq/dts/EASY80920.dtsi | 2 +-
target/linux/lantiq/dts/FRITZ3370.dts | 2 +-
target/linux/lantiq/dts/FRITZ7320.dts | 2 +-
target/linux/lantiq/dts/FRITZ7360SL.dts | 6 +++---
target/linux/lantiq/dts/VGV7519.dtsi | 2 +-
target/linux/lantiq/dts/VR200v.dts | 2 +-
target/linux/lantiq/dts/WBMR.dts | 4 ++--
target/linux/lantiq/dts/WBMR300.dts | 2 +-
target/linux/ramips/dts/AWM002-EVB-4M.dts | 2 +-
target/linux/ramips/dts/AWM002-EVB-8M.dts | 2 +-
target/linux/ramips/dts/AWM003-EVB.dts | 2 +-
target/linux/ramips/dts/UR-326N4G.dts | 2 +-
target/linux/ramips/dts/UR-336UN.dts | 2 +-
target/linux/ramips/dts/WR512-3GN-4M.dts | 2 +-
target/linux/ramips/dts/WR512-3GN-8M.dts | 2 +-
22 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/dts/ARV452CQW.dts
index 7d0f981..21c5604 100644
--- a/target/linux/lantiq/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/dts/ARV452CQW.dts
@@ -156,7 +156,7 @@
wps {
label = "wps";
gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_1>;
+ linux,code = <KEY_WPS_BUTTON>;
};
reset {
label = "reset";
diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts b/target/linux/lantiq/dts/ARV7510PW22.dts
index 3c2b0a7..47ab55e 100644
--- a/target/linux/lantiq/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/dts/ARV7510PW22.dts
@@ -139,7 +139,7 @@
restart {
label = "restart";
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_0>;
+ linux,code = <KEY_POWER>;
};
reset {
label = "reset";
diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/dts/ARV752DPW.dts
index d324e6e..0fa5684 100644
--- a/target/linux/lantiq/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/dts/ARV752DPW.dts
@@ -153,12 +153,12 @@
restart {
label = "restart";
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_0>;
+ linux,code = <KEY_POWER>;
};
dsl {
label = "dsl";
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_1>;
+ linux,code = <BTN_0>;
};
reset {
label = "reset";
diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/dts/ARV752DPW22.dts
index 2a37a3a..c409fcb 100644
--- a/target/linux/lantiq/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/dts/ARV752DPW22.dts
@@ -152,12 +152,12 @@
restart {
label = "restart";
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_LEFT>;
+ linux,code = <KEY_POWER>;
};
dsl {
label = "dsl";
gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_RIGHT>;
+ linux,code = <BTN_0>;
};
reset {
label = "reset";
diff --git a/target/linux/lantiq/dts/ARV8539PW22.dts b/target/linux/lantiq/dts/ARV8539PW22.dts
index e00bd14..7365cbe 100644
--- a/target/linux/lantiq/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/dts/ARV8539PW22.dts
@@ -139,6 +139,7 @@
gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};
+ /* key DECT is missing */
};
gpio-leds {
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
index d707a75..28bda1a 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
@@ -198,7 +198,7 @@
findhandset {
label = "findhandset";
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_1>;
+ linux,code = <KEY_PHONE>;
};
wps {
label = "wps";
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
index c290c70..55b47ec 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
@@ -154,7 +154,7 @@
restart {
label = "restart";
gpios = <&gpio 52 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
+ linux,code = <KEY_POWER>;
};
wps {
label = "wps";
diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index 5ce8917..051db9a 100644
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -122,7 +122,7 @@
paging {
label = "paging";
gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_0>;
+ linux,code = <KEY_PHONE>;
};
};
diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index e12c7bf..2580674 100644
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -139,7 +139,7 @@
power {
label = "power";
gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
- linux,code = <BTN_0>;
+ linux,code = <KEY_POWER>;
};
/* wifi {
label = "wifi";
diff --git a/target/linux/lantiq/dts/FRITZ7320.dts b/target/linux/lantiq/dts/FRITZ7320.dts
index f14cac2..4cc4915 100644
--- a/target/linux/lantiq/dts/FRITZ7320.dts
+++ b/target/linux/lantiq/dts/FRITZ7320.dts
@@ -125,7 +125,7 @@
dect {
label = "dect";
gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_2>;
+ linux,code = <KEY_PHONE>;
};
};
diff --git a/target/linux/lantiq/dts/FRITZ7360SL.dts b/target/linux/lantiq/dts/FRITZ7360SL.dts
index 796458a..2a90a7f 100644
--- a/target/linux/lantiq/dts/FRITZ7360SL.dts
+++ b/target/linux/lantiq/dts/FRITZ7360SL.dts
@@ -116,14 +116,14 @@
#size-cells = <0>;
poll-interval = <100>;
dect {
- label = "power";
+ label = "dect";
gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
- linux,code = <BTN_2>;
+ linux,code = <KEY_PHONE>;
};
wifi {
label = "wifi";
gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
- linux,code = <BTN_1>;
+ linux,code = <KEY_WLAN>;
};
};
diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi
index 88daae7..b835967 100644
--- a/target/linux/lantiq/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/dts/VGV7519.dtsi
@@ -138,7 +138,7 @@
eco {
label = "eco";
gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RFKILL>;
+ linux,code = <BTN_0>;
};
rfkill {
label = "rfkill";
diff --git a/target/linux/lantiq/dts/VR200v.dts b/target/linux/lantiq/dts/VR200v.dts
index f814d24..42a3643 100644
--- a/target/linux/lantiq/dts/VR200v.dts
+++ b/target/linux/lantiq/dts/VR200v.dts
@@ -113,7 +113,7 @@
dect_paging {
label = "dect_paging";
gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_WPS_BUTTON>;
+ linux,code = <KEY_PHONE>;
};
};
diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/dts/WBMR.dts
index 3dbc641..7ae0cb7 100644
--- a/target/linux/lantiq/dts/WBMR.dts
+++ b/target/linux/lantiq/dts/WBMR.dts
@@ -130,12 +130,12 @@
eject {
label = "eject";
gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RFKILL>;
+ linux,code = <KEY_EJECTCD>;
};
movie {
label = "movie";
gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_9>;
+ linux,code = <KEY_VIDEO>;
};
};
diff --git a/target/linux/lantiq/dts/WBMR300.dts b/target/linux/lantiq/dts/WBMR300.dts
index 54bb98e..3058152 100644
--- a/target/linux/lantiq/dts/WBMR300.dts
+++ b/target/linux/lantiq/dts/WBMR300.dts
@@ -118,7 +118,7 @@
router {
label = "router";
gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
- linux,code = <BTN_0>;
+ linux,code = <BTN_1>;
linux,input-type = <EV_SW>;
};
};
diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB-4M.dts
index f647a96..101ea54 100644
--- a/target/linux/ramips/dts/AWM002-EVB-4M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts
@@ -41,7 +41,7 @@
mode {
label = "mode";
gpios = <&gpio0 20 1>;
- linux,code = <ABS_MT_WIDTH_MAJOR>;
+ linux,code = <BTN_0>;
};
};
};
diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/AWM002-EVB-8M.dts
index 3c34c4a..c9f1105 100644
--- a/target/linux/ramips/dts/AWM002-EVB-8M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts
@@ -41,7 +41,7 @@
mode {
label = "mode";
gpios = <&gpio0 20 1>;
- linux,code = <ABS_MT_WIDTH_MAJOR>;
+ linux,code = <BTN_0>;
};
};
};
diff --git a/target/linux/ramips/dts/AWM003-EVB.dts b/target/linux/ramips/dts/AWM003-EVB.dts
index 9f8c2d2..b42d77e 100644
--- a/target/linux/ramips/dts/AWM003-EVB.dts
+++ b/target/linux/ramips/dts/AWM003-EVB.dts
@@ -47,7 +47,7 @@
mode {
label = "mode";
gpios = <&gpio0 20 1>;
- linux,code = <ABS_MT_WIDTH_MAJOR>;
+ linux,code = <BTN_0>;
};
};
};
diff --git a/target/linux/ramips/dts/UR-326N4G.dts b/target/linux/ramips/dts/UR-326N4G.dts
index 6ca1aa9..4246fa4 100644
--- a/target/linux/ramips/dts/UR-326N4G.dts
+++ b/target/linux/ramips/dts/UR-326N4G.dts
@@ -84,7 +84,7 @@
mode {
label = "mode";
gpios = <&gpio0 7 1>;
- linux,code = <ABS_MT_WIDTH_MAJOR>;
+ linux,code = <BTN_0>;
};
};
};
diff --git a/target/linux/ramips/dts/UR-336UN.dts b/target/linux/ramips/dts/UR-336UN.dts
index fa75304..67def7c 100644
--- a/target/linux/ramips/dts/UR-336UN.dts
+++ b/target/linux/ramips/dts/UR-336UN.dts
@@ -61,7 +61,7 @@
mode {
label = "mode";
gpios = <&gpio0 7 1>;
- linux,code = <ABS_MT_WIDTH_MAJOR>;
+ linux,code = <BTN_0>;
};
};
};
diff --git a/target/linux/ramips/dts/WR512-3GN-4M.dts b/target/linux/ramips/dts/WR512-3GN-4M.dts
index 09e4480..a9aa676 100644
--- a/target/linux/ramips/dts/WR512-3GN-4M.dts
+++ b/target/linux/ramips/dts/WR512-3GN-4M.dts
@@ -84,7 +84,7 @@
mode {
label = "mode";
gpios = <&gpio0 7 1>;
- linux,code = <ABS_MT_WIDTH_MAJOR>;
+ linux,code = <BTN_0>;
};
};
};
diff --git a/target/linux/ramips/dts/WR512-3GN-8M.dts b/target/linux/ramips/dts/WR512-3GN-8M.dts
index 03583f9..0ddc48f 100644
--- a/target/linux/ramips/dts/WR512-3GN-8M.dts
+++ b/target/linux/ramips/dts/WR512-3GN-8M.dts
@@ -84,7 +84,7 @@
mode {
label = "mode";
gpios = <&gpio0 7 1>;
- linux,code = <ABS_MT_WIDTH_MAJOR>;
+ linux,code = <BTN_0>;
};
};
};
More information about the lede-commits
mailing list