From: Caleb Connolly <caleb.connolly@linaro.org>
To: Bjorn Andersson <andersson@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Konrad Dybcio <konradybcio@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Rob Herring <robh@kernel.org>
Cc: Caleb Connolly <caleb.connolly@linaro.org>,
devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org
Subject: [PATCH] arm64: dts: qcom: align gpio-keys label format
Date: Mon, 31 Mar 2025 14:10:05 +0200 [thread overview]
Message-ID: <20250331121011.385250-1-caleb.connolly@linaro.org> (raw)
Most devices follow the practise of capitilising all words in a label,
this seems to be the standard elsewhere too (e.g. run "evtest" on an x86
ThinkPad).
Adjust the stragglers to follow suite, and standardise on "Volume
Buttons" over "Volume keys" as the label for the entire device where
applicable.
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
---
This is really a drop in the ocean, a good next step would be to fix the
pm8941-pwrkey driver so your power button doesn't show up as
"pm8941_pwrkey".
---
arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts | 6 +++---
arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 2 +-
arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts | 2 +-
arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 6 +++---
arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
index e6a69d942a4a..452c455294d0 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-common.dtsi
@@ -90,17 +90,17 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&vol_keys_default>;
button-vol-down {
- label = "Volume down";
+ label = "Volume Down";
gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
debounce-interval = <15>;
wakeup-source;
};
button-vol-up {
- label = "Volume up";
+ label = "Volume Up";
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <15>;
wakeup-source;
diff --git a/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts b/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts
index 0cac06f25a77..2a62d58195fd 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts
+++ b/arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts
@@ -124,16 +124,16 @@ zap_shader_region: memory@f7900000 {
};
gpio-keys {
compatible = "gpio-keys";
- label = "Volume buttons";
+ label = "Volume Up";
autorepeat;
pinctrl-names = "default";
pinctrl-0 = <&vol_up_key_default>;
key-vol-up {
- label = "Volume up";
+ label = "Volume Up";
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <15>;
wakeup-source;
@@ -141,9 +141,9 @@ key-vol-up {
};
gpio-hall-sensor {
compatible = "gpio-keys";
- label = "Hall effect sensor";
+ label = "Hall Effect Sensor";
pinctrl-names = "default";
pinctrl-0 = <&hall_sensor_default_state>;
diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
index 0f1c83822f66..0333e06227eb 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
@@ -54,9 +54,9 @@ gpio-keys {
pinctrl-0 = <&volume_down_default>, <&hall_sensor_default>;
pinctrl-names = "default";
key-volume-up {
- label = "Volume up";
+ label = "Volume Up";
gpios = <&pm7325_gpios 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
diff --git a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
index 712f29fbe85e..1b00fd5b2c89 100644
--- a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
+++ b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
@@ -56,9 +56,9 @@ gpio-keys {
pinctrl-0 = <&volume_down_default>;
pinctrl-names = "default";
key-volume-up {
- label = "Volume up";
+ label = "Volume Up";
gpios = <&pm7325_gpios 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <15>;
};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
index 99dafc6716e7..b60a41f71e29 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
@@ -129,9 +129,9 @@ gpio-keys {
label = "GPIO Buttons";
key-vol-up {
- label = "Volume up";
+ label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
};
};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 8a0f154bffc3..535b02d1b12c 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -48,23 +48,23 @@ event-hall-sensor {
};
gpio-keys {
compatible = "gpio-keys";
- label = "Volume keys";
+ label = "Volume Buttons";
autorepeat;
pinctrl-names = "default";
pinctrl-0 = <&volume_down_gpio &volume_up_gpio>;
key-vol-down {
- label = "Volume down";
+ label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
debounce-interval = <15>;
};
key-vol-up {
- label = "Volume up";
+ label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
debounce-interval = <15>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts b/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts
index 85a928f98077..a7544d8b4fac 100644
--- a/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts
+++ b/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts
@@ -68,9 +68,9 @@ gpio-keys {
pinctrl-0 = <&kypd_volp_n>;
pinctrl-names = "default";
key-volume-up {
- label = "Volume up";
+ label = "Volume Up";
gpios = <&pm7325_gpios 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
};
--
2.49.0
next reply other threads:[~2025-03-31 12:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-31 12:10 Caleb Connolly [this message]
2025-03-31 12:20 ` [PATCH] arm64: dts: qcom: align gpio-keys label format Luca Weiss
2025-03-31 12:26 ` Caleb Connolly
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=20250331121011.385250-1-caleb.connolly@linaro.org \
--to=caleb.connolly@linaro.org \
--cc=andersson@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=konradybcio@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=robh@kernel.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;
as well as URLs for NNTP newsgroup(s).