Skip to content

Commit 8586086

Browse files
krzkgclement
authored andcommitted
ARM: dts: marvell: orion: align GPIO keys node name with bindings
Bindings expect the GPIO key node names to follow certain pattern, see dtbs_check warnings: orion5x-lacie-d2-network.dtb: gpio-keys: 'front_button', 'power_rocker_sw_off', 'power_rocker_sw_on' do not match any of the regexes: '^(button|event|key|switch| ... Signed-off-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Gregory CLEMENT <[email protected]>
1 parent 9d0120b commit 8586086

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

arch/arm/boot/dts/marvell/orion5x-lacie-d2-network.dts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,21 @@
3737
pinctrl-names = "default";
3838
#address-cells = <1>;
3939
#size-cells = <0>;
40-
front_button {
40+
41+
button-front {
4142
label = "Front Push Button";
4243
linux,code = <KEY_POWER>;
4344
gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;
4445
};
4546

46-
power_rocker_sw_on {
47+
switch-power-rocker-sw-on {
4748
label = "Power rocker switch (on|auto)";
4849
linux,input-type = <5>; /* EV_SW */
4950
linux,code = <1>; /* D2NET_SWITCH_POWER_ON */
5051
gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
5152
};
5253

53-
power_rocker_sw_off {
54+
switch-power-rocker-sw-off {
5455
label = "Power rocker switch (auto|off)";
5556
linux,input-type = <5>; /* EV_SW */
5657
linux,code = <2>; /* D2NET_SWITCH_POWER_OFF */

arch/arm/boot/dts/marvell/orion5x-linkstation-lschl.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
};
6262

6363
gpio_keys {
64-
func {
64+
func-button {
6565
label = "Function Button";
6666
linux,code = <KEY_OPTION>;
6767
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/marvell/orion5x-lswsgl.dts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,21 @@
7676
pinctrl-names = "default";
7777
#address-cells = <1>;
7878
#size-cells = <0>;
79-
func {
79+
80+
key-func {
8081
label = "Function Button";
8182
linux,code = <KEY_OPTION>;
8283
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
8384
};
8485

85-
power {
86+
key-power {
8687
label = "Power-on Switch";
8788
linux,input-type = <5>; /* EV_SW */
8889
linux,code = <KEY_RESERVED>; /* LSMINI_SW_POWER */
8990
gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
9091
};
9192

92-
autopower {
93+
key-autopower {
9394
label = "Power-auto Switch";
9495
linux,input-type = <5>; /* EV_SW */
9596
linux,code = <KEY_ESC>; /* LSMINI_SW_AUTOPOWER */

arch/arm/boot/dts/marvell/orion5x-maxtor-shared-storage-2.dts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@
3737
pinctrl-names = "default";
3838
#address-cells = <1>;
3939
#size-cells = <0>;
40-
power {
40+
41+
key-power {
4142
label = "Power";
4243
linux,code = <KEY_POWER>;
4344
gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
4445
};
4546

46-
reset {
47+
key-reset {
4748
label = "Reset";
4849
linux,code = <KEY_RESTART>;
4950
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/marvell/orion5x-netgear-wnr854t.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
pinctrl-0 = <&pmx_reset_button>;
3636
pinctrl-names = "default";
3737

38-
reset {
38+
key-reset {
3939
label = "Reset Button";
4040
linux,code = <KEY_RESTART>;
4141
gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;

0 commit comments

Comments
 (0)