2022-08-05 09:42:54

by Johan Hovold

Subject: [PATCH 5/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: move HID pin config

The HID pin configurations belong in the HID nodes rather than i2c bus
node.

Signed-off-by: Johan Hovold <[email protected]>
---
.../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 85efce641a4e..76ba2d5fa17e 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -177,7 +177,7 @@ &qup0_i2c4 {
clock-frequency = <400000>;

pinctrl-names = "default";
- pinctrl-0 = <&qup0_i2c4_default>, <&ts0_default>;
+ pinctrl-0 = <&qup0_i2c4_default>;

status = "okay";

@@ -185,9 +185,13 @@ &qup0_i2c4 {
touchscreen@10 {
compatible = "hid-over-i2c";
reg = <0x10>;
+
hid-descr-addr = <0x1>;
interrupts-extended = <&tlmm 175 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&ts0_default>;
};
};

@@ -203,24 +207,32 @@ &qup2_i2c5 {
clock-frequency = <400000>;

pinctrl-names = "default";
- pinctrl-0 = <&qup2_i2c5_default>, <&kybd_default>, <&tpad_default>;
+ pinctrl-0 = <&qup2_i2c5_default>;

status = "okay";

touchpad@2c {
compatible = "hid-over-i2c";
reg = <0x2c>;
+
hid-descr-addr = <0x20>;
interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&tpad_default>;
};

keyboard@68 {
compatible = "hid-over-i2c";
reg = <0x68>;
+
hid-descr-addr = <0x1>;
interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
vdd-supply = <&vreg_misc_3p3>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&kybd_default>;
};
};

--
2.35.1

2022-08-06 17:20:05

by Manivannan Sadhasivam

Subject: Re: [PATCH 5/7] arm64: dts: qcom: sc8280xp-lenovo-thinkpad-x13s: move HID pin config

On Fri, Aug 05, 2022 at 11:23:15AM +0200, Johan Hovold wrote:
> The HID pin configurations belong in the HID nodes rather than i2c bus
> node.
>
> Signed-off-by: Johan Hovold <[email protected]>

Reviewed-by: Manivannan Sadhasivam <[email protected]>

Thanks,
Mani

> ---
> .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> index 85efce641a4e..76ba2d5fa17e 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> @@ -177,7 +177,7 @@ &qup0_i2c4 {
> clock-frequency = <400000>;
>
> pinctrl-names = "default";
> - pinctrl-0 = <&qup0_i2c4_default>, <&ts0_default>;
> + pinctrl-0 = <&qup0_i2c4_default>;
>
> status = "okay";
>
> @@ -185,9 +185,13 @@ &qup0_i2c4 {
> touchscreen@10 {
> compatible = "hid-over-i2c";
> reg = <0x10>;
> +
> hid-descr-addr = <0x1>;
> interrupts-extended = <&tlmm 175 IRQ_TYPE_LEVEL_LOW>;
> vdd-supply = <&vreg_misc_3p3>;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&ts0_default>;
> };
> };
>
> @@ -203,24 +207,32 @@ &qup2_i2c5 {
> clock-frequency = <400000>;
>
> pinctrl-names = "default";
> - pinctrl-0 = <&qup2_i2c5_default>, <&kybd_default>, <&tpad_default>;
> + pinctrl-0 = <&qup2_i2c5_default>;
>
> status = "okay";
>
> touchpad@2c {
> compatible = "hid-over-i2c";
> reg = <0x2c>;
> +
> hid-descr-addr = <0x20>;
> interrupts-extended = <&tlmm 182 IRQ_TYPE_LEVEL_LOW>;
> vdd-supply = <&vreg_misc_3p3>;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&tpad_default>;
> };
>
> keyboard@68 {
> compatible = "hid-over-i2c";
> reg = <0x68>;
> +
> hid-descr-addr = <0x1>;
> interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
> vdd-supply = <&vreg_misc_3p3>;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&kybd_default>;
> };
> };
>
> --
> 2.35.1
>

--
மணிவண்ணன் சதாசிவம்