leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: dts: rockchip: clean up gpio-keys nodes

Browse Source 
Drop superfluous #address-cells and #size-cells, rename
key-nodes to individual names and also use the key constants
intead of numbers.

Reported-by: Julien Chauveau <chauveau.julien@gmail.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Heiko Stuebner
2016-03-31 20:24:29 +02:00
parent a8f0fa2764
commit 8b30c899c7
7 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/boot/dts/rk3066a-bqcurie2.dts
View File

@@ -42,6 +42,7 @@
*/ */
/dts-v1/; /dts-v1/;
#include <dt-bindings/input/input.h>
#include "rk3066a.dtsi" #include "rk3066a.dtsi"
/ { / {
@@ -77,21 +78,19 @@
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
autorepeat; autorepeat;
button@0 { power {
gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */ gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; /* GPIO6_A2 */
linux,code = <116>; linux,code = <KEY_POWER>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
wakeup-source; wakeup-source;
debounce-interval = <100>; debounce-interval = <100>;
}; };
button@1 { volume-down {
gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */ gpios = <&gpio4 21 GPIO_ACTIVE_LOW>; /* GPIO4_C5 */
linux,code = <104>; linux,code = <KEY_VOLUMEDOWN>;
label = "GPIO Key Vol-"; label = "GPIO Key Vol-";
linux,input-type = <1>; linux,input-type = <1>;
debounce-interval = <100>; debounce-interval = <100>;

7
arch/arm/boot/dts/rk3066a-rayeager.dts
View File

@@ -41,6 +41,7 @@
*/ */
/dts-v1/; /dts-v1/;
#include <dt-bindings/input/input.h>
#include "rk3066a.dtsi" #include "rk3066a.dtsi"
/ { / {
@@ -61,14 +62,12 @@
keys: gpio-keys { keys: gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button@0 { power {
wakeup-source; wakeup-source;
gpios = <&gpio6 2 GPIO_ACTIVE_LOW>; gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
label = "GPIO Power"; label = "GPIO Power";
linux,code = <116>; linux,code = <KEY_POWER>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwr_key>; pinctrl-0 = <&pwr_key>;
}; };

7
arch/arm/boot/dts/rk3188-radxarock.dts
View File

@@ -41,6 +41,7 @@
*/ */
/dts-v1/; /dts-v1/;
#include <dt-bindings/input/input.h>
#include "rk3188.dtsi" #include "rk3188.dtsi"
/ { / {
@@ -54,13 +55,11 @@
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
autorepeat; autorepeat;
button@0 { power {
gpios = <&gpio0 4 GPIO_ACTIVE_LOW>; gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
linux,code = <116>; linux,code = <KEY_POWER>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
wakeup-source; wakeup-source;

7
arch/arm/boot/dts/rk3288-evb.dtsi
View File

@@ -38,6 +38,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <dt-bindings/input/input.h>
#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/pwm/pwm.h>
#include "rk3288.dtsi" #include "rk3288.dtsi"
@@ -98,16 +99,14 @@
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
autorepeat; autorepeat;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwrbtn>; pinctrl-0 = <&pwrbtn>;
button@0 { power {
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
linux,code = <116>; linux,code = <KEY_POWER>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
wakeup-source; wakeup-source;

7
arch/arm/boot/dts/rk3288-firefly.dtsi
View File

@@ -40,6 +40,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
#include <dt-bindings/input/input.h>
#include "rk3288.dtsi" #include "rk3288.dtsi"
/ { / {
@@ -87,14 +88,12 @@
keys: gpio-keys { keys: gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button@0 { power {
wakeup-source; wakeup-source;
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
label = "GPIO Power"; label = "GPIO Power";
linux,code = <116>; linux,code = <KEY_POWER>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwr_key>; pinctrl-0 = <&pwr_key>;
}; };

8
arch/arm/boot/dts/rk3288-popmetal.dts
View File

@@ -41,7 +41,7 @@
*/ */
/dts-v1/; /dts-v1/;
#include <dt-bindings/input/input.h>
#include "rk3288.dtsi" #include "rk3288.dtsi"
/ { / {
@@ -62,16 +62,14 @@
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
autorepeat; autorepeat;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwrbtn>; pinctrl-0 = <&pwrbtn>;
button@0 { power {
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
linux,code = <116>; linux,code = <KEY_POWER>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
wakeup-source; wakeup-source;

7
arch/arm/boot/dts/rk3288-r89.dts
View File

@@ -41,6 +41,7 @@
*/ */
/dts-v1/; /dts-v1/;
#include <dt-bindings/input/input.h>
#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/pwm/pwm.h>
#include "rk3288.dtsi" #include "rk3288.dtsi"
@@ -61,16 +62,14 @@
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
autorepeat; autorepeat;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwrbtn>; pinctrl-0 = <&pwrbtn>;
button@0 { power {
gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
linux,code = <116>; linux,code = <KEY_POWER>;
label = "GPIO Key Power"; label = "GPIO Key Power";
linux,input-type = <1>; linux,input-type = <1>;
wakeup-source; wakeup-source;