1 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts
index ab0212b0e6f5..a5e779452867 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310a.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts
@@ -107,18 +107,18 @@
                button@1 {
                        label = "Power Button";
-                        linux,code = <116>;
+                        linux,code = <KEY_POWER>;
-                        gpios = <&gpio1 14 0>;
+                        gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
                };
                button@2 {
                        label = "Copy Button";
-                        linux,code = <133>;
+                        linux,code = <KEY_COPY>;
-                        gpios = <&gpio1 5 1>;
+                        gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
                };
                button@3 {
                        label = "Reset Button";
-                        linux,code = <0x198>;
+                        linux,code = <KEY_RESTART>;
-                        gpios = <&gpio1 4 1>;
+                        gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
                };
        };
@@ -127,39 +127,39 @@
                green-sys {
                        label = "nsa310:green:sys";
-                        gpios = <&gpio0 28 0>;
+                        gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
                };
                red-sys {
                        label = "nsa310:red:sys";
-                        gpios = <&gpio0 29 0>;
+                        gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
                };
                green-hdd {
                        label = "nsa310:green:hdd";
-                        gpios = <&gpio1 9 0>;
+                        gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
                };
                red-hdd {
                        label = "nsa310:red:hdd";
-                        gpios = <&gpio1 10 0>;
+                        gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
                };
                green-esata {
                        label = "nsa310:green:esata";
-                        gpios = <&gpio0 12 0>;
+                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };
                red-esata {
                        label = "nsa310:red:esata";
-                        gpios = <&gpio0 13 0>;
+                        gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
                };
                green-usb {
                        label = "nsa310:green:usb";
-                        gpios = <&gpio0 15 0>;
+                        gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
                };
                green-copy {
                        label = "nsa310:green:copy";
-                        gpios = <&gpio1 7 0>;
+                        gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
                };
                red-copy {
                        label = "nsa310:red:copy";
-                        gpios = <&gpio1 8 0>;
+                        gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
                };
        };
 };

diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts index ab0212b0e6f5..a5e779452867 100644 --- a/arch/arm/boot/dts/kirkwood-nsa310a.dts +++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts
@@ -107,18 +107,18 @@
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 GPIO_ACTIVE_HIGH>;
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 GPIO_ACTIVE_LOW>;
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 GPIO_ACTIVE_LOW>;
122	};	122	};
123	};	123	};
124		124
@@ -127,39 +127,39 @@
127		127
128	green-sys {	128	green-sys {
129	label = "nsa310:green:sys";	129	label = "nsa310:green:sys";
130	gpios = <&gpio0 28 0>;	130	gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
131	};	131	};
132	red-sys {	132	red-sys {
133	label = "nsa310:red:sys";	133	label = "nsa310:red:sys";
134	gpios = <&gpio0 29 0>;	134	gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
135	};	135	};
136	green-hdd {	136	green-hdd {
137	label = "nsa310:green:hdd";	137	label = "nsa310:green:hdd";
138	gpios = <&gpio1 9 0>;	138	gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
139	};	139	};
140	red-hdd {	140	red-hdd {
141	label = "nsa310:red:hdd";	141	label = "nsa310:red:hdd";
142	gpios = <&gpio1 10 0>;	142	gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
143	};	143	};
144	green-esata {	144	green-esata {
145	label = "nsa310:green:esata";	145	label = "nsa310:green:esata";
146	gpios = <&gpio0 12 0>;	146	gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
147	};	147	};
148	red-esata {	148	red-esata {
149	label = "nsa310:red:esata";	149	label = "nsa310:red:esata";
150	gpios = <&gpio0 13 0>;	150	gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
151	};	151	};
152	green-usb {	152	green-usb {
153	label = "nsa310:green:usb";	153	label = "nsa310:green:usb";
154	gpios = <&gpio0 15 0>;	154	gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
155	};	155	};
156	green-copy {	156	green-copy {
157	label = "nsa310:green:copy";	157	label = "nsa310:green:copy";
158	gpios = <&gpio1 7 0>;	158	gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
159	};	159	};
160	red-copy {	160	red-copy {
161	label = "nsa310:red:copy";	161	label = "nsa310:red:copy";
162	gpios = <&gpio1 8 0>;	162	gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
163	};	163	};
164	};	164	};
165	};	165	};