diff options
-rw-r--r-- | arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-iconnect.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-lsxl.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa310.dts | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-nsa310a.dts | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-ts219-6281.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood-ts219-6282.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 1 |
17 files changed, 30 insertions, 31 deletions
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts index 142b9cd3b454..17123f25e2db 100644 --- a/arch/arm/boot/dts/kirkwood-cloudbox.dts +++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts | |||
@@ -66,7 +66,7 @@ | |||
66 | 66 | ||
67 | button@1 { | 67 | button@1 { |
68 | label = "Power push button"; | 68 | label = "Power push button"; |
69 | linux,code = <116>; | 69 | linux,code = <KEY_POWER>; |
70 | gpios = <&gpio0 16 1>; | 70 | gpios = <&gpio0 16 1>; |
71 | }; | 71 | }; |
72 | }; | 72 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi index aefa375a550d..1d680d11f629 100644 --- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi | |||
@@ -15,17 +15,17 @@ | |||
15 | 15 | ||
16 | button@1 { | 16 | button@1 { |
17 | label = "Power button"; | 17 | label = "Power button"; |
18 | linux,code = <116>; | 18 | linux,code = <KEY_POWER>; |
19 | gpios = <&gpio1 2 1>; | 19 | gpios = <&gpio1 2 1>; |
20 | }; | 20 | }; |
21 | button@2 { | 21 | button@2 { |
22 | label = "USB unmount button"; | 22 | label = "USB unmount button"; |
23 | linux,code = <161>; | 23 | linux,code = <KEY_EJECTCD>; |
24 | gpios = <&gpio1 15 1>; | 24 | gpios = <&gpio1 15 1>; |
25 | }; | 25 | }; |
26 | button@3 { | 26 | button@3 { |
27 | label = "Reset button"; | 27 | label = "Reset button"; |
28 | linux,code = <0x198>; | 28 | linux,code = <KEY_RESTART>; |
29 | gpios = <&gpio1 16 1>; | 29 | gpios = <&gpio1 16 1>; |
30 | }; | 30 | }; |
31 | }; | 31 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index dbc90330c873..c376b756cbf2 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts | |||
@@ -63,12 +63,12 @@ | |||
63 | 63 | ||
64 | button@1 { | 64 | button@1 { |
65 | label = "USB Copy"; | 65 | label = "USB Copy"; |
66 | linux,code = <133>; | 66 | linux,code = <KEY_COPY>; |
67 | gpios = <&gpio0 29 1>; | 67 | gpios = <&gpio0 29 1>; |
68 | }; | 68 | }; |
69 | button@2 { | 69 | button@2 { |
70 | label = "Reset"; | 70 | label = "Reset"; |
71 | linux,code = <0x198>; | 71 | linux,code = <KEY_RESTART>; |
72 | gpios = <&gpio0 28 1>; | 72 | gpios = <&gpio0 28 1>; |
73 | }; | 73 | }; |
74 | }; | 74 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts index 399fb0caf5ab..52ed7519f647 100644 --- a/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/arch/arm/boot/dts/kirkwood-iconnect.dts | |||
@@ -137,13 +137,13 @@ | |||
137 | 137 | ||
138 | button@1 { | 138 | button@1 { |
139 | label = "OTB Button"; | 139 | label = "OTB Button"; |
140 | linux,code = <133>; | 140 | linux,code = <KEY_COPY>; |
141 | gpios = <&gpio1 3 1>; | 141 | gpios = <&gpio1 3 1>; |
142 | debounce-interval = <100>; | 142 | debounce-interval = <100>; |
143 | }; | 143 | }; |
144 | button@2 { | 144 | button@2 { |
145 | label = "Reset"; | 145 | label = "Reset"; |
146 | linux,code = <0x198>; | 146 | linux,code = <KEY_RESTART>; |
147 | gpios = <&gpio0 12 1>; | 147 | gpios = <&gpio0 12 1>; |
148 | debounce-interval = <100>; | 148 | debounce-interval = <100>; |
149 | }; | 149 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts index b9de441919e2..cdee76904cc4 100644 --- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts +++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | |||
@@ -154,17 +154,17 @@ | |||
154 | 154 | ||
155 | Power { | 155 | Power { |
156 | label = "Power Button"; | 156 | label = "Power Button"; |
157 | linux,code = <116>; | 157 | linux,code = <KEY_POWER>; |
158 | gpios = <&gpio0 14 1>; | 158 | gpios = <&gpio0 14 1>; |
159 | }; | 159 | }; |
160 | Reset { | 160 | Reset { |
161 | label = "Reset Button"; | 161 | label = "Reset Button"; |
162 | linux,code = <0x198>; | 162 | linux,code = <KEY_RESTART>; |
163 | gpios = <&gpio0 12 1>; | 163 | gpios = <&gpio0 12 1>; |
164 | }; | 164 | }; |
165 | OTB { | 165 | OTB { |
166 | label = "OTB Button"; | 166 | label = "OTB Button"; |
167 | linux,code = <133>; | 167 | linux,code = <KEY_COPY>; |
168 | gpios = <&gpio1 3 1>; | 168 | gpios = <&gpio1 3 1>; |
169 | }; | 169 | }; |
170 | }; | 170 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index bc34a609a195..b284474a1cd1 100644 --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi | |||
@@ -108,18 +108,18 @@ | |||
108 | 108 | ||
109 | button@1 { | 109 | button@1 { |
110 | label = "Function Button"; | 110 | label = "Function Button"; |
111 | linux,code = <357>; | 111 | linux,code = <KEY_OPTION>; |
112 | gpios = <&gpio1 9 1>; | 112 | gpios = <&gpio1 9 1>; |
113 | }; | 113 | }; |
114 | button@2 { | 114 | button@2 { |
115 | label = "Power-on Switch"; | 115 | label = "Power-on Switch"; |
116 | linux,code = <0>; | 116 | linux,code = <KEY_RESERVED>; |
117 | linux,input-type = <5>; | 117 | linux,input-type = <5>; |
118 | gpios = <&gpio1 10 1>; | 118 | gpios = <&gpio1 10 1>; |
119 | }; | 119 | }; |
120 | button@3 { | 120 | button@3 { |
121 | label = "Power-auto Switch"; | 121 | label = "Power-auto Switch"; |
122 | linux,code = <1>; | 122 | linux,code = <KEY_ESC>; |
123 | linux,input-type = <5>; | 123 | linux,input-type = <5>; |
124 | gpios = <&gpio1 11 1>; | 124 | gpios = <&gpio1 11 1>; |
125 | }; | 125 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts index 6317e1d088b3..ade432466c85 100644 --- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | |||
@@ -113,12 +113,12 @@ | |||
113 | 113 | ||
114 | button@1 { | 114 | button@1 { |
115 | label = "SWR Button"; | 115 | label = "SWR Button"; |
116 | linux,code = <0x198>; /* KEY_RESTART */ | 116 | linux,code = <KEY_RESTART>; |
117 | gpios = <&gpio1 15 1>; | 117 | gpios = <&gpio1 15 1>; |
118 | }; | 118 | }; |
119 | button@2 { | 119 | button@2 { |
120 | label = "WPS Button"; | 120 | label = "WPS Button"; |
121 | linux,code = <0x211>; /* KEY_WPS_BUTTON */ | 121 | linux,code = <KEY_WPS_BUTTON>; |
122 | gpios = <&gpio1 14 1>; | 122 | gpios = <&gpio1 14 1>; |
123 | }; | 123 | }; |
124 | }; | 124 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts index 3b1a365c9a8e..57e08b3003a1 100644 --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | 13 | ||
14 | #include <dt-bindings/input/input.h> | ||
15 | #include <dt-bindings/gpio/gpio.h> | 14 | #include <dt-bindings/gpio/gpio.h> |
16 | #include "kirkwood.dtsi" | 15 | #include "kirkwood.dtsi" |
17 | #include "kirkwood-6282.dtsi" | 16 | #include "kirkwood-6282.dtsi" |
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts index 72a3883f6a04..3ce9f631b572 100644 --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | |||
@@ -11,7 +11,6 @@ | |||
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | 13 | ||
14 | #include <dt-bindings/input/input.h> | ||
15 | #include <dt-bindings/gpio/gpio.h> | 14 | #include <dt-bindings/gpio/gpio.h> |
16 | #include "kirkwood.dtsi" | 15 | #include "kirkwood.dtsi" |
17 | #include "kirkwood-6282.dtsi" | 16 | #include "kirkwood-6282.dtsi" |
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi index 2fcb82e20828..3101aecdcc0a 100644 --- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi +++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi | |||
@@ -64,7 +64,7 @@ | |||
64 | 64 | ||
65 | button@1 { | 65 | button@1 { |
66 | label = "Power push button"; | 66 | label = "Power push button"; |
67 | linux,code = <116>; | 67 | linux,code = <KEY_POWER>; |
68 | gpios = <&gpio1 0 0>; | 68 | gpios = <&gpio1 0 0>; |
69 | }; | 69 | }; |
70 | }; | 70 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts index b5418bcaecce..c45a26ce8b57 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310.dts | |||
@@ -119,17 +119,17 @@ | |||
119 | 119 | ||
120 | button@1 { | 120 | button@1 { |
121 | label = "Power Button"; | 121 | label = "Power Button"; |
122 | linux,code = <116>; | 122 | linux,code = <KEY_POWER>; |
123 | gpios = <&gpio1 14 0>; | 123 | gpios = <&gpio1 14 0>; |
124 | }; | 124 | }; |
125 | button@2 { | 125 | button@2 { |
126 | label = "Copy Button"; | 126 | label = "Copy Button"; |
127 | linux,code = <133>; | 127 | linux,code = <KEY_COPY>; |
128 | gpios = <&gpio1 5 1>; | 128 | gpios = <&gpio1 5 1>; |
129 | }; | 129 | }; |
130 | button@3 { | 130 | button@3 { |
131 | label = "Reset Button"; | 131 | label = "Reset Button"; |
132 | linux,code = <0x198>; | 132 | linux,code = <KEY_RESTART>; |
133 | gpios = <&gpio1 4 1>; | 133 | gpios = <&gpio1 4 1>; |
134 | }; | 134 | }; |
135 | }; | 135 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts index ab0212b0e6f5..874df7d26c7c 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts | |||
@@ -107,17 +107,17 @@ | |||
107 | 107 | ||
108 | button@1 { | 108 | button@1 { |
109 | label = "Power Button"; | 109 | label = "Power Button"; |
110 | linux,code = <116>; | 110 | linux,code = <KEY_POWER>; |
111 | gpios = <&gpio1 14 0>; | 111 | gpios = <&gpio1 14 0>; |
112 | }; | 112 | }; |
113 | button@2 { | 113 | button@2 { |
114 | label = "Copy Button"; | 114 | label = "Copy Button"; |
115 | linux,code = <133>; | 115 | linux,code = <KEY_COPY>; |
116 | gpios = <&gpio1 5 1>; | 116 | gpios = <&gpio1 5 1>; |
117 | }; | 117 | }; |
118 | button@3 { | 118 | button@3 { |
119 | label = "Reset Button"; | 119 | label = "Reset Button"; |
120 | linux,code = <0x198>; | 120 | linux,code = <KEY_RESTART>; |
121 | gpios = <&gpio1 4 1>; | 121 | gpios = <&gpio1 4 1>; |
122 | }; | 122 | }; |
123 | }; | 123 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts index f0e3d213604c..6c171e067b59 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts | |||
@@ -124,7 +124,7 @@ | |||
124 | 124 | ||
125 | button@1 { | 125 | button@1 { |
126 | label = "Init Button"; | 126 | label = "Init Button"; |
127 | linux,code = <116>; | 127 | linux,code = <KEY_POWER>; |
128 | gpios = <&gpio1 6 0>; | 128 | gpios = <&gpio1 6 0>; |
129 | }; | 129 | }; |
130 | }; | 130 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts index 851fb2a60f20..c97bad46c29c 100644 --- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts +++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts | |||
@@ -149,7 +149,7 @@ | |||
149 | 149 | ||
150 | button@1 { | 150 | button@1 { |
151 | label = "Init Button"; | 151 | label = "Init Button"; |
152 | linux,code = <116>; | 152 | linux,code = <KEY_POWER>; |
153 | gpios = <&gpio1 6 0>; | 153 | gpios = <&gpio1 6 0>; |
154 | }; | 154 | }; |
155 | }; | 155 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts index f755bc1dc604..89f7094117f4 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts | |||
@@ -41,12 +41,12 @@ | |||
41 | 41 | ||
42 | button@1 { | 42 | button@1 { |
43 | label = "USB Copy"; | 43 | label = "USB Copy"; |
44 | linux,code = <133>; | 44 | linux,code = <KEY_COPY>; |
45 | gpios = <&gpio0 15 1>; | 45 | gpios = <&gpio0 15 1>; |
46 | }; | 46 | }; |
47 | button@2 { | 47 | button@2 { |
48 | label = "Reset"; | 48 | label = "Reset"; |
49 | linux,code = <0x198>; | 49 | linux,code = <KEY_RESTART>; |
50 | gpios = <&gpio0 16 1>; | 50 | gpios = <&gpio0 16 1>; |
51 | }; | 51 | }; |
52 | }; | 52 | }; |
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts index 345562f75891..6976afb56605 100644 --- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts +++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts | |||
@@ -51,12 +51,12 @@ | |||
51 | 51 | ||
52 | button@1 { | 52 | button@1 { |
53 | label = "USB Copy"; | 53 | label = "USB Copy"; |
54 | linux,code = <133>; | 54 | linux,code = <KEY_COPY>; |
55 | gpios = <&gpio1 11 1>; | 55 | gpios = <&gpio1 11 1>; |
56 | }; | 56 | }; |
57 | button@2 { | 57 | button@2 { |
58 | label = "Reset"; | 58 | label = "Reset"; |
59 | linux,code = <0x198>; | 59 | linux,code = <KEY_RESTART>; |
60 | gpios = <&gpio1 5 1>; | 60 | gpios = <&gpio1 5 1>; |
61 | }; | 61 | }; |
62 | }; | 62 | }; |
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi index 8b73c80f1dad..477c0b5553e8 100644 --- a/arch/arm/boot/dts/kirkwood.dtsi +++ b/arch/arm/boot/dts/kirkwood.dtsi | |||
@@ -1,4 +1,5 @@ | |||
1 | /include/ "skeleton.dtsi" | 1 | /include/ "skeleton.dtsi" |
2 | #include <dt-bindings/input/input.h> | ||
2 | 3 | ||
3 | #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16)) | 4 | #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16)) |
4 | 5 | ||