2022-12-22 19:53:01

by Marijn Suijten

Subject: [PATCH v2] arm64: dts: qcom: sm6125-seine: Clean up gpio-keys (volume down)

- Remove autorepeat (leave key repetition to userspace);
- Remove unneeded status = "okay" (this is the default);
- Remove unneeded linux,input-type <EV_KEY> (this is the default for
gpio-keys);
- Allow the interrupt line for this button to be disabled;
- Use a full, descriptive node name;
- Set proper bias on the GPIO via pinctrl;
- Sort properties;
- Replace deprecated gpio-key,wakeup property with wakeup-source.

Fixes: 82e1783890b7 ("arm64: dts: qcom: sm6125: Add support for Sony Xperia 10II")
Signed-off-by: Marijn Suijten <[email protected]>
---

Changes since v1:

- Flatten gpio-keys pinctrl state into controlling just the volume-down
pin;
- Replace deprecated gpio-key,wakeup property with wakeup-source.

v1: https://lore.kernel.org/linux-arm-msm/[email protected]/

.../qcom/sm6125-sony-xperia-seine-pdx201.dts | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
index 0de6c5b7f742..09cff5d1d0ae 100644
--- a/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
+++ b/arch/arm64/boot/dts/qcom/sm6125-sony-xperia-seine-pdx201.dts
@@ -41,17 +41,18 @@ extcon_usb: extcon-usb {
};

gpio-keys {
- status = "okay";
compatible = "gpio-keys";
- autorepeat;

- key-vol-dn {
+ pinctrl-0 = <&vol_down_n>;
+ pinctrl-names = "default";
+
+ key-volume-down {
label = "Volume Down";
gpios = <&tlmm 47 GPIO_ACTIVE_LOW>;
- linux,input-type = <1>;
linux,code = <KEY_VOLUMEDOWN>;
- gpio-key,wakeup;
debounce-interval = <15>;
+ linux,can-disable;
+ wakeup-source;
};
};

@@ -270,6 +271,14 @@ &sdhc_1 {

&tlmm {
gpio-reserved-ranges = <22 2>, <28 6>;
+
+ vol_down_n: vol-down-n-state {
+ pins = "gpio47";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-disable;
+ input-enable;
+ };
};

&usb3 {
--
2.39.0

2022-12-29 17:27:15

by Bjorn Andersson

Subject: Re: [PATCH v2] arm64: dts: qcom: sm6125-seine: Clean up gpio-keys (volume down)

On Thu, 22 Dec 2022 20:24:43 +0100, Marijn Suijten wrote:
> - Remove autorepeat (leave key repetition to userspace);
> - Remove unneeded status = "okay" (this is the default);
> - Remove unneeded linux,input-type <EV_KEY> (this is the default for
> gpio-keys);
> - Allow the interrupt line for this button to be disabled;
> - Use a full, descriptive node name;
> - Set proper bias on the GPIO via pinctrl;
> - Sort properties;
> - Replace deprecated gpio-key,wakeup property with wakeup-source.
>
> [...]

Applied, thanks!

[1/1] arm64: dts: qcom: sm6125-seine: Clean up gpio-keys (volume down)
commit: a9f6a13da473bb6c7406d2784d9e3792f6763cba

Best regards,
--
Bjorn Andersson <[email protected]>