Skip to contentSkip to conversation

arm64: dts: qcom: msm8998-yoshino: fix volume-up key

PATCH Applied Sebastian Raase 3 participants 3 messages Mar 15, 2024 – Apr 4, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: qcom: msm8998-yoshino: fix volume-up key

The volume-up key is connected to gpio6 on yoshino. Fix button node ordering while at it. Disable pm8998_resin, since it is now unused.

Tested on maple and lilac.

Fixes 390883af89d2e ("arm64: dts: qcom: msm8998: Introduce support for Sony Yoshino platform")
---
 .../dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)
arch/arm64/boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi +26 -18
index 876c6921ddf0..fdd3953938d9 100644
@@ -98,30 +98,35 @@ extcon_usb: extcon-usb {
 	gpio-keys {
 		compatible = "gpio-keys";
 		label = "Side buttons";
+		pinctrl-0 = <&focus_n &snapshot_n &vol_down_n &vol_up_n>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&vol_down_n &focus_n &snapshot_n>;
-		button-vol-down {
-			label = "Volume Down";
-			gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
-			linux,input-type = <EV_KEY>;
-			linux,code = <KEY_VOLUMEDOWN>;
-			wakeup-source;
+		button-camera-focus {
+			label = "Camera Focus";
+			gpios = <&pm8998_gpios 8 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_CAMERA_FOCUS>;
 			debounce-interval = <15>;
 		};
 
 		button-camera-snapshot {
 			label = "Camera Snapshot";
 			gpios = <&pm8998_gpios 7 GPIO_ACTIVE_LOW>;
-			linux,input-type = <EV_KEY>;
 			linux,code = <KEY_CAMERA>;
 			debounce-interval = <15>;
 		};
 
-		button-camera-focus {
-			label = "Camera Focus";
-			gpios = <&pm8998_gpios 8 GPIO_ACTIVE_LOW>;
-			linux,input-type = <EV_KEY>;
-			linux,code = <KEY_CAMERA_FOCUS>;
+		button-vol-down {
+			label = "Volume Down";
+			gpios = <&pm8998_gpios 5 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_VOLUMEDOWN>;
+			wakeup-source;
+			debounce-interval = <15>;
+		};
+
+		button-vol-up {
+			label = "Volume Up";
+			gpios = <&pm8998_gpios 6 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_VOLUMEUP>;
+			wakeup-source;
 			debounce-interval = <15>;
 		};
 	};
@@ -345,6 +350,14 @@ vol_down_n: vol-down-n-state {
 		qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
 	};
 
+	vol_up_n: vol-up-n-state {
+		pins = "gpio6";
+		function = PMIC_GPIO_FUNC_NORMAL;
+		bias-pull-up;
+		input-enable;
+		qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
+	};
+
 	focus_n: focus-n-state {
 		pins = "gpio7";
 		function = PMIC_GPIO_FUNC_NORMAL;
@@ -405,11 +418,6 @@ vib_ldo_en: vib-ldo-en-state {
 	};
 };
 
-&pm8998_resin {
-	linux,code = <KEY_VOLUMEUP>;
-	status = "okay";
-};
-
 &qusb2phy {
 	status = "okay";
 
Signature · 1 line
2.42.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Sebastian Raase

The volume-up key is connected to gpio6 on yoshino. Fix button node ordering while at it. Disable pm8998_resin, since it is now unused.

Tested on maple and lilac.

Fixes 390883af89d2e ("arm64: dts: qcom: msm8998: Introduce support for Sony Yoshino platform")

---

Konrad

maintainer Applied
#2 lore raw
In reply to Sebastian Raase
Quoted 8 lines · Sebastian Raase

The volume-up key is connected to gpio6 on yoshino. Fix button node ordering while at it. Disable pm8998_resin, since it is now unused.

Tested on maple and lilac.

[...]

Applied, thanks!

[1/1] arm64: dts: qcom: msm8998-yoshino: fix volume-up key

      commit: 83ef6a5afc1d5e2270797a164972a3de3bd2ea52

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>