[PATCH 0/5] Xperia 10 V support

[PATCH 0/5] Xperia 10 V support

[Konrad Dybcio]

This series brings support for the new Sony Xperia 10 V and with it a
couple of improvements to sm6375.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
Konrad Dybcio (5):
      dt-bindings: qcom: Add Sony Xperia 10 V
      arm64: dts: qcom: sm6375: Fix I2C10 GPIO function
      arm64: dts: qcom: sm6375: Hook up I2C7 GPIOs
      arm64: dts: qcom: sm6375-murray: Separate out common parts
      arm64: dts: qcom: Add Sony Xperia 10 V (PDX235) support

 Documentation/devicetree/bindings/arm/qcom.yaml    |   2 +
 arch/arm64/boot/dts/qcom/Makefile                  |   1 +
 .../dts/qcom/sm6375-sony-xperia-murray-pdx225.dts  | 421 +-------------------
 .../dts/qcom/sm6375-sony-xperia-murray-pdx235.dts  |  54 +++
 .../boot/dts/qcom/sm6375-sony-xperia-murray.dtsi   | 427 +++++++++++++++++++++
 arch/arm64/boot/dts/qcom/sm6375.dtsi               |  11 +-
 6 files changed, 495 insertions(+), 421 deletions(-)
---
base-commit: 7271b2a530428b879443b274c191b34536a4ea11
change-id: 20230818-topic-10v-0cc56efaed42

Best regards,
-- 
Konrad Dybcio <konrad.dybcio@linaro.org>

[PATCH 1/5] dt-bindings: qcom: Add Sony Xperia 10 V

[Konrad Dybcio]

The SM6375-based Xperia 10 V is veeery similar to the previous year 10 IV,
sharing a common base motherboard design.

The software configuration however is somewhat different, which requires
us to allow using qcom,msm/board-id on sm6375. Sad.

Document the device.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 Documentation/devicetree/bindings/arm/qcom.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
index adbfaea32343..766d7e1c9db3 100644
--- a/Documentation/devicetree/bindings/arm/qcom.yaml
+++ b/Documentation/devicetree/bindings/arm/qcom.yaml
@@ -941,6 +941,7 @@ properties:
       - items:
           - enum:
               - sony,pdx225
+              - sony,pdx235
           - const: qcom,sm6375
 
       - items:
@@ -1086,6 +1087,7 @@ allOf:
               - qcom,sm6115
               - qcom,sm6125
               - qcom,sm6350
+              - qcom,sm6375
               - qcom,sm7225
               - qcom,sm8150
               - qcom,sm8250

-- 
2.41.0

[PATCH 2/5] arm64: dts: qcom: sm6375: Fix I2C10 GPIO function

[Konrad Dybcio]

Unfortunately, as mentioned in a comment under a different node in the
device tree, the pinctrl driver's naming doesn't really match up with
actual QUP indices..

Assign the correct one for I2C10.

Fixes: 704edf03c022 ("arm64: dts: qcom: sm6375: Add pin configs for some QUP configurations")
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm6375.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/sm6375.dtsi b/arch/arm64/boot/dts/qcom/sm6375.dtsi
index e7ff55443da7..4364b144eb93 100644
--- a/arch/arm64/boot/dts/qcom/sm6375.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6375.dtsi
@@ -885,7 +885,7 @@ qup_i2c8_default: qup-i2c8-default-state {
 
 			qup_i2c10_default: qup-i2c10-default-state {
 				pins = "gpio4", "gpio5";
-				function = "qup10";
+				function = "qup14";
 				drive-strength = <2>;
 				bias-pull-up;
 			};

-- 
2.41.0

[PATCH 3/5] arm64: dts: qcom: sm6375: Hook up I2C7 GPIOs

[Konrad Dybcio]

It's required to mux the GPIOs to a correct function to make sure
the I2C host can communicate with the devices on the other end.

Ensure that happens.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm6375.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm6375.dtsi b/arch/arm64/boot/dts/qcom/sm6375.dtsi
index 4364b144eb93..b79908d969c7 100644
--- a/arch/arm64/boot/dts/qcom/sm6375.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6375.dtsi
@@ -875,6 +875,13 @@ qup_i2c2_default: qup-i2c2-default-state {
 				bias-pull-up;
 			};
 
+			qup_i2c7_default: qup-i2c7-default-state {
+				pins = "gpio27", "gpio28";
+				function = "qup11_f1";
+				drive-strength = <2>;
+				bias-pull-up;
+			};
+
 			qup_i2c8_default: qup-i2c8-default-state {
 				pins = "gpio19", "gpio20";
 				/* TLMM, GCC and vendor DT all have different indices.. */
@@ -1220,6 +1227,8 @@ i2c7: i2c@4c84000 {
 				clock-names = "se";
 				clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
 				interrupts = <GIC_SPI 508 IRQ_TYPE_LEVEL_HIGH>;
+				pinctrl-0 = <&qup_i2c7_default>;
+				pinctrl-names = "default";
 				dmas = <&gpi_dma1 0 1 QCOM_GPI_I2C>,
 				       <&gpi_dma1 1 1 QCOM_GPI_I2C>;
 				dma-names = "tx", "rx";

-- 
2.41.0

[PATCH 4/5] arm64: dts: qcom: sm6375-murray: Separate out common parts

[Konrad Dybcio]

There's a new kid in the Murray family, let's make space for it!

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 .../dts/qcom/sm6375-sony-xperia-murray-pdx225.dts  | 421 +-------------------
 .../boot/dts/qcom/sm6375-sony-xperia-murray.dtsi   | 427 +++++++++++++++++++++
 2 files changed, 428 insertions(+), 420 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
index b2f1bb1d58e9..bcbef6ed7006 100644
--- a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
+++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray-pdx225.dts
@@ -5,429 +5,10 @@
 
 /dts-v1/;
 
-/* PMK8350 is configured to use SID6 instead of 0 */
-#define PMK8350_SID 6
-
-#include <dt-bindings/gpio/gpio.h>
-#include "sm6375.dtsi"
-#include "pm6125.dtsi"
-#include "pmk8350.dtsi"
-#include "pmr735a.dtsi"
-
-/* PM6125 PON is used and we can't have duplicate labels */
-/delete-node/ &pmk8350_pon;
+#include "sm6375-sony-xperia-murray.dtsi"
 
 / {
 	model = "Sony Xperia 10 IV";
 	compatible = "sony,pdx225", "qcom,sm6375";
 	chassis-type = "handset";
-
-	chosen {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		framebuffer: framebuffer@85200000 {
-			compatible = "simple-framebuffer";
-			reg = <0 0x85200000 0 0xc00000>;
-
-			width = <1080>;
-			height = <2520>;
-			stride = <(1080 * 4)>;
-			format = "a8r8g8b8";
-			/*
-			 * That's (going to be) a lot of clocks, but it's necessary due
-			 * to unused clk cleanup & no panel driver yet
-			 */
-			clocks = <&gcc GCC_DISP_AHB_CLK>,
-				 <&gcc GCC_DISP_HF_AXI_CLK>,
-				 <&gcc GCC_DISP_THROTTLE_CORE_CLK>,
-				 <&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>;
-		};
-	};
-
-	gpio-keys {
-		compatible = "gpio-keys";
-		label = "gpio-keys";
-
-		pinctrl-0 = <&vol_down_n>;
-		pinctrl-names = "default";
-
-		key-volume-down {
-			label = "Volume Down";
-			linux,code = <KEY_VOLUMEDOWN>;
-			gpios = <&pmr735a_gpios 1 GPIO_ACTIVE_LOW>;
-			debounce-interval = <15>;
-			linux,can-disable;
-			wakeup-source;
-		};
-	};
-
-	reserved-memory {
-		cont_splash_mem: memory@85200000 {
-			reg = <0 0x85200000 0 0xc00000>;
-			no-map;
-		};
-
-		ramoops@ffc40000 {
-			compatible = "ramoops";
-			reg = <0 0xffc40000 0 0xb0000>;
-			record-size = <0x10000>;
-			console-size = <0x60000>;
-			ftrace-size = <0x10000>;
-			pmsg-size = <0x20000>;
-			ecc-size = <16>;
-		};
-	};
-
-	vph_pwr: vph-pwr-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vph_pwr";
-		regulator-min-microvolt = <3700000>;
-		regulator-max-microvolt = <3700000>;
-		regulator-always-on;
-		regulator-boot-on;
-	};
-};
-
-&sdc2_off_state {
-	sd-cd-pins {
-		pins = "gpio94";
-		function = "gpio";
-		drive-strength = <2>;
-		bias-disable;
-	};
-};
-
-&sdc2_on_state {
-	sd-cd-pins {
-		pins = "gpio94";
-		function = "gpio";
-		drive-strength = <2>;
-		bias-pull-up;
-	};
-};
-
-&sdhc_2 {
-	status = "okay";
-
-	vmmc-supply = <&pm6125_l22>;
-	vqmmc-supply = <&pm6125_l5>;
-
-	cd-gpios = <&tlmm 94 GPIO_ACTIVE_HIGH>;
-};
-
-&gpi_dma0 {
-	status = "okay";
-};
-
-&gpi_dma1 {
-	status = "okay";
-};
-
-&i2c8 {
-	clock-frequency = <400000>;
-	status = "okay";
-
-	touchscreen@48 {
-		compatible = "samsung,s6sy761";
-		reg = <0x48>;
-		interrupt-parent = <&tlmm>;
-		interrupts = <22 0x2008>;
-
-		vdd-supply = <&pm6125_l13>;
-
-		pinctrl-names = "default";
-		pinctrl-0 = <&ts_int_default &ts_avdd_default>;
-	};
-};
-
-&pmk8350_adc_tm {
-	status = "okay";
-};
-
-&pmk8350_rtc {
-	status = "okay";
-};
-
-&pmr735a_gpios {
-	vol_down_n: vol-down-n-state {
-		pins = "gpio1";
-		function = "normal";
-		power-source = <1>;
-		bias-pull-up;
-		input-enable;
-	};
-};
-
-&pon_pwrkey {
-	status = "okay";
-};
-
-&pon_resin {
-	linux,code = <KEY_VOLUMEUP>;
-	status = "okay";
-};
-
-&qupv3_id_0 {
-	status = "okay";
-};
-
-&qupv3_id_1 {
-	status = "okay";
-};
-
-&remoteproc_adsp {
-	firmware-name = "qcom/sm6375/Sony/murray/adsp.mbn";
-	status = "okay";
-};
-
-&remoteproc_cdsp {
-	firmware-name = "qcom/sm6375/Sony/murray/cdsp.mbn";
-	status = "okay";
-};
-
-&rpm_requests {
-	regulators-0 {
-		compatible = "qcom,rpm-pm6125-regulators";
-
-		pm6125_s5: s5 {
-			regulator-min-microvolt = <382000>;
-			regulator-max-microvolt = <1120000>;
-		};
-
-		pm6125_s6: s6 {
-			regulator-min-microvolt = <320000>;
-			regulator-max-microvolt = <1374000>;
-		};
-
-		pm6125_s7: s7 {
-			regulator-min-microvolt = <1574000>;
-			regulator-max-microvolt = <2040000>;
-		};
-
-		/*
-		 * S8 is VDD_GFX
-		 * L1 is VDD_LPI_CX
-		 */
-
-		pm6125_l2: l2 {
-			regulator-min-microvolt = <1170000>;
-			regulator-max-microvolt = <1304000>;
-		};
-
-		pm6125_l3: l3 {
-			regulator-min-microvolt = <1100000>;
-			regulator-max-microvolt = <1300000>;
-		};
-
-		pm6125_l4: l4 {
-			regulator-min-microvolt = <1100000>;
-			regulator-max-microvolt = <1300000>;
-		};
-
-		pm6125_l5: l5 {
-			regulator-min-microvolt = <1650000>;
-			regulator-max-microvolt = <2960000>;
-			regulator-allow-set-load;
-		};
-
-		pm6125_l6: l6 {
-			regulator-min-microvolt = <1080000>;
-			regulator-max-microvolt = <1304000>;
-		};
-
-		pm6125_l7: l7 {
-			regulator-min-microvolt = <720000>;
-			regulator-max-microvolt = <1050000>;
-		};
-
-		pm6125_l8: l8 {
-			regulator-min-microvolt = <1100000>;
-			regulator-max-microvolt = <1304000>;
-		};
-
-		pm6125_l9: l9 {
-			regulator-min-microvolt = <1504000>;
-			regulator-max-microvolt = <2000000>;
-		};
-
-		pm6125_l10: l10 {
-			regulator-min-microvolt = <1620000>;
-			regulator-max-microvolt = <1980000>;
-		};
-
-		pm6125_l11: l11 {
-			regulator-min-microvolt = <1620000>;
-			regulator-max-microvolt = <1980000>;
-		};
-
-		pm6125_l12: l12 {
-			regulator-min-microvolt = <1620000>;
-			regulator-max-microvolt = <2000000>;
-		};
-
-		pm6125_l13: l13 {
-			regulator-min-microvolt = <1650000>;
-			regulator-max-microvolt = <1980000>;
-		};
-
-		pm6125_l14: l14 {
-			regulator-min-microvolt = <1700000>;
-			regulator-max-microvolt = <1900000>;
-		};
-
-		pm6125_l15: l15 {
-			regulator-min-microvolt = <1650000>;
-			regulator-max-microvolt = <3544000>;
-		};
-
-		pm6125_l16: l16 {
-			regulator-min-microvolt = <1620000>;
-			regulator-max-microvolt = <1980000>;
-		};
-
-		/* L17 is VDD_LPI_MX */
-
-		pm6125_l18: l18 {
-			regulator-min-microvolt = <830000>;
-			regulator-max-microvolt = <920000>;
-		};
-
-		pm6125_l19: l19 {
-			regulator-min-microvolt = <1624000>;
-			regulator-max-microvolt = <3304000>;
-		};
-
-		pm6125_l20: l20 {
-			regulator-min-microvolt = <1624000>;
-			regulator-max-microvolt = <3304000>;
-		};
-
-		pm6125_l21: l21 {
-			regulator-min-microvolt = <3000000>;
-			regulator-max-microvolt = <3400000>;
-		};
-
-		pm6125_l22: l22 {
-			regulator-min-microvolt = <2704000>;
-			regulator-max-microvolt = <2960000>;
-			regulator-allow-set-load;
-		};
-
-		pm6125_l23: l23 {
-			regulator-min-microvolt = <3000000>;
-			regulator-max-microvolt = <3400000>;
-		};
-
-		pm6125_l24: l24 {
-			regulator-min-microvolt = <2704000>;
-			regulator-max-microvolt = <3544000>;
-		};
-	};
-
-	regulators-1 {
-		compatible = "qcom,rpm-pmr735a-regulators";
-
-		/*
-		 * S1 is VDD_MX
-		 * S2 is VDD_CX
-		 */
-
-		pmr735a_l1: l1 {
-			regulator-min-microvolt = <570000>;
-			regulator-max-microvolt = <650000>;
-		};
-
-		pmr735a_l2: l2 {
-			regulator-min-microvolt = <352000>;
-			regulator-max-microvolt = <796000>;
-		};
-
-		pmr735a_l3: l3 {
-			regulator-min-microvolt = <1000000>;
-			regulator-max-microvolt = <1200000>;
-		};
-
-		pmr735a_l4: l4 {
-			regulator-min-microvolt = <1504000>;
-			regulator-max-microvolt = <2000000>;
-		};
-
-		pmr735a_l5: l5 {
-			regulator-min-microvolt = <751000>;
-			regulator-max-microvolt = <824000>;
-		};
-
-		pmr735a_l6: l6 {
-			regulator-min-microvolt = <504000>;
-			regulator-max-microvolt = <868000>;
-		};
-
-		pmr735a_l7: l7 {
-			regulator-min-microvolt = <2700000>;
-			regulator-max-microvolt = <3544000>;
-		};
-	};
-};
-
-&sdc2_off_state {
-	sd-cd-pins {
-		pins = "gpio94";
-		function = "gpio";
-		drive-strength = <2>;
-		bias-disable;
-	};
-};
-
-&sdc2_on_state {
-	sd-cd-pins {
-		pins = "gpio94";
-		function = "gpio";
-		drive-strength = <2>;
-		bias-pull-up;
-	};
-};
-
-&sdhc_2 {
-	status = "okay";
-
-	vmmc-supply = <&pm6125_l22>;
-	vqmmc-supply = <&pm6125_l5>;
-
-	cd-gpios = <&tlmm 94 GPIO_ACTIVE_HIGH>;
-};
-
-&tlmm {
-	gpio-reserved-ranges = <13 4>;
-
-	ts_int_default: ts-int-default-state {
-		pins = "gpio22";
-		function = "gpio";
-		drive-strength = <8>;
-		bias-pull-up;
-	};
-
-	ts_avdd_default: ts-avdd-default-state {
-		pins = "gpio59";
-		function = "gpio";
-		drive-strength = <8>;
-		output-high;
-	};
-};
-
-&usb_1 {
-	status = "okay";
-};
-
-&usb_1_dwc3 {
-	dr_mode = "peripheral";
-};
-
-&usb_1_hsphy {
-	status = "okay";
-};
-
-&xo_board_clk {
-	clock-frequency = <19200000>;
 };
diff --git a/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi
new file mode 100644
index 000000000000..072f7ce2a7f6
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm6375-sony-xperia-murray.dtsi
@@ -0,0 +1,427 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2022, Konrad Dybcio <konrad.dybcio@somainline.org>
+ */
+
+/* PMK8350 is configured to use SID6 instead of 0 */
+#define PMK8350_SID 6
+
+#include <dt-bindings/gpio/gpio.h>
+#include "sm6375.dtsi"
+#include "pm6125.dtsi"
+#include "pmk8350.dtsi"
+#include "pmr735a.dtsi"
+
+/* PM6125 PON is used and we can't have duplicate labels */
+/delete-node/ &pmk8350_pon;
+
+/ {
+	chosen {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		framebuffer: framebuffer@85200000 {
+			compatible = "simple-framebuffer";
+			reg = <0 0x85200000 0 0xc00000>;
+
+			width = <1080>;
+			height = <2520>;
+			stride = <(1080 * 4)>;
+			format = "a8r8g8b8";
+			/*
+			 * That's (going to be) a lot of clocks, but it's necessary due
+			 * to unused clk cleanup & no panel driver yet
+			 */
+			clocks = <&gcc GCC_DISP_AHB_CLK>,
+				 <&gcc GCC_DISP_HF_AXI_CLK>,
+				 <&gcc GCC_DISP_THROTTLE_CORE_CLK>,
+				 <&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>;
+		};
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		label = "gpio-keys";
+
+		pinctrl-0 = <&vol_down_n>;
+		pinctrl-names = "default";
+
+		key-volume-down {
+			label = "Volume Down";
+			linux,code = <KEY_VOLUMEDOWN>;
+			gpios = <&pmr735a_gpios 1 GPIO_ACTIVE_LOW>;
+			debounce-interval = <15>;
+			linux,can-disable;
+			wakeup-source;
+		};
+	};
+
+	reserved-memory {
+		cont_splash_mem: memory@85200000 {
+			reg = <0 0x85200000 0 0xc00000>;
+			no-map;
+		};
+
+		ramoops@ffc40000 {
+			compatible = "ramoops";
+			reg = <0 0xffc40000 0 0xb0000>;
+			record-size = <0x10000>;
+			console-size = <0x60000>;
+			ftrace-size = <0x10000>;
+			pmsg-size = <0x20000>;
+			ecc-size = <16>;
+		};
+	};
+
+	vph_pwr: vph-pwr-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vph_pwr";
+		regulator-min-microvolt = <3700000>;
+		regulator-max-microvolt = <3700000>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+};
+
+&sdc2_off_state {
+	sd-cd-pins {
+		pins = "gpio94";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-disable;
+	};
+};
+
+&sdc2_on_state {
+	sd-cd-pins {
+		pins = "gpio94";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-pull-up;
+	};
+};
+
+&sdhc_2 {
+	status = "okay";
+
+	vmmc-supply = <&pm6125_l22>;
+	vqmmc-supply = <&pm6125_l5>;
+
+	cd-gpios = <&tlmm 94 GPIO_ACTIVE_HIGH>;
+};
+
+&gpi_dma0 {
+	status = "okay";
+};
+
+&gpi_dma1 {
+	status = "okay";
+};
+
+&i2c8 {
+	clock-frequency = <400000>;
+	status = "okay";
+
+	touchscreen@48 {
+		compatible = "samsung,s6sy761";
+		reg = <0x48>;
+		interrupt-parent = <&tlmm>;
+		interrupts = <22 0x2008>;
+
+		vdd-supply = <&pm6125_l13>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&ts_int_default &ts_avdd_default>;
+	};
+};
+
+&pmk8350_adc_tm {
+	status = "okay";
+};
+
+&pmk8350_rtc {
+	status = "okay";
+};
+
+&pmr735a_gpios {
+	vol_down_n: vol-down-n-state {
+		pins = "gpio1";
+		function = "normal";
+		power-source = <1>;
+		bias-pull-up;
+		input-enable;
+	};
+};
+
+&pon_pwrkey {
+	status = "okay";
+};
+
+&pon_resin {
+	linux,code = <KEY_VOLUMEUP>;
+	status = "okay";
+};
+
+&qupv3_id_0 {
+	status = "okay";
+};
+
+&qupv3_id_1 {
+	status = "okay";
+};
+
+&remoteproc_adsp {
+	firmware-name = "qcom/sm6375/Sony/murray/adsp.mbn";
+	status = "okay";
+};
+
+&remoteproc_cdsp {
+	firmware-name = "qcom/sm6375/Sony/murray/cdsp.mbn";
+	status = "okay";
+};
+
+&rpm_requests {
+	regulators-0 {
+		compatible = "qcom,rpm-pm6125-regulators";
+
+		pm6125_s5: s5 {
+			regulator-min-microvolt = <382000>;
+			regulator-max-microvolt = <1120000>;
+		};
+
+		pm6125_s6: s6 {
+			regulator-min-microvolt = <320000>;
+			regulator-max-microvolt = <1374000>;
+		};
+
+		pm6125_s7: s7 {
+			regulator-min-microvolt = <1574000>;
+			regulator-max-microvolt = <2040000>;
+		};
+
+		/*
+		 * S8 is VDD_GFX
+		 * L1 is VDD_LPI_CX
+		 */
+
+		pm6125_l2: l2 {
+			regulator-min-microvolt = <1170000>;
+			regulator-max-microvolt = <1304000>;
+		};
+
+		pm6125_l3: l3 {
+			regulator-min-microvolt = <1100000>;
+			regulator-max-microvolt = <1300000>;
+		};
+
+		pm6125_l4: l4 {
+			regulator-min-microvolt = <1100000>;
+			regulator-max-microvolt = <1300000>;
+		};
+
+		pm6125_l5: l5 {
+			regulator-min-microvolt = <1650000>;
+			regulator-max-microvolt = <2960000>;
+			regulator-allow-set-load;
+		};
+
+		pm6125_l6: l6 {
+			regulator-min-microvolt = <1080000>;
+			regulator-max-microvolt = <1304000>;
+		};
+
+		pm6125_l7: l7 {
+			regulator-min-microvolt = <720000>;
+			regulator-max-microvolt = <1050000>;
+		};
+
+		pm6125_l8: l8 {
+			regulator-min-microvolt = <1100000>;
+			regulator-max-microvolt = <1304000>;
+		};
+
+		pm6125_l9: l9 {
+			regulator-min-microvolt = <1504000>;
+			regulator-max-microvolt = <2000000>;
+		};
+
+		pm6125_l10: l10 {
+			regulator-min-microvolt = <1620000>;
+			regulator-max-microvolt = <1980000>;
+		};
+
+		pm6125_l11: l11 {
+			regulator-min-microvolt = <1620000>;
+			regulator-max-microvolt = <1980000>;
+		};
+
+		pm6125_l12: l12 {
+			regulator-min-microvolt = <1620000>;
+			regulator-max-microvolt = <2000000>;
+		};
+
+		pm6125_l13: l13 {
+			regulator-min-microvolt = <1650000>;
+			regulator-max-microvolt = <1980000>;
+		};
+
+		pm6125_l14: l14 {
+			regulator-min-microvolt = <1700000>;
+			regulator-max-microvolt = <1900000>;
+		};
+
+		pm6125_l15: l15 {
+			regulator-min-microvolt = <1650000>;
+			regulator-max-microvolt = <3544000>;
+		};
+
+		pm6125_l16: l16 {
+			regulator-min-microvolt = <1620000>;
+			regulator-max-microvolt = <1980000>;
+		};
+
+		/* L17 is VDD_LPI_MX */
+
+		pm6125_l18: l18 {
+			regulator-min-microvolt = <830000>;
+			regulator-max-microvolt = <920000>;
+		};
+
+		pm6125_l19: l19 {
+			regulator-min-microvolt = <1624000>;
+			regulator-max-microvolt = <3304000>;
+		};
+
+		pm6125_l20: l20 {
+			regulator-min-microvolt = <1624000>;
+			regulator-max-microvolt = <3304000>;
+		};
+
+		pm6125_l21: l21 {
+			regulator-min-microvolt = <3000000>;
+			regulator-max-microvolt = <3400000>;
+		};
+
+		pm6125_l22: l22 {
+			regulator-min-microvolt = <2704000>;
+			regulator-max-microvolt = <2960000>;
+			regulator-allow-set-load;
+		};
+
+		pm6125_l23: l23 {
+			regulator-min-microvolt = <3000000>;
+			regulator-max-microvolt = <3400000>;
+		};
+
+		pm6125_l24: l24 {
+			regulator-min-microvolt = <2704000>;
+			regulator-max-microvolt = <3544000>;
+		};
+	};
+
+	regulators-1 {
+		compatible = "qcom,rpm-pmr735a-regulators";
+
+		/*
+		 * S1 is VDD_MX
+		 * S2 is VDD_CX
+		 */
+
+		pmr735a_l1: l1 {
+			regulator-min-microvolt = <570000>;
+			regulator-max-microvolt = <650000>;
+		};
+
+		pmr735a_l2: l2 {
+			regulator-min-microvolt = <352000>;
+			regulator-max-microvolt = <796000>;
+		};
+
+		pmr735a_l3: l3 {
+			regulator-min-microvolt = <1000000>;
+			regulator-max-microvolt = <1200000>;
+		};
+
+		pmr735a_l4: l4 {
+			regulator-min-microvolt = <1504000>;
+			regulator-max-microvolt = <2000000>;
+		};
+
+		pmr735a_l5: l5 {
+			regulator-min-microvolt = <751000>;
+			regulator-max-microvolt = <824000>;
+		};
+
+		pmr735a_l6: l6 {
+			regulator-min-microvolt = <504000>;
+			regulator-max-microvolt = <868000>;
+		};
+
+		pmr735a_l7: l7 {
+			regulator-min-microvolt = <2700000>;
+			regulator-max-microvolt = <3544000>;
+		};
+	};
+};
+
+&sdc2_off_state {
+	sd-cd-pins {
+		pins = "gpio94";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-disable;
+	};
+};
+
+&sdc2_on_state {
+	sd-cd-pins {
+		pins = "gpio94";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-pull-up;
+	};
+};
+
+&sdhc_2 {
+	status = "okay";
+
+	vmmc-supply = <&pm6125_l22>;
+	vqmmc-supply = <&pm6125_l5>;
+
+	cd-gpios = <&tlmm 94 GPIO_ACTIVE_HIGH>;
+};
+
+&tlmm {
+	gpio-reserved-ranges = <13 4>;
+
+	ts_int_default: ts-int-default-state {
+		pins = "gpio22";
+		function = "gpio";
+		drive-strength = <8>;
+		bias-pull-up;
+	};
+
+	ts_avdd_default: ts-avdd-default-state {
+		pins = "gpio59";
+		function = "gpio";
+		drive-strength = <8>;
+		output-high;
+	};
+};
+
+&usb_1 {
+	status = "okay";
+};
+
+&usb_1_dwc3 {
+	dr_mode = "peripheral";
+};
+
+&usb_1_hsphy {
+	status = "okay";
+};
+
+&xo_board_clk {
+	clock-frequency = <19200000>;
+};

-- 
2.41.0

[PATCH 5/5] arm64: dts: qcom: Add Sony Xperia 10 V (PDX235) support

[Konrad Dybcio]

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

Re: [PATCH 1/5] dt-bindings: qcom: Add Sony Xperia 10 V

[Krzysztof Kozlowski]

On 18/08/2023 17:23, Konrad Dybcio wrote:
> The SM6375-based Xperia 10 V is veeery similar to the previous year 10 IV,
> sharing a common base motherboard design.
> 
> The software configuration however is somewhat different, which requires
> us to allow using qcom,msm/board-id on sm6375. Sad.
> 
> Document the device.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH 1/5] dt-bindings: qcom: Add Sony Xperia 10 V

[Konrad Dybcio]

On 19.08.2023 11:36, Krzysztof Kozlowski wrote:
> On 18/08/2023 17:23, Konrad Dybcio wrote:
>> The SM6375-based Xperia 10 V is veeery similar to the previous year 10 IV,
>> sharing a common base motherboard design.
>>
>> The software configuration however is somewhat different, which requires
>> us to allow using qcom,msm/board-id on sm6375. Sad.
>>
>> Document the device.
> 
> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Please hold on with merging this, I may have found a way to massage
the bootloader hard enough to skip msm-id on many platforms..
Still experimenting though!

Konrad

Re: [PATCH 5/5] arm64: dts: qcom: Add Sony Xperia 10 V (PDX235) support

[Marijn Suijten]

On 2023-08-18 17:23:28, Konrad Dybcio wrote:
> 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 ++++++++++++++++++++++

I just learned that the new device actually has a slightly different
board, with codename zambezi:

https://github.com/sonyxperiadev/kernel-copyleft-dts/blob/68.0.A.0.xxx/somc/blair-zambezi-pdx235_common.dtsi

How do you want to represent that?  We could have:

    sm6375-sony-xperia(-common?).dtsi
    sm6375-sony-xperia-murray-pdx225.dts
    sm6375-sony-xperia-zambezi-pdx235.dts

So that you can still keep 95% of the common configuration in the same
file, but without pretending that pdx235 uses the murray board.

- Marijn

>  .../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
>