linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes
       [not found] <20220930191049.123256-1-konrad.dybcio@somainline.org>
@ 2022-09-30 19:10 ` Konrad Dybcio
  2022-09-30 20:10   ` Krzysztof Kozlowski
  2022-10-01 14:54   ` Marijn Suijten
  2022-09-30 19:10 ` [PATCH 2/8] arm64: dts: qcom: sdm845-tama: Add Synaptics Touchscreen Konrad Dybcio
                   ` (6 subsequent siblings)
  7 siblings, 2 replies; 16+ messages in thread
From: Konrad Dybcio @ 2022-09-30 19:10 UTC (permalink / raw)
  To: ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, devicetree,
	linux-kernel

Add required nodes to support display on XZ2/XZ2c. XZ3 has a
different power rail setup and needs to be handled separately.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 .../qcom/sdm845-sony-xperia-tama-akari.dts    |  4 +
 .../qcom/sdm845-sony-xperia-tama-akatsuki.dts | 44 ++++++++-
 .../qcom/sdm845-sony-xperia-tama-apollo.dts   |  6 ++
 .../dts/qcom/sdm845-sony-xperia-tama.dtsi     | 96 +++++++++++++++++++
 4 files changed, 149 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
index 34f84f1f1eb4..d97b7f1e7140 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
@@ -11,3 +11,7 @@ / {
 	model = "Sony Xperia XZ2";
 	compatible = "sony,akari-row", "qcom,sdm845";
 };
+
+&panel {
+	compatible = "sony,td4353-jdi-tama";
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
index 2f5e12deaada..2a16305ac5da 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
@@ -10,9 +10,51 @@
 / {
 	model = "Sony Xperia XZ3";
 	compatible = "sony,akatsuki-row", "qcom,sdm845";
+
+	/* Fixed DCDC for the OLED panel */
+	ts_vddio_supply: ts-vddio-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "ts_vddio";
+
+		regulator-min-microvolt = <1840000>;
+		regulator-max-microvolt = <1840000>;
+
+		gpio = <&tlmm 133 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		regulator-boot-on;
+	};
+};
+
+&ibb {
+	status = "disabled";
+};
+
+&lab {
+	status = "disabled";
+};
+
+&panel {
+	/* Akatsuki uses an OLED panel. */
+	/delete-property/ backlight;
+	/delete-property/ vsp-supply;
+	/delete-property/ vsn-supply;
+	/delete-property/ treset-gpios;
+};
+
+&pmi8998_wled {
+	status = "disabled";
+};
+
+&tlmm {
+	ts_vddio_en: ts-vddio-en {
+		pins = "gpio133";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-disable;
+		output-high;
+	};
 };
 
-/* For the future: WLED + LAB/IBB/OLEDB are not used on Akatsuki */
 &vreg_l14a_1p8 {
 	regulator-min-microvolt = <1840000>;
 	regulator-max-microvolt = <1840000>;
diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts
index c9e62c72f60e..cd056f78070f 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts
@@ -11,3 +11,9 @@ / {
 	model = "Sony Xperia XZ2 Compact";
 	compatible = "sony,apollo-row", "qcom,sdm845";
 };
+
+&panel {
+	compatible = "sony,td4353-jdi-tama";
+	height-mm = <112>;
+	width-mm = <56>;
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
index 51ee42e3c995..ac8eb59ed010 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -326,6 +326,46 @@ vreg_s3c_0p6: smps3 {
 	};
 };
 
+&dsi0 {
+	vdda-supply = <&vreg_l26a_1p2>;
+	status = "okay";
+
+	panel: panel@0 {
+		/* The compatible is assigned in device DTs. */
+		reg = <0>;
+
+		backlight = <&pmi8998_wled>;
+		vddio-supply = <&vreg_l14a_1p8>;
+		vsp-supply = <&lab>;
+		vsn-supply = <&ibb>;
+		panel-reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
+		touch-reset-gpios = <&tlmm 99 GPIO_ACTIVE_HIGH>;
+
+		pinctrl-names = "default", "sleep";
+		pinctrl-0 = <&sde_dsi_active &sde_te_active_sleep>;
+		pinctrl-1 = <&sde_dsi_sleep &sde_te_active_sleep>;
+
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port {
+			panel_in: endpoint {
+				remote-endpoint = <&dsi0_out>;
+			};
+		};
+	};
+};
+
+&dsi0_out {
+	remote-endpoint = <&panel_in>;
+	data-lanes = <0 1 2 3>;
+};
+
+&dsi0_phy {
+	vdds-supply = <&vreg_l1a_0p9>;
+	status = "okay";
+};
+
 &gcc {
 	protected-clocks = <GCC_QSPI_CORE_CLK>,
 			<GCC_QSPI_CORE_CLK_SRC>,
@@ -358,6 +398,41 @@ &i2c14 {
 	/* AMS TCS3490 RGB+IR color sensor @ 72 */
 };
 
+&ibb {
+	qcom,discharge-resistor-kohms = <300>;
+	regulator-min-microvolt = <5500000>;
+	regulator-max-microvolt = <5700000>;
+	regulator-min-microamp = <0>;
+	regulator-max-microamp = <800000>;
+	regulator-over-current-protection;
+	regulator-soft-start;
+	regulator-pull-down;
+};
+
+&lab {
+	regulator-min-microvolt = <5500000>;
+	regulator-max-microvolt = <5700000>;
+	regulator-min-microamp = <200000>;
+	regulator-max-microamp = <200000>;
+	regulator-over-current-protection;
+	regulator-soft-start;
+	regulator-pull-down;
+};
+
+&mdss {
+	status = "okay";
+};
+
+&pmi8998_wled {
+	default-brightness = <800>;
+	qcom,switching-freq = <800>;
+	qcom,ovp-millivolt = <29600>;
+	qcom,current-boost-limit = <970>;
+	qcom,current-limit-microamp = <20000>;
+	qcom,enabled-strings = <0 1 2 3>;
+	status = "okay";
+};
+
 &qupv3_id_0 {
 	status = "okay";
 };
@@ -401,6 +476,27 @@ data {
 			bias-pull-up;
 		};
 	};
+
+	sde_dsi_active: sde-dsi-active-state {
+		pins = "gpio6", "gpio52";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-disable;
+	};
+
+	sde_dsi_sleep: sde-dsi-sleep-state {
+		pins = "gpio6", "gpio52";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
+
+	sde_te_active_sleep: sde-te-active-sleep-state {
+		pins = "gpio10";
+		function = "mdp_vsync";
+		drive-strength = <2>;
+		bias-pull-down;
+	};
 };
 
 &uart6 {
-- 
2.37.3


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

* [PATCH 2/8] arm64: dts: qcom: sdm845-tama: Add Synaptics Touchscreen
       [not found] <20220930191049.123256-1-konrad.dybcio@somainline.org>
  2022-09-30 19:10 ` [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes Konrad Dybcio
@ 2022-09-30 19:10 ` Konrad Dybcio
  2022-09-30 20:12   ` Krzysztof Kozlowski
  2022-09-30 19:10 ` [PATCH 3/8] arm64: dts: qcom: sdm845-tama: Add regulator-system-load to l14a/l28a Konrad Dybcio
                   ` (5 subsequent siblings)
  7 siblings, 1 reply; 16+ messages in thread
From: Konrad Dybcio @ 2022-09-30 19:10 UTC (permalink / raw)
  To: ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, devicetree,
	linux-kernel

Add required pins and RMI4 node to the common DT and remove it
from Akatsuki, as it uses a different touch.

Since the panels are super high tech proprietary incell, they
need to be handled with very precise timings. As such the panel
driver sets up the power rails and GPIOs and the touchscreen
driver *has to* probe afterwards.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 .../qcom/sdm845-sony-xperia-tama-akatsuki.dts |  3 +
 .../dts/qcom/sdm845-sony-xperia-tama.dtsi     | 69 ++++++++++++++++++-
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
index 2a16305ac5da..5c5949a51184 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
@@ -7,6 +7,9 @@
 
 #include "sdm845-sony-xperia-tama.dtsi"
 
+/* XZ3 uses an Atmel touchscreen instead. */
+/delete-node/ &touchscreen;
+
 / {
 	model = "Sony Xperia XZ3";
 	compatible = "sony,akatsuki-row", "qcom,sdm845";
diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
index ac8eb59ed010..809a6d7e739b 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -375,10 +375,43 @@ &gcc {
 };
 
 &i2c5 {
-	status = "okay";
 	clock-frequency = <400000>;
+	status = "okay";
+
+	touchscreen: touchscreen@2c {
+		compatible = "syna,rmi4-i2c";
+		reg = <0x2c>;
+
+		interrupt-parent = <&tlmm>;
+		interrupts = <125 IRQ_TYPE_EDGE_FALLING>;
+		vdd-supply = <&vreg_l14a_1p8>;
+		/*
+		 * This is a blatant abuse of OF, but the panel driver *needs*
+		 * to probe first, as the power/gpio switching needs to be precisely
+		 * timed in order for both the display and touch panel to function properly.
+		 */
+		incell-supply = <&panel>;
+
+		syna,reset-delay-ms = <220>;
+		syna,startup-delay-ms = <1000>;
+
+		pinctrl-names = "default", "sleep";
+		pinctrl-0 = <&ts_default>;
+		pinctrl-1 = <&ts_sleep>;
 
-	/* Synaptics touchscreen @ 2c, 3c */
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		rmi4-f01@1 {
+			reg = <0x01>;
+			syna,nosleep-mode = <1>;
+		};
+
+		rmi4-f12@12 {
+			reg = <0x12>;
+			syna,sensor-type = <1>;
+		};
+	};
 };
 
 &i2c10 {
@@ -497,6 +530,38 @@ sde_te_active_sleep: sde-te-active-sleep-state {
 		drive-strength = <2>;
 		bias-pull-down;
 	};
+
+	ts_default: ts-default-state {
+		reset-pin {
+			pins = "gpio99";
+			function = "gpio";
+			drive-strength = <2>;
+			bias-pull-up;
+		};
+
+		int-pin {
+			pins = "gpio125";
+			function = "gpio";
+			drive-strength = <2>;
+			bias-pull-up;
+		};
+	};
+
+	ts_sleep: ts-sleep-state {
+		reset-pin {
+			pins = "gpio99";
+			function = "gpio";
+			drive-strength = <2>;
+			bias-pull-down;
+		};
+
+		int-pin {
+			pins = "gpio125";
+			function = "gpio";
+			drive-strength = <2>;
+			bias-pull-down;
+		};
+	};
 };
 
 &uart6 {
-- 
2.37.3


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

* [PATCH 3/8] arm64: dts: qcom: sdm845-tama: Add regulator-system-load to l14a/l28a
       [not found] <20220930191049.123256-1-konrad.dybcio@somainline.org>
  2022-09-30 19:10 ` [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes Konrad Dybcio
  2022-09-30 19:10 ` [PATCH 2/8] arm64: dts: qcom: sdm845-tama: Add Synaptics Touchscreen Konrad Dybcio
@ 2022-09-30 19:10 ` Konrad Dybcio
  2022-09-30 19:10 ` [PATCH 4/8] arm64: dts: qcom: sdm845-tama: Enable remoteprocs Konrad Dybcio
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 16+ messages in thread
From: Konrad Dybcio @ 2022-09-30 19:10 UTC (permalink / raw)
  To: ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, devicetree,
	linux-kernel

Add the properties to ensure the ever so delicate touchscreen setup
matches downstream.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
index 809a6d7e739b..1c9cb1c3d8aa 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -198,6 +198,7 @@ vreg_l14a_1p8: ldo14 {
 			regulator-min-microvolt = <1800000>;
 			regulator-max-microvolt = <1800000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+			regulator-system-load = <62000>;
 		};
 
 		vreg_l15a_1p8: ldo15 {
@@ -284,6 +285,7 @@ vreg_l28a_2p8: ldo28 {
 			regulator-min-microvolt = <2856000>;
 			regulator-max-microvolt = <3008000>;
 			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+			regulator-system-load = <100000>;
 		};
 
 		vreg_lvs1a_1p8: lvs1 {
-- 
2.37.3


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

* [PATCH 4/8] arm64: dts: qcom: sdm845-tama: Enable remoteprocs
       [not found] <20220930191049.123256-1-konrad.dybcio@somainline.org>
                   ` (2 preceding siblings ...)
  2022-09-30 19:10 ` [PATCH 3/8] arm64: dts: qcom: sdm845-tama: Add regulator-system-load to l14a/l28a Konrad Dybcio
@ 2022-09-30 19:10 ` Konrad Dybcio
  2022-09-30 19:10 ` [PATCH 5/8] arm64: dts: qcom: sdm845-tama: Enable GPU Konrad Dybcio
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 16+ messages in thread
From: Konrad Dybcio @ 2022-09-30 19:10 UTC (permalink / raw)
  To: ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, devicetree,
	linux-kernel

Enable ADSP, CDSP, IPA, modem and Venus.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 .../dts/qcom/sdm845-sony-xperia-tama.dtsi     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
index 1c9cb1c3d8aa..b78a93f52d96 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -68,6 +68,11 @@ ramoops@ffc00000 {
 	};
 };
 
+&adsp_pas {
+	firmware-name = "qcom/sdm845/Sony/tama/adsp.mbn";
+	status = "okay";
+};
+
 &apps_rsc {
 	pm8998-rpmh-regulators {
 		compatible = "qcom,pm8998-rpmh-regulators";
@@ -328,6 +333,11 @@ vreg_s3c_0p6: smps3 {
 	};
 };
 
+&cdsp_pas {
+	firmware-name = "qcom/sdm845/Sony/tama/cdsp.mbn";
+	status = "okay";
+};
+
 &dsi0 {
 	vdda-supply = <&vreg_l26a_1p2>;
 	status = "okay";
@@ -444,6 +454,12 @@ &ibb {
 	regulator-pull-down;
 };
 
+&ipa {
+	memory-region = <&ipa_fw_mem>;
+	firmware-name = "qcom/sdm845/Sony/tama/ipa_fws.mbn";
+	status = "okay";
+};
+
 &lab {
 	regulator-min-microvolt = <5500000>;
 	regulator-max-microvolt = <5700000>;
@@ -458,6 +474,11 @@ &mdss {
 	status = "okay";
 };
 
+&mss_pil {
+	firmware-name = "qcom/sdm845/Sony/tama/mba.mbn", "qcom/sdm845/Sony/tama/modem.mbn";
+	status = "okay";
+};
+
 &pmi8998_wled {
 	default-brightness = <800>;
 	qcom,switching-freq = <800>;
@@ -599,3 +620,8 @@ &usb_1_hsphy {
 	vdda-pll-supply = <&vreg_l12a_1p8>;
 	vdda-phy-dpdm-supply = <&vreg_l24a_3p1>;
 };
+
+&venus {
+	firmware-name = "qcom/sdm845/Sony/tama/venus.mbn";
+	status = "okay";
+};
-- 
2.37.3


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

* [PATCH 5/8] arm64: dts: qcom: sdm845-tama: Enable GPU
       [not found] <20220930191049.123256-1-konrad.dybcio@somainline.org>
                   ` (3 preceding siblings ...)
  2022-09-30 19:10 ` [PATCH 4/8] arm64: dts: qcom: sdm845-tama: Enable remoteprocs Konrad Dybcio
@ 2022-09-30 19:10 ` Konrad Dybcio
  2022-09-30 19:10 ` [PATCH 6/8] arm64: dts: qcom: sdm845-tama: Enable GPI_DMA0/1 Konrad Dybcio
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 16+ messages in thread
From: Konrad Dybcio @ 2022-09-30 19:10 UTC (permalink / raw)
  To: ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, devicetree,
	linux-kernel

Enable the A630 GPU and its GMU.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
index b78a93f52d96..ba949b0466dc 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -386,6 +386,19 @@ &gcc {
 			<GCC_LPASS_SWAY_CLK>;
 };
 
+&gmu {
+	status = "okay";
+};
+
+&gpu {
+	status = "okay";
+
+	zap-shader {
+		memory-region = <&gpu_mem>;
+		firmware-name = "qcom/sdm845/Sony/tama/a630_zap.mbn";
+	};
+};
+
 &i2c5 {
 	clock-frequency = <400000>;
 	status = "okay";
-- 
2.37.3


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

* [PATCH 6/8] arm64: dts: qcom: sdm845-tama: Enable GPI_DMA0/1
       [not found] <20220930191049.123256-1-konrad.dybcio@somainline.org>
                   ` (4 preceding siblings ...)
  2022-09-30 19:10 ` [PATCH 5/8] arm64: dts: qcom: sdm845-tama: Enable GPU Konrad Dybcio
@ 2022-09-30 19:10 ` Konrad Dybcio
  2022-09-30 19:10 ` [PATCH 7/8] arm64: dts: qcom: sdm845: Don't use 0x in unit address Konrad Dybcio
  2022-09-30 19:10 ` [PATCH 8/8] arm64: dts: qcom: sdm845-akatsuki: Configure maXTouch touchscreen Konrad Dybcio
  7 siblings, 0 replies; 16+ messages in thread
From: Konrad Dybcio @ 2022-09-30 19:10 UTC (permalink / raw)
  To: ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, devicetree,
	linux-kernel

Enable both GPI DMAs.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
index ba949b0466dc..c7607d008b1c 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -390,6 +390,14 @@ &gmu {
 	status = "okay";
 };
 
+&gpi_dma0 {
+	status = "okay";
+};
+
+&gpi_dma1 {
+	status = "okay";
+};
+
 &gpu {
 	status = "okay";
 
-- 
2.37.3


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

* [PATCH 7/8] arm64: dts: qcom: sdm845: Don't use 0x in unit address
       [not found] <20220930191049.123256-1-konrad.dybcio@somainline.org>
                   ` (5 preceding siblings ...)
  2022-09-30 19:10 ` [PATCH 6/8] arm64: dts: qcom: sdm845-tama: Enable GPI_DMA0/1 Konrad Dybcio
@ 2022-09-30 19:10 ` Konrad Dybcio
  2022-09-30 19:10 ` [PATCH 8/8] arm64: dts: qcom: sdm845-akatsuki: Configure maXTouch touchscreen Konrad Dybcio
  7 siblings, 0 replies; 16+ messages in thread
From: Konrad Dybcio @ 2022-09-30 19:10 UTC (permalink / raw)
  To: ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, devicetree,
	linux-kernel

The gpi_dma1 node had the '0x' prefix in its unit address. Remove it,
as this is interpretet as hex anyway, and it's the preferred style.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index d761da47220d..0dcf713675dd 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -1636,7 +1636,7 @@ uart7: serial@89c000 {
 			};
 		};
 
-		gpi_dma1: dma-controller@0xa00000 {
+		gpi_dma1: dma-controller@a00000 {
 			#dma-cells = <3>;
 			compatible = "qcom,sdm845-gpi-dma";
 			reg = <0 0x00a00000 0 0x60000>;
-- 
2.37.3


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

* [PATCH 8/8] arm64: dts: qcom: sdm845-akatsuki: Configure maXTouch touchscreen
       [not found] <20220930191049.123256-1-konrad.dybcio@somainline.org>
                   ` (6 preceding siblings ...)
  2022-09-30 19:10 ` [PATCH 7/8] arm64: dts: qcom: sdm845: Don't use 0x in unit address Konrad Dybcio
@ 2022-09-30 19:10 ` Konrad Dybcio
  2022-10-01  8:53   ` Marijn Suijten
  7 siblings, 1 reply; 16+ messages in thread
From: Konrad Dybcio @ 2022-09-30 19:10 UTC (permalink / raw)
  To: ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Konrad Dybcio, Andy Gross, Bjorn Andersson,
	Rob Herring, Krzysztof Kozlowski, linux-arm-msm, devicetree,
	linux-kernel

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

Configure the maXTouch touchscreen found on Xperia XZ3 devices.

Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
[Konrad: clean up unused props, use generic node name]
---
 .../qcom/sdm845-sony-xperia-tama-akatsuki.dts | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
index 5c5949a51184..1668ae99dd47 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
@@ -25,6 +25,29 @@ ts_vddio_supply: ts-vddio-regulator {
 		gpio = <&tlmm 133 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 		regulator-boot-on;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&ts_vddio_en>;
+	};
+};
+
+&i2c5 {
+	status = "okay";
+
+	touchscreen: touchscreen@4a {
+		compatible = "atmel,maxtouch";
+		reg = <0x4a>;
+
+		interrupt-parent = <&tlmm>;
+		interrupts = <125 IRQ_TYPE_LEVEL_LOW>;
+
+		reset-gpios = <&tlmm 99 GPIO_ACTIVE_LOW>;
+		vdda-supply = <&vreg_l28a_2p8>;
+		vdd-supply = <&ts_vddio_supply>;
+
+		pinctrl-names = "default", "sleep";
+		pinctrl-0 = <&ts_default>;
+		pinctrl-1 = <&ts_sleep>;
 	};
 };
 
-- 
2.37.3


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

* Re: [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes
  2022-09-30 19:10 ` [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes Konrad Dybcio
@ 2022-09-30 20:10   ` Krzysztof Kozlowski
  2022-09-30 20:10     ` Konrad Dybcio
  2022-10-01 14:54   ` Marijn Suijten
  1 sibling, 1 reply; 16+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-30 20:10 UTC (permalink / raw)
  To: Konrad Dybcio, ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Andy Gross, Bjorn Andersson, Rob Herring,
	Krzysztof Kozlowski, linux-arm-msm, devicetree, linux-kernel

On 30/09/2022 21:10, Konrad Dybcio wrote:
> Add required nodes to support display on XZ2/XZ2c. XZ3 has a
> different power rail setup and needs to be handled separately.
> 
> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> ---
>  .../qcom/sdm845-sony-xperia-tama-akari.dts    |  4 +
>  .../qcom/sdm845-sony-xperia-tama-akatsuki.dts | 44 ++++++++-
>  .../qcom/sdm845-sony-xperia-tama-apollo.dts   |  6 ++
>  .../dts/qcom/sdm845-sony-xperia-tama.dtsi     | 96 +++++++++++++++++++
>  4 files changed, 149 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
> index 34f84f1f1eb4..d97b7f1e7140 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
> @@ -11,3 +11,7 @@ / {
>  	model = "Sony Xperia XZ2";
>  	compatible = "sony,akari-row", "qcom,sdm845";
>  };
> +
> +&panel {
> +	compatible = "sony,td4353-jdi-tama";

git grep suggests it is not documented. Is it coming via different patchset?

> +};
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> index 2f5e12deaada..2a16305ac5da 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> @@ -10,9 +10,51 @@
>  / {
>  	model = "Sony Xperia XZ3";
>  	compatible = "sony,akatsuki-row", "qcom,sdm845";
> +
> +	/* Fixed DCDC for the OLED panel */
> +	ts_vddio_supply: ts-vddio-regulator {
> +		compatible = "regulator-fixed";
> +		regulator-name = "ts_vddio";
> +
> +		regulator-min-microvolt = <1840000>;
> +		regulator-max-microvolt = <1840000>;
> +
> +		gpio = <&tlmm 133 GPIO_ACTIVE_HIGH>;
> +		enable-active-high;
> +		regulator-boot-on;
> +	};
> +};
> +
> +&ibb {
> +	status = "disabled";
> +};
> +
> +&lab {
> +	status = "disabled";
> +};
> +
> +&panel {
> +	/* Akatsuki uses an OLED panel. */
> +	/delete-property/ backlight;
> +	/delete-property/ vsp-supply;
> +	/delete-property/ vsn-supply;
> +	/delete-property/ treset-gpios;
> +};
> +
> +&pmi8998_wled {
> +	status = "disabled";
> +};
> +
> +&tlmm {
> +	ts_vddio_en: ts-vddio-en {

ts-vddio-en-state

DT schema is coming:
https://lore.kernel.org/linux-devicetree/20220930200529.331223-1-krzysztof.kozlowski@linaro.org/T/#t

> +		pins = "gpio133";
> +		function = "gpio";
> +		drive-strength = <2>;
> +		bias-disable;
> +		output-high;
> +	};

Best regards,
Krzysztof


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

* Re: [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes
  2022-09-30 20:10   ` Krzysztof Kozlowski
@ 2022-09-30 20:10     ` Konrad Dybcio
  2022-09-30 20:14       ` Krzysztof Kozlowski
  0 siblings, 1 reply; 16+ messages in thread
From: Konrad Dybcio @ 2022-09-30 20:10 UTC (permalink / raw)
  To: Krzysztof Kozlowski, ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Andy Gross, Bjorn Andersson, Rob Herring,
	Krzysztof Kozlowski, linux-arm-msm, devicetree, linux-kernel



On 30.09.2022 22:10, Krzysztof Kozlowski wrote:
> On 30/09/2022 21:10, Konrad Dybcio wrote:
>> Add required nodes to support display on XZ2/XZ2c. XZ3 has a
>> different power rail setup and needs to be handled separately.
>>
>> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
>> ---
>>  .../qcom/sdm845-sony-xperia-tama-akari.dts    |  4 +
>>  .../qcom/sdm845-sony-xperia-tama-akatsuki.dts | 44 ++++++++-
>>  .../qcom/sdm845-sony-xperia-tama-apollo.dts   |  6 ++
>>  .../dts/qcom/sdm845-sony-xperia-tama.dtsi     | 96 +++++++++++++++++++
>>  4 files changed, 149 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>> index 34f84f1f1eb4..d97b7f1e7140 100644
>> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>> @@ -11,3 +11,7 @@ / {
>>  	model = "Sony Xperia XZ2";
>>  	compatible = "sony,akari-row", "qcom,sdm845";
>>  };
>> +
>> +&panel {
>> +	compatible = "sony,td4353-jdi-tama";
> 
> git grep suggests it is not documented. Is it coming via different patchset?
As mentioned in the cover letter, yes.

> 
>> +};
>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
>> index 2f5e12deaada..2a16305ac5da 100644
>> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
>> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
>> @@ -10,9 +10,51 @@
>>  / {
>>  	model = "Sony Xperia XZ3";
>>  	compatible = "sony,akatsuki-row", "qcom,sdm845";
>> +
>> +	/* Fixed DCDC for the OLED panel */
>> +	ts_vddio_supply: ts-vddio-regulator {
>> +		compatible = "regulator-fixed";
>> +		regulator-name = "ts_vddio";
>> +
>> +		regulator-min-microvolt = <1840000>;
>> +		regulator-max-microvolt = <1840000>;
>> +
>> +		gpio = <&tlmm 133 GPIO_ACTIVE_HIGH>;
>> +		enable-active-high;
>> +		regulator-boot-on;
>> +	};
>> +};
>> +
>> +&ibb {
>> +	status = "disabled";
>> +};
>> +
>> +&lab {
>> +	status = "disabled";
>> +};
>> +
>> +&panel {
>> +	/* Akatsuki uses an OLED panel. */
>> +	/delete-property/ backlight;
>> +	/delete-property/ vsp-supply;
>> +	/delete-property/ vsn-supply;
>> +	/delete-property/ treset-gpios;
>> +};
>> +
>> +&pmi8998_wled {
>> +	status = "disabled";
>> +};
>> +
>> +&tlmm {
>> +	ts_vddio_en: ts-vddio-en {
> 
> ts-vddio-en-state
> 
> DT schema is coming:
> https://lore.kernel.org/linux-devicetree/20220930200529.331223-1-krzysztof.kozlowski@linaro.org/T/#t
Right, missed this one. Will fix.

Konrad
> 
>> +		pins = "gpio133";
>> +		function = "gpio";
>> +		drive-strength = <2>;
>> +		bias-disable;
>> +		output-high;
>> +	};
> 
> Best regards,
> Krzysztof
> 

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

* Re: [PATCH 2/8] arm64: dts: qcom: sdm845-tama: Add Synaptics Touchscreen
  2022-09-30 19:10 ` [PATCH 2/8] arm64: dts: qcom: sdm845-tama: Add Synaptics Touchscreen Konrad Dybcio
@ 2022-09-30 20:12   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 16+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-30 20:12 UTC (permalink / raw)
  To: Konrad Dybcio, ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Andy Gross, Bjorn Andersson, Rob Herring,
	Krzysztof Kozlowski, linux-arm-msm, devicetree, linux-kernel

On 30/09/2022 21:10, Konrad Dybcio wrote:
> Add required pins and RMI4 node to the common DT and remove it
> from Akatsuki, as it uses a different touch.
> 
> Since the panels are super high tech proprietary incell, they
> need to be handled with very precise timings. As such the panel
> driver sets up the power rails and GPIOs and the touchscreen
> driver *has to* probe afterwards.
> 

Thank you for your patch. There is something to discuss/improve.

> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> ---
>  .../qcom/sdm845-sony-xperia-tama-akatsuki.dts |  3 +
>  .../dts/qcom/sdm845-sony-xperia-tama.dtsi     | 69 ++++++++++++++++++-
>  2 files changed, 70 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> index 2a16305ac5da..5c5949a51184 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> @@ -7,6 +7,9 @@
>  
>  #include "sdm845-sony-xperia-tama.dtsi"
>  
> +/* XZ3 uses an Atmel touchscreen instead. */
> +/delete-node/ &touchscreen;
> +
>  / {
>  	model = "Sony Xperia XZ3";
>  	compatible = "sony,akatsuki-row", "qcom,sdm845";
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> index ac8eb59ed010..809a6d7e739b 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> @@ -375,10 +375,43 @@ &gcc {
>  };
>  
>  &i2c5 {
> -	status = "okay";
>  	clock-frequency = <400000>;
> +	status = "okay";
> +
> +	touchscreen: touchscreen@2c {
> +		compatible = "syna,rmi4-i2c";
> +		reg = <0x2c>;
> +
> +		interrupt-parent = <&tlmm>;
> +		interrupts = <125 IRQ_TYPE_EDGE_FALLING>;
> +		vdd-supply = <&vreg_l14a_1p8>;
> +		/*
> +		 * This is a blatant abuse of OF, but the panel driver *needs*
> +		 * to probe first, as the power/gpio switching needs to be precisely
> +		 * timed in order for both the display and touch panel to function properly.
> +		 */
> +		incell-supply = <&panel>;
> +
> +		syna,reset-delay-ms = <220>;
> +		syna,startup-delay-ms = <1000>;
> +
> +		pinctrl-names = "default", "sleep";
> +		pinctrl-0 = <&ts_default>;
> +		pinctrl-1 = <&ts_sleep>;
>  
> -	/* Synaptics touchscreen @ 2c, 3c */
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +
> +		rmi4-f01@1 {
> +			reg = <0x01>;
> +			syna,nosleep-mode = <1>;
> +		};
> +
> +		rmi4-f12@12 {
> +			reg = <0x12>;
> +			syna,sensor-type = <1>;
> +		};
> +	};
>  };
>  
>  &i2c10 {
> @@ -497,6 +530,38 @@ sde_te_active_sleep: sde-te-active-sleep-state {
>  		drive-strength = <2>;
>  		bias-pull-down;
>  	};
> +
> +	ts_default: ts-default-state {
> +		reset-pin {

"-pins" suffix, so "reset-pins" here and further.


Best regards,
Krzysztof


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

* Re: [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes
  2022-09-30 20:10     ` Konrad Dybcio
@ 2022-09-30 20:14       ` Krzysztof Kozlowski
  2022-09-30 20:16         ` Konrad Dybcio
  0 siblings, 1 reply; 16+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-30 20:14 UTC (permalink / raw)
  To: Konrad Dybcio, ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Andy Gross, Bjorn Andersson, Rob Herring,
	Krzysztof Kozlowski, linux-arm-msm, devicetree, linux-kernel

On 30/09/2022 22:10, Konrad Dybcio wrote:
> 
> 
> On 30.09.2022 22:10, Krzysztof Kozlowski wrote:
>> On 30/09/2022 21:10, Konrad Dybcio wrote:
>>> Add required nodes to support display on XZ2/XZ2c. XZ3 has a
>>> different power rail setup and needs to be handled separately.
>>>
>>> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
>>> ---
>>>  .../qcom/sdm845-sony-xperia-tama-akari.dts    |  4 +
>>>  .../qcom/sdm845-sony-xperia-tama-akatsuki.dts | 44 ++++++++-
>>>  .../qcom/sdm845-sony-xperia-tama-apollo.dts   |  6 ++
>>>  .../dts/qcom/sdm845-sony-xperia-tama.dtsi     | 96 +++++++++++++++++++
>>>  4 files changed, 149 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>>> index 34f84f1f1eb4..d97b7f1e7140 100644
>>> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>>> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>>> @@ -11,3 +11,7 @@ / {
>>>  	model = "Sony Xperia XZ2";
>>>  	compatible = "sony,akari-row", "qcom,sdm845";
>>>  };
>>> +
>>> +&panel {
>>> +	compatible = "sony,td4353-jdi-tama";
>>
>> git grep suggests it is not documented. Is it coming via different patchset?
> As mentioned in the cover letter, yes.

I didn't get it. Neither did lore:

https://lore.kernel.org/linux-devicetree/20220930191049.123256-1-konrad.dybcio@somainline.org/

"Message-ID <20220930191049.123256-1-konrad.dybcio@somainline.org>
not found"

Best regards,
Krzysztof


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

* Re: [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes
  2022-09-30 20:14       ` Krzysztof Kozlowski
@ 2022-09-30 20:16         ` Konrad Dybcio
  0 siblings, 0 replies; 16+ messages in thread
From: Konrad Dybcio @ 2022-09-30 20:16 UTC (permalink / raw)
  To: Krzysztof Kozlowski, ~postmarketos/upstreaming
  Cc: martin.botka, angelogioacchino.delregno, marijn.suijten,
	jamipkettunen, Andy Gross, Bjorn Andersson, Rob Herring,
	Krzysztof Kozlowski, linux-arm-msm, devicetree, linux-kernel



On 30.09.2022 22:14, Krzysztof Kozlowski wrote:
> On 30/09/2022 22:10, Konrad Dybcio wrote:
>>
>>
>> On 30.09.2022 22:10, Krzysztof Kozlowski wrote:
>>> On 30/09/2022 21:10, Konrad Dybcio wrote:
>>>> Add required nodes to support display on XZ2/XZ2c. XZ3 has a
>>>> different power rail setup and needs to be handled separately.
>>>>
>>>> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
>>>> ---
>>>>  .../qcom/sdm845-sony-xperia-tama-akari.dts    |  4 +
>>>>  .../qcom/sdm845-sony-xperia-tama-akatsuki.dts | 44 ++++++++-
>>>>  .../qcom/sdm845-sony-xperia-tama-apollo.dts   |  6 ++
>>>>  .../dts/qcom/sdm845-sony-xperia-tama.dtsi     | 96 +++++++++++++++++++
>>>>  4 files changed, 149 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>>>> index 34f84f1f1eb4..d97b7f1e7140 100644
>>>> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>>>> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>>>> @@ -11,3 +11,7 @@ / {
>>>>  	model = "Sony Xperia XZ2";
>>>>  	compatible = "sony,akari-row", "qcom,sdm845";
>>>>  };
>>>> +
>>>> +&panel {
>>>> +	compatible = "sony,td4353-jdi-tama";
>>>
>>> git grep suggests it is not documented. Is it coming via different patchset?
>> As mentioned in the cover letter, yes.
> 
> I didn't get it. Neither did lore:
> 
> https://lore.kernel.org/linux-devicetree/20220930191049.123256-1-konrad.dybcio@somainline.org/
> 
> "Message-ID <20220930191049.123256-1-konrad.dybcio@somainline.org>
> not found"
Ohh, I messed up while sending it.. it's available here though:

https://lists.sr.ht/~postmarketos/upstreaming/patches/35723

Konrad
> 
> Best regards,
> Krzysztof
> 

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

* Re: [PATCH 8/8] arm64: dts: qcom: sdm845-akatsuki: Configure maXTouch touchscreen
  2022-09-30 19:10 ` [PATCH 8/8] arm64: dts: qcom: sdm845-akatsuki: Configure maXTouch touchscreen Konrad Dybcio
@ 2022-10-01  8:53   ` Marijn Suijten
  0 siblings, 0 replies; 16+ messages in thread
From: Marijn Suijten @ 2022-10-01  8:53 UTC (permalink / raw)
  To: Konrad Dybcio
  Cc: ~postmarketos/upstreaming, martin.botka,
	angelogioacchino.delregno, jamipkettunen, Andy Gross,
	Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, linux-arm-msm,
	devicetree, linux-kernel

On 2022-09-30 21:10:49, Konrad Dybcio wrote:
> From: Marijn Suijten <marijn.suijten@somainline.org>
> 
> Configure the maXTouch touchscreen found on Xperia XZ3 devices.
> 
> Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org>
> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> [Konrad: clean up unused props, use generic node name]

We should make a note though to check if our touch controller supports
any of the possible values for atmel,wakeup-method, which is why this
patch wasn't sent yet.

- Marijn

> ---
>  .../qcom/sdm845-sony-xperia-tama-akatsuki.dts | 23 +++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> index 5c5949a51184..1668ae99dd47 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> @@ -25,6 +25,29 @@ ts_vddio_supply: ts-vddio-regulator {
>  		gpio = <&tlmm 133 GPIO_ACTIVE_HIGH>;
>  		enable-active-high;
>  		regulator-boot-on;
> +
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&ts_vddio_en>;
> +	};
> +};
> +
> +&i2c5 {
> +	status = "okay";
> +
> +	touchscreen: touchscreen@4a {
> +		compatible = "atmel,maxtouch";
> +		reg = <0x4a>;
> +
> +		interrupt-parent = <&tlmm>;
> +		interrupts = <125 IRQ_TYPE_LEVEL_LOW>;
> +
> +		reset-gpios = <&tlmm 99 GPIO_ACTIVE_LOW>;
> +		vdda-supply = <&vreg_l28a_2p8>;
> +		vdd-supply = <&ts_vddio_supply>;
> +
> +		pinctrl-names = "default", "sleep";
> +		pinctrl-0 = <&ts_default>;
> +		pinctrl-1 = <&ts_sleep>;
>  	};
>  };
>  
> -- 
> 2.37.3
> 

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

* Re: [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes
  2022-09-30 19:10 ` [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes Konrad Dybcio
  2022-09-30 20:10   ` Krzysztof Kozlowski
@ 2022-10-01 14:54   ` Marijn Suijten
  2022-10-01 20:02     ` Konrad Dybcio
  1 sibling, 1 reply; 16+ messages in thread
From: Marijn Suijten @ 2022-10-01 14:54 UTC (permalink / raw)
  To: Konrad Dybcio
  Cc: ~postmarketos/upstreaming, martin.botka,
	angelogioacchino.delregno, jamipkettunen, Andy Gross,
	Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, linux-arm-msm,
	devicetree, linux-kernel

On 2022-09-30 21:10:42, Konrad Dybcio wrote:
> Add required nodes to support display on XZ2/XZ2c. XZ3 has a
> different power rail setup and needs to be handled separately.
> 
> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> ---
>  .../qcom/sdm845-sony-xperia-tama-akari.dts    |  4 +
>  .../qcom/sdm845-sony-xperia-tama-akatsuki.dts | 44 ++++++++-
>  .../qcom/sdm845-sony-xperia-tama-apollo.dts   |  6 ++
>  .../dts/qcom/sdm845-sony-xperia-tama.dtsi     | 96 +++++++++++++++++++
>  4 files changed, 149 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
> index 34f84f1f1eb4..d97b7f1e7140 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
> @@ -11,3 +11,7 @@ / {
>  	model = "Sony Xperia XZ2";
>  	compatible = "sony,akari-row", "qcom,sdm845";
>  };
> +
> +&panel {
> +	compatible = "sony,td4353-jdi-tama";
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> index 2f5e12deaada..2a16305ac5da 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
> @@ -10,9 +10,51 @@
>  / {
>  	model = "Sony Xperia XZ3";
>  	compatible = "sony,akatsuki-row", "qcom,sdm845";
> +
> +	/* Fixed DCDC for the OLED panel */
> +	ts_vddio_supply: ts-vddio-regulator {
> +		compatible = "regulator-fixed";
> +		regulator-name = "ts_vddio";
> +
> +		regulator-min-microvolt = <1840000>;
> +		regulator-max-microvolt = <1840000>;
> +
> +		gpio = <&tlmm 133 GPIO_ACTIVE_HIGH>;
> +		enable-active-high;
> +		regulator-boot-on;
> +	};
> +};
> +
> +&ibb {
> +	status = "disabled";
> +};
> +
> +&lab {
> +	status = "disabled";
> +};
> +
> +&panel {
> +	/* Akatsuki uses an OLED panel. */
> +	/delete-property/ backlight;
> +	/delete-property/ vsp-supply;
> +	/delete-property/ vsn-supply;
> +	/delete-property/ treset-gpios;

This looks to have been a last-minute rename to

    touch-reset-gpios

> +};
> +
> +&pmi8998_wled {
> +	status = "disabled";
> +};
> +
> +&tlmm {
> +	ts_vddio_en: ts-vddio-en {
> +		pins = "gpio133";
> +		function = "gpio";
> +		drive-strength = <2>;
> +		bias-disable;
> +		output-high;
> +	};
>  };
>  
> -/* For the future: WLED + LAB/IBB/OLEDB are not used on Akatsuki */
>  &vreg_l14a_1p8 {
>  	regulator-min-microvolt = <1840000>;
>  	regulator-max-microvolt = <1840000>;
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts
> index c9e62c72f60e..cd056f78070f 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts
> @@ -11,3 +11,9 @@ / {
>  	model = "Sony Xperia XZ2 Compact";
>  	compatible = "sony,apollo-row", "qcom,sdm845";
>  };
> +
> +&panel {
> +	compatible = "sony,td4353-jdi-tama";
> +	height-mm = <112>;
> +	width-mm = <56>;
> +};
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> index 51ee42e3c995..ac8eb59ed010 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
> @@ -326,6 +326,46 @@ vreg_s3c_0p6: smps3 {
>  	};
>  };
>  
> +&dsi0 {
> +	vdda-supply = <&vreg_l26a_1p2>;
> +	status = "okay";
> +
> +	panel: panel@0 {
> +		/* The compatible is assigned in device DTs. */
> +		reg = <0>;
> +
> +		backlight = <&pmi8998_wled>;
> +		vddio-supply = <&vreg_l14a_1p8>;
> +		vsp-supply = <&lab>;
> +		vsn-supply = <&ibb>;
> +		panel-reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
> +		touch-reset-gpios = <&tlmm 99 GPIO_ACTIVE_HIGH>;

Here.

- Marijn

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

* Re: [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes
  2022-10-01 14:54   ` Marijn Suijten
@ 2022-10-01 20:02     ` Konrad Dybcio
  0 siblings, 0 replies; 16+ messages in thread
From: Konrad Dybcio @ 2022-10-01 20:02 UTC (permalink / raw)
  To: Marijn Suijten
  Cc: ~postmarketos/upstreaming, martin.botka,
	angelogioacchino.delregno, jamipkettunen, Andy Gross,
	Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, linux-arm-msm,
	devicetree, linux-kernel



On 1.10.2022 16:54, Marijn Suijten wrote:
> On 2022-09-30 21:10:42, Konrad Dybcio wrote:
>> Add required nodes to support display on XZ2/XZ2c. XZ3 has a
>> different power rail setup and needs to be handled separately.
>>
>> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
>> ---
>>  .../qcom/sdm845-sony-xperia-tama-akari.dts    |  4 +
>>  .../qcom/sdm845-sony-xperia-tama-akatsuki.dts | 44 ++++++++-
>>  .../qcom/sdm845-sony-xperia-tama-apollo.dts   |  6 ++
>>  .../dts/qcom/sdm845-sony-xperia-tama.dtsi     | 96 +++++++++++++++++++
>>  4 files changed, 149 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>> index 34f84f1f1eb4..d97b7f1e7140 100644
>> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akari.dts
>> @@ -11,3 +11,7 @@ / {
>>  	model = "Sony Xperia XZ2";
>>  	compatible = "sony,akari-row", "qcom,sdm845";
>>  };
>> +
>> +&panel {
>> +	compatible = "sony,td4353-jdi-tama";
>> +};
>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
>> index 2f5e12deaada..2a16305ac5da 100644
>> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
>> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts
>> @@ -10,9 +10,51 @@
>>  / {
>>  	model = "Sony Xperia XZ3";
>>  	compatible = "sony,akatsuki-row", "qcom,sdm845";
>> +
>> +	/* Fixed DCDC for the OLED panel */
>> +	ts_vddio_supply: ts-vddio-regulator {
>> +		compatible = "regulator-fixed";
>> +		regulator-name = "ts_vddio";
>> +
>> +		regulator-min-microvolt = <1840000>;
>> +		regulator-max-microvolt = <1840000>;
>> +
>> +		gpio = <&tlmm 133 GPIO_ACTIVE_HIGH>;
>> +		enable-active-high;
>> +		regulator-boot-on;
>> +	};
>> +};
>> +
>> +&ibb {
>> +	status = "disabled";
>> +};
>> +
>> +&lab {
>> +	status = "disabled";
>> +};
>> +
>> +&panel {
>> +	/* Akatsuki uses an OLED panel. */
>> +	/delete-property/ backlight;
>> +	/delete-property/ vsp-supply;
>> +	/delete-property/ vsn-supply;
>> +	/delete-property/ treset-gpios;
> 
> This looks to have been a last-minute rename to
> 
>     touch-reset-gpios
Yep!

Konrad
> 
>> +};
>> +
>> +&pmi8998_wled {
>> +	status = "disabled";
>> +};
>> +
>> +&tlmm {
>> +	ts_vddio_en: ts-vddio-en {
>> +		pins = "gpio133";
>> +		function = "gpio";
>> +		drive-strength = <2>;
>> +		bias-disable;
>> +		output-high;
>> +	};
>>  };
>>  
>> -/* For the future: WLED + LAB/IBB/OLEDB are not used on Akatsuki */
>>  &vreg_l14a_1p8 {
>>  	regulator-min-microvolt = <1840000>;
>>  	regulator-max-microvolt = <1840000>;
>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts
>> index c9e62c72f60e..cd056f78070f 100644
>> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts
>> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama-apollo.dts
>> @@ -11,3 +11,9 @@ / {
>>  	model = "Sony Xperia XZ2 Compact";
>>  	compatible = "sony,apollo-row", "qcom,sdm845";
>>  };
>> +
>> +&panel {
>> +	compatible = "sony,td4353-jdi-tama";
>> +	height-mm = <112>;
>> +	width-mm = <56>;
>> +};
>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
>> index 51ee42e3c995..ac8eb59ed010 100644
>> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
>> @@ -326,6 +326,46 @@ vreg_s3c_0p6: smps3 {
>>  	};
>>  };
>>  
>> +&dsi0 {
>> +	vdda-supply = <&vreg_l26a_1p2>;
>> +	status = "okay";
>> +
>> +	panel: panel@0 {
>> +		/* The compatible is assigned in device DTs. */
>> +		reg = <0>;
>> +
>> +		backlight = <&pmi8998_wled>;
>> +		vddio-supply = <&vreg_l14a_1p8>;
>> +		vsp-supply = <&lab>;
>> +		vsn-supply = <&ibb>;
>> +		panel-reset-gpios = <&tlmm 6 GPIO_ACTIVE_HIGH>;
>> +		touch-reset-gpios = <&tlmm 99 GPIO_ACTIVE_HIGH>;
> 
> Here.
> 
> - Marijn

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

end of thread, other threads:[~2022-10-01 20:02 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20220930191049.123256-1-konrad.dybcio@somainline.org>
2022-09-30 19:10 ` [PATCH 1/8] arm64: dts: qcom: sdm845-tama: Add display nodes Konrad Dybcio
2022-09-30 20:10   ` Krzysztof Kozlowski
2022-09-30 20:10     ` Konrad Dybcio
2022-09-30 20:14       ` Krzysztof Kozlowski
2022-09-30 20:16         ` Konrad Dybcio
2022-10-01 14:54   ` Marijn Suijten
2022-10-01 20:02     ` Konrad Dybcio
2022-09-30 19:10 ` [PATCH 2/8] arm64: dts: qcom: sdm845-tama: Add Synaptics Touchscreen Konrad Dybcio
2022-09-30 20:12   ` Krzysztof Kozlowski
2022-09-30 19:10 ` [PATCH 3/8] arm64: dts: qcom: sdm845-tama: Add regulator-system-load to l14a/l28a Konrad Dybcio
2022-09-30 19:10 ` [PATCH 4/8] arm64: dts: qcom: sdm845-tama: Enable remoteprocs Konrad Dybcio
2022-09-30 19:10 ` [PATCH 5/8] arm64: dts: qcom: sdm845-tama: Enable GPU Konrad Dybcio
2022-09-30 19:10 ` [PATCH 6/8] arm64: dts: qcom: sdm845-tama: Enable GPI_DMA0/1 Konrad Dybcio
2022-09-30 19:10 ` [PATCH 7/8] arm64: dts: qcom: sdm845: Don't use 0x in unit address Konrad Dybcio
2022-09-30 19:10 ` [PATCH 8/8] arm64: dts: qcom: sdm845-akatsuki: Configure maXTouch touchscreen Konrad Dybcio
2022-10-01  8:53   ` Marijn Suijten

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).