All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys
@ 2022-12-10 14:25 Konrad Dybcio
  2022-12-10 14:25 ` [PATCH 2/3] arm64: dts: qcom: sm8150-kumano: Add NXP PN553 NFC Konrad Dybcio
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Konrad Dybcio @ 2022-12-10 14:25 UTC (permalink / raw)
  To: linux-arm-msm, andersson, agross, krzysztof.kozlowski
  Cc: patches, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
	devicetree, linux-kernel

Configure hardware buttons (V-, Camera Shutter/Focus) on Kumano
devices.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 .../dts/qcom/sm8150-sony-xperia-kumano.dtsi   | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
index c958a8b16730..2352dff213fc 100644
--- a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
@@ -46,6 +46,40 @@ framebuffer: framebuffer@9c000000 {
 		};
 	};
 
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&focus_n &snapshot_n &vol_down_n>;
+
+		key-camera-focus {
+			label = "Camera Focus";
+			linux,code = <KEY_CAMERA_FOCUS>;
+			gpios = <&pm8150b_gpios 2 GPIO_ACTIVE_LOW>;
+			debounce-interval = <15>;
+			linux,can-disable;
+			gpio-key,wakeup;
+		};
+
+		key-camera-snapshot {
+			label = "Camera Snapshot";
+			linux,code = <KEY_CAMERA>;
+			gpios = <&pm8150b_gpios 1 GPIO_ACTIVE_LOW>;
+			debounce-interval = <15>;
+			linux,can-disable;
+			gpio-key,wakeup;
+		};
+
+		key-vol-down {
+			label = "Volume Down";
+			linux,code = <KEY_VOLUMEDOWN>;
+			gpios = <&pm8150_gpios 1 GPIO_ACTIVE_LOW>;
+			debounce-interval = <15>;
+			linux,can-disable;
+			gpio-key,wakeup;
+		};
+	};
+
 	vph_pwr: vph-pwr-regulator {
 		compatible = "regulator-fixed";
 		regulator-name = "vph_pwr";
@@ -410,6 +444,34 @@ &i2c10 {
 	/* Samsung touchscreen @ 48 */
 };
 
+&pm8150_gpios {
+	vol_down_n: vol-down-n-state {
+		pins = "gpio1";
+		function = "normal";
+		power-source = <0>;
+		bias-pull-up;
+		input-enable;
+	};
+};
+
+&pm8150b_gpios {
+	snapshot_n: snapshot-n-state {
+		pins = "gpio1";
+		function = "normal";
+		power-source = <0>;
+		bias-pull-up;
+		input-enable;
+	};
+
+	focus_n: focus-n-state {
+		pins = "gpio2";
+		function = "normal";
+		power-source = <0>;
+		bias-pull-up;
+		input-enable;
+	};
+};
+
 &pon_pwrkey {
 	status = "okay";
 };
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/3] arm64: dts: qcom: sm8150-kumano: Add NXP PN553 NFC
  2022-12-10 14:25 [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys Konrad Dybcio
@ 2022-12-10 14:25 ` Konrad Dybcio
  2022-12-13 11:43   ` Marijn Suijten
  2022-12-10 14:25 ` [PATCH 3/3] arm64: dts: qcom: sm8150-kumano: Configure resin as volume up key Konrad Dybcio
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 6+ messages in thread
From: Konrad Dybcio @ 2022-12-10 14:25 UTC (permalink / raw)
  To: linux-arm-msm, andersson, agross, krzysztof.kozlowski
  Cc: patches, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
	devicetree, linux-kernel

Add a node for NXP PN553 NFC (or PN557, unclear data), using the
nxp-nci driver.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
index 2352dff213fc..9d667bb6f25b 100644
--- a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
@@ -428,8 +428,18 @@ &i2c4 {
 
 	/* Qcom SMB1355 @ c */
 	/* Qcom SMB1390 @ 10 */
-	/* NXP PN553 NFC @ 28 */
 	/* Qcom FSA4480 USB-C audio switch @ 43 */
+
+	nfc@28 {
+		compatible = "nxp,nxp-nci-i2c";
+		reg = <0x28>;
+
+		interrupt-parent = <&tlmm>;
+		interrupts = <47 IRQ_TYPE_EDGE_RISING>;
+
+		enable-gpios = <&tlmm 41 GPIO_ACTIVE_HIGH>;
+		firmware-gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &i2c7 {
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/3] arm64: dts: qcom: sm8150-kumano: Configure resin as volume up key
  2022-12-10 14:25 [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys Konrad Dybcio
  2022-12-10 14:25 ` [PATCH 2/3] arm64: dts: qcom: sm8150-kumano: Add NXP PN553 NFC Konrad Dybcio
@ 2022-12-10 14:25 ` Konrad Dybcio
  2022-12-13 11:19 ` [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys Marijn Suijten
  2022-12-28  4:36 ` (subset) " Bjorn Andersson
  3 siblings, 0 replies; 6+ messages in thread
From: Konrad Dybcio @ 2022-12-10 14:25 UTC (permalink / raw)
  To: linux-arm-msm, andersson, agross, krzysztof.kozlowski
  Cc: patches, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
	devicetree, linux-kernel, Marijn Suijten

From: Marijn Suijten <marijn.suijten@somainline.org>

The volume-up button on both kumanos (Xperia 1 and Xperia 5) are mapped
to resin.

Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
index 9d667bb6f25b..d64f2b04e267 100644
--- a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
@@ -486,6 +486,11 @@ &pon_pwrkey {
 	status = "okay";
 };
 
+&pon_resin {
+	linux,code = <KEY_VOLUMEUP>;
+	status = "okay";
+};
+
 &qupv3_id_0 {
 	status = "okay";
 };
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys
  2022-12-10 14:25 [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys Konrad Dybcio
  2022-12-10 14:25 ` [PATCH 2/3] arm64: dts: qcom: sm8150-kumano: Add NXP PN553 NFC Konrad Dybcio
  2022-12-10 14:25 ` [PATCH 3/3] arm64: dts: qcom: sm8150-kumano: Configure resin as volume up key Konrad Dybcio
@ 2022-12-13 11:19 ` Marijn Suijten
  2022-12-28  4:36 ` (subset) " Bjorn Andersson
  3 siblings, 0 replies; 6+ messages in thread
From: Marijn Suijten @ 2022-12-13 11:19 UTC (permalink / raw)
  To: Konrad Dybcio
  Cc: linux-arm-msm, andersson, agross, krzysztof.kozlowski, patches,
	Rob Herring, Krzysztof Kozlowski, devicetree, linux-kernel

On 2022-12-10 15:25:23, Konrad Dybcio wrote:
> Configure hardware buttons (V-, Camera Shutter/Focus) on Kumano
> devices.
> 
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Tested-by: Marijn Suijten <marijn.suijten@somainline.org> # On Xperia 1 and Xperia 5

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/3] arm64: dts: qcom: sm8150-kumano: Add NXP PN553 NFC
  2022-12-10 14:25 ` [PATCH 2/3] arm64: dts: qcom: sm8150-kumano: Add NXP PN553 NFC Konrad Dybcio
@ 2022-12-13 11:43   ` Marijn Suijten
  0 siblings, 0 replies; 6+ messages in thread
From: Marijn Suijten @ 2022-12-13 11:43 UTC (permalink / raw)
  To: Konrad Dybcio
  Cc: linux-arm-msm, andersson, agross, krzysztof.kozlowski, patches,
	Rob Herring, Krzysztof Kozlowski, devicetree, linux-kernel

On 2022-12-10 15:25:24, Konrad Dybcio wrote:
> Add a node for NXP PN553 NFC (or PN557, unclear data), using the
> nxp-nci driver.
> 
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Tested-by: Marijn Suijten <marijn.suijten@somainline.org> # On Xperia 1 and Xperia 5

Unfortunately I can only test this with neard-tools' nfctool, which
reports a tag (from another phone) has been detected but does not allow
me to show its contents (I may have simply not figured out /how/), and
the other phone with the "NFC Tools" app shows nothing when trying to
read from any of the kumano phones (but then I am also unsure how to
"present" a tag via nfctool, and expected it to be implicit when running
as "initiator").

Debug/testing advice appreciated :)

- Marijn

> ---
>  .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi     | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
> index 2352dff213fc..9d667bb6f25b 100644
> --- a/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi
> @@ -428,8 +428,18 @@ &i2c4 {
>  
>  	/* Qcom SMB1355 @ c */
>  	/* Qcom SMB1390 @ 10 */
> -	/* NXP PN553 NFC @ 28 */
>  	/* Qcom FSA4480 USB-C audio switch @ 43 */
> +
> +	nfc@28 {
> +		compatible = "nxp,nxp-nci-i2c";
> +		reg = <0x28>;
> +
> +		interrupt-parent = <&tlmm>;
> +		interrupts = <47 IRQ_TYPE_EDGE_RISING>;
> +
> +		enable-gpios = <&tlmm 41 GPIO_ACTIVE_HIGH>;
> +		firmware-gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>;
> +	};
>  };
>  
>  &i2c7 {
> -- 
> 2.38.1
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: (subset) [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys
  2022-12-10 14:25 [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys Konrad Dybcio
                   ` (2 preceding siblings ...)
  2022-12-13 11:19 ` [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys Marijn Suijten
@ 2022-12-28  4:36 ` Bjorn Andersson
  3 siblings, 0 replies; 6+ messages in thread
From: Bjorn Andersson @ 2022-12-28  4:36 UTC (permalink / raw)
  To: krzysztof.kozlowski, agross, linux-arm-msm, konrad.dybcio
  Cc: krzysztof.kozlowski+dt, linux-kernel, robh+dt, devicetree, patches

On Sat, 10 Dec 2022 15:25:23 +0100, Konrad Dybcio wrote:
> Configure hardware buttons (V-, Camera Shutter/Focus) on Kumano
> devices.
> 
> 

Applied, thanks!

[1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys
      commit: 0ead2d1758714fb724e062f76fdb4868ba8303e6
[2/3] arm64: dts: qcom: sm8150-kumano: Add NXP PN553 NFC
      commit: 6cef82a8a7d9cbfacc94914791fbbe526709aa43
[3/3] arm64: dts: qcom: sm8150-kumano: Configure resin as volume up key
      commit: 632a35e24fefa24f79a97310e8c4642e33919204

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-12-28  4:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-10 14:25 [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys Konrad Dybcio
2022-12-10 14:25 ` [PATCH 2/3] arm64: dts: qcom: sm8150-kumano: Add NXP PN553 NFC Konrad Dybcio
2022-12-13 11:43   ` Marijn Suijten
2022-12-10 14:25 ` [PATCH 3/3] arm64: dts: qcom: sm8150-kumano: Configure resin as volume up key Konrad Dybcio
2022-12-13 11:19 ` [PATCH 1/3] arm64: dts: qcom: sm8150-kumano: Add GPIO keys Marijn Suijten
2022-12-28  4:36 ` (subset) " Bjorn Andersson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.