| Message ID | 20240312074536.62964-1-raymondhackley@protonmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] arm64: dts: qcom: msm8916-samsung-fortuna: Add touchscreen | expand |
On 3/12/24 08:45, Raymond Hackley wrote: > From: Joe Mason <buddyjojo06@outlook.com> > > Like msm8916-samsung-a3u-eur, the Grand Prime uses a Zinitix BT541 > touchscreen. Add it together with the necessary fixed-regulator to the > device tree. > > Signed-off-by: Joe Mason <buddyjojo06@outlook.com> > [Raymond: Move to fortuna-common. Use interrupts-extended] > Signed-off-by: Raymond Hackley <raymondhackley@protonmail.com> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad
On Tue, Mar 12, 2024 at 07:45:42AM +0000, Raymond Hackley wrote: > diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi [..] > +&blsp_i2c5 { > + status = "okay"; > + > + touchscreen: touchscreen@20 { > + compatible = "zinitix,bt541"; > + reg = <0x20>; > + > + interrupts-extended = <&tlmm 13 IRQ_TYPE_EDGE_FALLING>; > + > + touchscreen-size-x = <540>; > + touchscreen-size-y = <960>; > + > + vcca-supply = <®_vdd_tsp_a>; > + vdd-supply = <&pm8916_l6>; > + > + pinctrl-0 = <&tsp_int_default>; > + pinctrl-names = "default"; > + > + linux,keycodes = <KEY_APPSELECT KEY_BACK>; linux,keycodes is not a valid property of zinitix,bt541 according to the DeviceTree binding. Is there a binding update for this somewhere? Regards, Bjorn
Bjorn Andersson писал(а) 03.04.2024 23:49: > On Tue, Mar 12, 2024 at 07:45:42AM +0000, Raymond Hackley wrote: >> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi > [..] >> +&blsp_i2c5 { >> + status = "okay"; >> + >> + touchscreen: touchscreen@20 { >> + compatible = "zinitix,bt541"; >> + reg = <0x20>; >> + >> + interrupts-extended = <&tlmm 13 IRQ_TYPE_EDGE_FALLING>; >> + >> + touchscreen-size-x = <540>; >> + touchscreen-size-y = <960>; >> + >> + vcca-supply = <®_vdd_tsp_a>; >> + vdd-supply = <&pm8916_l6>; >> + >> + pinctrl-0 = <&tsp_int_default>; >> + pinctrl-names = "default"; >> + >> + linux,keycodes = <KEY_APPSELECT KEY_BACK>; > > linux,keycodes is not a valid property of zinitix,bt541 according to the > DeviceTree binding. Is there a binding update for this somewhere? > There is a series for this [1] that Dmitry seems to have no time to pick up for a long while now, which we carry downstream. Without correct touchkey definition the touch controller reassigns the tkey lanes to the screen surface and display calibration breaks a bit, but since we don't have the changes upstream for now, probably want to drop this line from the submission so we don't introduce more dtbs_check warnings. Nikita [1] https://lore.kernel.org/r/20230801-zinitix-tkey-v4-0-b85526c5a474@trvn.ru/ > Regards, > Bjorn
On Tue, 12 Mar 2024 07:45:42 +0000, Raymond Hackley wrote: > Like msm8916-samsung-a3u-eur, the Grand Prime uses a Zinitix BT541 > touchscreen. Add it together with the necessary fixed-regulator to the > device tree. > > Applied, thanks! [1/1] arm64: dts: qcom: msm8916-samsung-fortuna: Add touchscreen commit: f8dddefcb90eaa339c77b2cb3f5a87dec8b1e3b5 Best regards,
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi index c2800ad2dd5b..d16647e687ef 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi @@ -66,6 +66,19 @@ reg_motor_vdd: regulator-motor-vdd { pinctrl-0 = <&motor_en_default>; pinctrl-names = "default"; }; + + reg_vdd_tsp_a: regulator-vdd-tsp-a { + compatible = "regulator-fixed"; + regulator-name = "vdd_tsp_a"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + + gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-0 = <&tsp_en_default>; + pinctrl-names = "default"; + }; }; &blsp_i2c1 { @@ -94,6 +107,28 @@ fuel-gauge@35 { }; }; +&blsp_i2c5 { + status = "okay"; + + touchscreen: touchscreen@20 { + compatible = "zinitix,bt541"; + reg = <0x20>; + + interrupts-extended = <&tlmm 13 IRQ_TYPE_EDGE_FALLING>; + + touchscreen-size-x = <540>; + touchscreen-size-y = <960>; + + vcca-supply = <®_vdd_tsp_a>; + vdd-supply = <&pm8916_l6>; + + pinctrl-0 = <&tsp_int_default>; + pinctrl-names = "default"; + + linux,keycodes = <KEY_APPSELECT KEY_BACK>; + }; +}; + &blsp_uart2 { status = "okay"; }; @@ -200,4 +235,18 @@ sdc2_cd_default: sdc2-cd-default-state { drive-strength = <2>; bias-disable; }; + + tsp_en_default: tsp-en-default-state { + pins = "gpio73"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + tsp_int_default: tsp-int-default-state { + pins = "gpio13"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi index 42843771ae2a..4048b72efcdc 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi @@ -5,6 +5,9 @@ /* SM5504 MUIC instead of SM5502 */ /delete-node/ &muic; +/* Touchscreen varies depending on model variant */ +/delete-node/ &touchscreen; + &blsp_i2c1 { muic: extcon@14 { compatible = "siliconmitus,sm5504-muic";