devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Konrad Dybcio <konrad.dybcio@linaro.org>
To: Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Conor Dooley <conor+dt@kernel.org>,
	Kees Cook <keescook@chromium.org>,
	Tony Luck <tony.luck@intel.com>,
	"Guilherme G. Piccoli" <gpiccoli@igalia.com>
Cc: Marijn Suijten <marijn.suijten@somainline.org>,
	linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
	linux-hardening@vger.kernel.org,
	Konrad Dybcio <konrad.dybcio@linaro.org>
Subject: [PATCH 5/5] arm64: dts: qcom: Add Sony Xperia 10 V (PDX235) support
Date: Fri, 18 Aug 2023 17:23:28 +0200	[thread overview]
Message-ID: <20230818-topic-10v-v1-5-dbb6464223c6@linaro.org> (raw)
In-Reply-To: <20230818-topic-10v-v1-0-dbb6464223c6@linaro.org>

10 V is a carbon copy of the 10 IV, sans:

- camera setup (V obviously has a new, better one)
- the phone's body and SIM/sdcard tray changed a bit
- SM5038 is gone, PMIC QGauge is used for battery monitoring
- some wires may be routed differently (e.g. i2c devices are routed to
  different hosts)
- possibly some small other differences that we're about to discover

Introduce support for PDX235, currently requiring zero changes other
than adding msm-id and board-id, which seems to be the result of Sony
(or their chinese ODM) fusing in a non-zero value in there..

All of the flashing and prepwork shenanigans described in
Commit 4420e60416cb ("arm64: dts: qcom: Add device tree for Sony Xperia
10 IV") are also necessary on this device :/

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 arch/arm64/boot/dts/qcom/Makefile                  |  1 +
 .../dts/qcom/sm6375-sony-xperia-murray-pdx235.dts  | 54 ++++++++++++++++++++++
 .../boot/dts/qcom/sm6375-sony-xperia-murray.dtsi   |  2 +-
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 2cca20563a1d..832b4acb20dd 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -196,6 +196,7 @@ dtb-$(CONFIG_ARCH_QCOM)	+= sm6125-sony-xperia-seine-pdx201.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm6125-xiaomi-laurel-sprout.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm6350-sony-xperia-lena-pdx213.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm6375-sony-xperia-murray-pdx225.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sm6375-sony-xperia-murray-pdx235.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm7225-fairphone-fp4.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm8150-hdk.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm8150-microsoft-surface-duo.dtb
diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx235.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx235.dts
new file mode 100644
index 000000000000..80a61961e5c5
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx235.dts
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023, Konrad Dybcio <konrad.dybcio@linaro.org>
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/arm/qcom,ids.h>
+
+#include "sm6375-sony-xperia-murray.dtsi"
+
+/ {
+	model = "Sony Xperia 10 V";
+	compatible = "sony,pdx235", "qcom,sm6375";
+	chassis-type = "handset";
+	qcom,msm-id = <QCOM_ID_SM6375 0x10000>;
+	qcom,board-id = <QCOM_BOARD_ID(QRD, 0x1, 0x0) 0x0>;
+
+	aliases {
+		i2c0 = &i2c0;
+		i2c1 = &i2c7;
+		i2c2 = &i2c10;
+		i2c3 = &i2c8;
+	};
+};
+
+&i2c0 {
+	clock-frequency = <400000>;
+	status = "okay";
+
+	/* NXP SN2x0 NFC @ 28. (or on &spi2.. TBD!) */
+};
+
+&i2c7 {
+	clock-frequency = <400000>;
+	status = "okay";
+
+	/* Awinic AW882xx audio amplifier ("channel 0") @ 34 */
+};
+
+/* I2C8 inherited from common DTSI */
+
+&i2c10 {
+	clock-frequency = <400000>;
+	status = "okay";
+
+	/* Awinic AW882xx audio amplifier ("channel 1") @ 34 */
+	/* PM8008 @ 8, 9 */
+};
+
+/* For reasons yet unknown, it's broken on the mark V.. */
+&touchscreen {
+	status = "fail";
+};
diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi
index 072f7ce2a7f6..243e60d9bbb5 100644
--- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi
@@ -123,7 +123,7 @@ &i2c8 {
 	clock-frequency = <400000>;
 	status = "okay";
 
-	touchscreen@48 {
+	touchscreen: touchscreen@48 {
 		compatible = "samsung,s6sy761";
 		reg = <0x48>;
 		interrupt-parent = <&tlmm>;

-- 
2.41.0


  parent reply	other threads:[~2023-08-18 15:25 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-18 15:23 [PATCH 0/5] Xperia 10 V support Konrad Dybcio
2023-08-18 15:23 ` [PATCH 1/5] dt-bindings: qcom: Add Sony Xperia 10 V Konrad Dybcio
2023-08-19  9:36   ` Krzysztof Kozlowski
2023-08-21 16:08     ` Konrad Dybcio
2023-08-18 15:23 ` [PATCH 2/5] arm64: dts: qcom: sm6375: Fix I2C10 GPIO function Konrad Dybcio
2023-08-18 15:23 ` [PATCH 3/5] arm64: dts: qcom: sm6375: Hook up I2C7 GPIOs Konrad Dybcio
2023-08-18 15:23 ` [PATCH 4/5] arm64: dts: qcom: sm6375-murray: Separate out common parts Konrad Dybcio
2023-08-18 15:23 ` Konrad Dybcio [this message]
2023-08-23 18:03   ` [PATCH 5/5] arm64: dts: qcom: Add Sony Xperia 10 V (PDX235) support Marijn Suijten

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230818-topic-10v-v1-5-dbb6464223c6@linaro.org \
    --to=konrad.dybcio@linaro.org \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=gpiccoli@igalia.com \
    --cc=keescook@chromium.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=krzysztof.kozlowski@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-hardening@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marijn.suijten@somainline.org \
    --cc=robh+dt@kernel.org \
    --cc=tony.luck@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).