From: gregory.clement@free-electrons.com (Gregory CLEMENT)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 18/19] ARM: dts: armada-370-xp: Remove button address and fixup names
Date: Sun, 6 Nov 2016 23:27:11 +0100 [thread overview]
Message-ID: <20161106222712.27366-19-gregory.clement@free-electrons.com> (raw)
In-Reply-To: <20161106222712.27366-1-gregory.clement@free-electrons.com>
The gpio-key nodes do not have a reg property, so remove the address from
the unit name.
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
arch/arm/boot/dts/armada-370-rd.dts | 2 +-
arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 6 +++---
arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi | 6 +++---
arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 +-
arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 ++--
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index cff178004f59..4e9ad4b5bf94 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -122,7 +122,7 @@
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
- button at 1 {
+ button {
label = "Software Button";
linux,code = <KEY_POWER>;
gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
index 15d6aee02e17..d0c749cf369c 100644
--- a/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
@@ -141,19 +141,19 @@
#address-cells = <1>;
#size-cells = <0>;
- button at 1 {
+ power {
label = "Power button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
debounce-interval = <100>;
};
- button at 2 {
+ backup {
label = "Backup button";
linux,code = <KEY_OPTION>;
gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
debounce-interval = <100>;
};
- button at 3 {
+ reset {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
index f77a08ebe7b6..1937a0991179 100644
--- a/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
+++ b/arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
@@ -89,19 +89,19 @@
#address-cells = <1>;
#size-cells = <0>;
- button at 1 {
+ power {
label = "Power button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 19 GPIO_ACTIVE_HIGH>;
debounce-interval = <100>;
};
- button at 2 {
+ reset {
label = "Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
debounce-interval = <100>;
};
- button at 3 {
+ button {
label = "USB VBUS error";
linux,code = <KEY_UNKNOWN>;
gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index 4c199ef539c1..1b294b3814c5 100644
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -113,7 +113,7 @@
pinctrl-0 = <&keys_pin>;
pinctrl-names = "default";
- button at 1 {
+ reset {
label = "Factory Reset Button";
linux,code = <KEY_SETUP>;
gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index fd16af578fa8..ee10e1aa9225 100644
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -267,13 +267,13 @@
pinctrl-0 = <&keys_pin>;
pinctrl-names = "default";
- button at 1 {
+ wps {
label = "WPS";
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
};
- button at 2 {
+ reset {
label = "Factory Reset Button";
linux,code = <KEY_RESTART>;
gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index cf7b6759baf1..229ec4b2dae1 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -111,7 +111,7 @@
#address-cells = <1>;
#size-cells = <0>;
- button at 1 {
+ init {
label = "Init Button";
linux,code = <KEY_POWER>;
gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
--
2.10.1
next prev parent reply other threads:[~2016-11-06 22:27 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-06 22:26 [PATCH 00/19] Various Armada 370/XP DT warning fixup Gregory CLEMENT
2016-11-06 22:26 ` [PATCH 01/19] ARM: dts: armada-xp-matrix: Fix the location of the pcie-controller node Gregory CLEMENT
2016-11-06 22:26 ` [PATCH 02/19] ARM: dts: armada-370-xp: move the cpurst node in the common file Gregory CLEMENT
2016-11-06 22:26 ` [PATCH 03/19] ARM: dts: armada-370-xp: add node labels Gregory CLEMENT
2016-11-06 22:26 ` [PATCH 04/19] ARM: dts: armada-370-xp: Use the " Gregory CLEMENT
2016-11-06 22:26 ` [PATCH 05/19] ARM: dts: armada-370-xp: Fixup mdio DT warning Gregory CLEMENT
2016-11-06 22:26 ` [PATCH 06/19] ARM: dts: armada-370-xp: Fixup bootrom " Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 07/19] ARM: dts: armada-370-xp: Fixup devbus " Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 08/19] ARM: dts: armada-370-xp: Fixup bm-bppi " Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 09/19] ARM: dts: armada-370-xp: Fixup sa-ram " Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 10/19] ARM: dts: armada-xp: Fixup pcie DT warnings Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 11/19] ARM: dts: armada-370: " Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 12/19] ARM: dts: armada-370-xp: Remove skeleton.dtsi Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 13/19] ARM: dts: armada-370-xp: Fixup l2-cache DT warning Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 14/19] ARM: dts: armada-370-xp: Fixup internal-regs " Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 15/19] ARM: dts: armada-370-xp: Fixup soc " Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 16/19] ARM: dts: armada-370-xp: Fixup memory " Gregory CLEMENT
2016-11-06 22:27 ` [PATCH 17/19] ARM: dts: armada-370-xp: Remove address from dsa unit name Gregory CLEMENT
2016-11-06 22:27 ` Gregory CLEMENT [this message]
2016-11-06 22:27 ` [PATCH 19/19] ARM: dts: armada-370-xp: Fixup regulator DT warning Gregory CLEMENT
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161106222712.27366-19-gregory.clement@free-electrons.com \
--to=gregory.clement@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox