[PATCH v1 0/3] arm64: dts: qcom: add initial support for Samsung Galaxy S20

[PATCH v1 0/3] arm64: dts: qcom: add initial support for Samsung Galaxy S20

[Eric Gonçalves]

This patchset splits sm8250-samsung-r8q.dts and adds
sm8250-samsung-common.dtsi, which contains common definitions for Samsung
devices that use the same SoC - the S20, Tab S7 and Note 20 series. With
that, also add a DTS for x1q board, which is the Samsung Galaxy S20.

Thanks,
Eric

Eric Gonçalves (3):
  arm64: dts: qcom: sm8250-samsung-r8q: Move common parts to dtsi
  dt-bindings: arm: qcom: document x1q board binding
  arm64: dts: qcom: add initial support for Samsung Galaxy S20

 .../devicetree/bindings/arm/qcom.yaml         |   1 +
 arch/arm64/boot/dts/qcom/Makefile             |   1 +
 .../boot/dts/qcom/sm8250-samsung-common.dtsi  | 204 ++++++++++++++++++
 .../boot/dts/qcom/sm8250-samsung-r8q.dts      |  42 ++--
 .../boot/dts/qcom/sm8250-samsung-x1q.dts      |  26 +++
 5 files changed, 245 insertions(+), 29 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sm8250-samsung-common.dtsi
 create mode 100644 arch/arm64/boot/dts/qcom/sm8250-samsung-x1q.dts

-- 
2.50.1

[PATCH v1 1/3] arm64: dts: qcom: sm8250-samsung-r8q: Move common parts to dtsi

[Eric Gonçalves]

Move common parts of the device tree to a separate dtsi in preparation for
adding other Samsung devices from the S20, Tab S7 or Note 20 families,
creating sm8250-samsung-common.dtsi. Also add support for UFS, USB and
GPIO keys.

Signed-off-by: Eric Gonçalves <ghatto404@gmail.com>
---
 .../boot/dts/qcom/sm8250-samsung-common.dtsi  | 204 ++++++++++++++++++
 .../boot/dts/qcom/sm8250-samsung-r8q.dts      |  42 ++--
 2 files changed, 217 insertions(+), 29 deletions(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sm8250-samsung-common.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sm8250-samsung-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-samsung-common.dtsi
new file mode 100644
index 000000000000..96662bf9e527
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm8250-samsung-common.dtsi
@@ -0,0 +1,204 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+/dts-v1/;
+
+#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
+#include "sm8250.dtsi"
+#include "pm8150.dtsi"
+
+/ {
+	chosen {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		framebuffer: framebuffer@9c000000 {
+			compatible = "simple-framebuffer";
+			reg = <0x0 0x9c000000 0x0 0x2300000>;
+			width = <1080>;
+			height = <2400>;
+			stride = <(1080 * 4)>;
+			format = "a8r8g8b8";
+		};
+	};
+
+	gpio_keys: gpio-keys {
+		compatible = "gpio-keys";
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&vol_up_n>;
+
+		key-vol-up {
+			label = "Volume Up";
+			gpios = <&pm8150_gpios 3 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_VOLUMEUP>;
+			debounce-interval = <15>;
+			linux,can-disable;
+			wakeup-source;
+		};
+	};
+
+	reserved-memory {
+		cont_splash_mem: memory@9c000000 {
+			reg = <0x0 0x9c000000 0x0 0x2300000>;
+			no-map;
+		};
+
+		ramoops@9fa00000 {
+			compatible = "ramoops";
+			reg = <0x0 0x9fa00000 0x0 0x100000>;
+			record-size = <0x4000>;
+			console-size = <0x40000>;
+			ftrace-size = <0x40000>;
+			pmsg-size = <0x40000>;
+			no-map;
+		};
+	};
+
+	vph_pwr: vph-pwr-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vph_pwr";
+		regulator-min-microvolt = <3700000>;
+		regulator-max-microvolt = <3700000>;
+	};
+};
+
+&apps_rsc {
+	regulators-0 {
+		compatible = "qcom,pm8150-rpmh-regulators";
+		qcom,pmic-id = "a";
+
+		vdd-s1-supply = <&vph_pwr>;
+		vdd-s2-supply = <&vph_pwr>;
+		vdd-s3-supply = <&vph_pwr>;
+		vdd-s4-supply = <&vph_pwr>;
+		vdd-s5-supply = <&vph_pwr>;
+		vdd-s6-supply = <&vph_pwr>;
+		vdd-s7-supply = <&vph_pwr>;
+		vdd-s8-supply = <&vph_pwr>;
+		vdd-s9-supply = <&vph_pwr>;
+		vdd-s10-supply = <&vph_pwr>;
+
+		vreg_s4a_1p8: smps4 {
+			regulator-name = "vreg_s4a_1p8";
+			regulator-min-microvolt = <1800000>;
+			regulator-max-microvolt = <1920000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+			regulator-allow-set-load;
+			regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM
+						   RPMH_REGULATOR_MODE_HPM>;
+		};
+
+		vreg_l2a_3p1: ldo2 {
+			regulator-name = "vreg_l2a_3p1";
+			regulator-min-microvolt = <3072000>;
+			regulator-max-microvolt = <3072000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+
+		vreg_l5a_0p88: ldo5 {
+			regulator-name = "vreg_l5a_0p88";
+			regulator-min-microvolt = <880000>;
+			regulator-max-microvolt = <880000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+
+		vreg_l6a_1p2: ldo6 {
+			regulator-name = "vreg_l6a_1p2";
+			regulator-min-microvolt = <1200000>;
+			regulator-max-microvolt = <1200000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+			regulator-allow-set-load;
+			regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM
+						   RPMH_REGULATOR_MODE_HPM>;
+		};
+
+		vreg_l9a_1p2: ldo9 {
+			regulator-name = "vreg_l9a_1p2";
+			regulator-min-microvolt = <1200000>;
+			regulator-max-microvolt = <1200000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+
+		vreg_l12a_1p8: ldo12 {
+			regulator-name = "vreg_l12a_1p8";
+			regulator-min-microvolt = <1800000>;
+			regulator-max-microvolt = <1800000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+		};
+
+		vreg_l17a_3p0: ldo17 {
+			regulator-name = "vreg_l17a_3p0";
+			regulator-min-microvolt = <2496000>;
+			regulator-max-microvolt = <3008000>;
+			regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
+			regulator-allow-set-load;
+			regulator-allowed-modes = <RPMH_REGULATOR_MODE_LPM
+						   RPMH_REGULATOR_MODE_HPM>;
+		};
+	};
+};
+
+&pm8150_gpios {
+	vol_up_n: vol-up-n-state {
+		pins = "gpio3";
+		function = "normal";
+		power-source = <0>;
+		input-enable;
+		bias-pull-up;
+	};
+};
+
+&pon_pwrkey {
+	status = "okay";
+};
+
+&pon_resin {
+	linux,code = <KEY_VOLUMEDOWN>;
+	status = "okay";
+};
+
+&tlmm {
+	gpio-reserved-ranges = <40 4>; /* I2C (Unused) */
+};
+
+&usb_1 {
+	/* Limit to USB 2.0 for now */
+	qcom,select-utmi-as-pipe-clk;
+
+	status = "okay";
+};
+
+&usb_1_dwc3 {
+	dr_mode = "peripheral";
+	maximum-speed = "high-speed";
+	/* Remove USB3 phy */
+	phys = <&usb_1_hsphy>;
+	phy-names = "usb2-phy";
+};
+
+&usb_1_hsphy {
+	vdda-pll-supply = <&vreg_l5a_0p88>;
+	vdda18-supply = <&vreg_l12a_1p8>;
+	vdda33-supply = <&vreg_l2a_3p1>;
+
+	status = "okay";
+};
+
+&ufs_mem_hc {
+	vcc-supply = <&vreg_l17a_3p0>;
+	vcc-max-microamp = <800000>;
+	vccq-supply = <&vreg_l6a_1p2>;
+	vccq-max-microamp = <800000>;
+	vccq2-supply = <&vreg_s4a_1p8>;
+	vccq2-max-microamp = <800000>;
+
+	status = "okay";
+};
+
+&ufs_mem_phy {
+	vdda-phy-supply = <&vreg_l5a_0p88>;
+	vdda-pll-supply = <&vreg_l9a_1p2>;
+
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/qcom/sm8250-samsung-r8q.dts b/arch/arm64/boot/dts/qcom/sm8250-samsung-r8q.dts
index 131d1edc2ad4..415119a14856 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-samsung-r8q.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-samsung-r8q.dts
@@ -2,41 +2,25 @@
 
 /dts-v1/;
 
-#include "sm8250.dtsi"
+#include "sm8250-samsung-common.dtsi"
 
 / {
 	model = "Samsung Galaxy S20 FE";
 	compatible = "samsung,r8q", "qcom,sm8250";
 	chassis-type = "handset";
+};
 
-	chosen {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-		
-		framebuffer: framebuffer@9c000000 {
-			compatible = "simple-framebuffer";
-			reg = <0x0 0x9c000000 0x0 (1080 * 2400 * 4)>;
-			width = <1080>;
-			height = <2400>;
-			stride = <(1080 * 4)>;
-			format = "a8r8g8b8";
-		};
-	};
+&adsp {
+	firmware-name = "qcom/sm8250/Samsung/r8q/adsp.mbn";
+	status = "okay";
+};
 
-	reserved-memory {
-		cont_splash_mem: memory@9c000000 {
-			reg = <0x0 0x9c000000 0x0 (1080 * 2400 * 4)>;
-			no-map;
-		};
+&cdsp {
+	firmware-name = "qcom/sm8250/Samsung/r8q/cdsp.mbn";
+	status = "okay";
+};
 
-		pstore_mem: ramoops@9fa00000 {
-			compatible = "ramoops";
-			reg = <0x0 0x9fa00000 0x0 0x100000>;
-			record-size = <0x4000>;
-			console-size = <0x40000>;
-			ftrace-size = <0x40000>;
-			pmsg-size = <0x40000>;
-		};
-	};
+&slpi {
+	firmware-name = "qcom/sm8250/Samsung/r8q/slpi.mbn";
+	status = "okay";
 };
-- 
2.50.1

[PATCH v1 2/3] dt-bindings: arm: qcom: document x1q board binding

[Eric Gonçalves]

Add binding for the Samsung Galaxy S20 board, codenamed X1Q,
which is based on the Qualcomm Snapdragon 865 SoC.

Signed-off-by: Eric Gonçalves <ghatto404@gmail.com>
---
 Documentation/devicetree/bindings/arm/qcom.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
index 607eee7a1794..335e93a02604 100644
--- a/Documentation/devicetree/bindings/arm/qcom.yaml
+++ b/Documentation/devicetree/bindings/arm/qcom.yaml
@@ -1077,6 +1077,7 @@ properties:
               - qcom,sm8250-hdk
               - qcom,sm8250-mtp
               - samsung,r8q
+              - samsung,x1q
               - sony,pdx203-generic
               - sony,pdx206-generic
               - xiaomi,elish
-- 
2.50.1

[PATCH v1 3/3] arm64: dts: qcom: add initial support for Samsung Galaxy S20

[Eric Gonçalves]

Add new device support for the Samsung Galaxy S20 phone

What works (common dtsi):
- SimpleFB
- Pstore/ramoops
- GPIO keys
- UFS
- USB

Signed-off-by: Eric Gonçalves <ghatto404@gmail.com>
---
 arch/arm64/boot/dts/qcom/Makefile             |  1 +
 .../boot/dts/qcom/sm8250-samsung-x1q.dts      | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 arch/arm64/boot/dts/qcom/sm8250-samsung-x1q.dts

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 8f305c1ddac1..2d250c3d65cf 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -276,6 +276,7 @@ dtb-$(CONFIG_ARCH_QCOM)	+= sm8150-sony-xperia-kumano-griffin.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-hdk.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-mtp.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-samsung-r8q.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-samsung-x1q.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-sony-xperia-edo-pdx203.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-sony-xperia-edo-pdx206.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sm8250-xiaomi-elish-boe.dtb
diff --git a/arch/arm64/boot/dts/qcom/sm8250-samsung-x1q.dts b/arch/arm64/boot/dts/qcom/sm8250-samsung-x1q.dts
new file mode 100644
index 000000000000..325f94cf755e
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/sm8250-samsung-x1q.dts
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+/dts-v1/;
+
+#include "sm8250-samsung-common.dtsi"
+
+/ {
+	model = "Samsung Galaxy S20";
+	compatible = "samsung,x1q", "qcom,sm8250";
+	chassis-type = "handset";
+};
+
+&adsp {
+	firmware-name = "qcom/sm8250/Samsung/x1q/adsp.mbn";
+	status = "okay";
+};
+
+&cdsp {
+	firmware-name = "qcom/sm8250/Samsung/x1q/cdsp.mbn";
+	status = "okay";
+};
+
+&slpi {
+	firmware-name = "qcom/sm8250/Samsung/x1q/slpi.mbn";
+	status = "okay";
+};
-- 
2.50.1

Re: [PATCH v1 2/3] dt-bindings: arm: qcom: document x1q board binding

[Rob Herring (Arm)]

On Fri, 05 Sep 2025 19:09:30 +0000, Eric Gonçalves wrote:
> Add binding for the Samsung Galaxy S20 board, codenamed X1Q,
> which is based on the Qualcomm Snapdragon 865 SoC.
> 
> Signed-off-by: Eric Gonçalves <ghatto404@gmail.com>
> ---
>  Documentation/devicetree/bindings/arm/qcom.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 

Acked-by: Rob Herring (Arm) <robh@kernel.org>

Re: [PATCH v1 1/3] arm64: dts: qcom: sm8250-samsung-r8q: Move common parts to dtsi

[Konrad Dybcio]

On 9/5/25 9:09 PM, Eric Gonçalves wrote:
> Move common parts of the device tree to a separate dtsi in preparation for
> adding other Samsung devices from the S20, Tab S7 or Note 20 families,
> creating sm8250-samsung-common.dtsi. Also add support for UFS, USB and
> GPIO keys.
> 
> Signed-off-by: Eric Gonçalves <ghatto404@gmail.com>
> ---

FWIW next time try:

git config diff.renameLimit 999999

so that moving code around will hopefully generate a smaller diff

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH v1 3/3] arm64: dts: qcom: add initial support for Samsung Galaxy S20

[Konrad Dybcio]

On 9/5/25 9:09 PM, Eric Gonçalves wrote:
> Add new device support for the Samsung Galaxy S20 phone
> 
> What works (common dtsi):
> - SimpleFB
> - Pstore/ramoops
> - GPIO keys
> - UFS
> - USB
> 
> Signed-off-by: Eric Gonçalves <ghatto404@gmail.com>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH v1 0/3] arm64: dts: qcom: add initial support for Samsung Galaxy S20

[Bjorn Andersson]

On Fri, 05 Sep 2025 19:09:28 +0000, Eric Gonçalves wrote:
> This patchset splits sm8250-samsung-r8q.dts and adds
> sm8250-samsung-common.dtsi, which contains common definitions for Samsung
> devices that use the same SoC - the S20, Tab S7 and Note 20 series. With
> that, also add a DTS for x1q board, which is the Samsung Galaxy S20.
> 
> Thanks,
> Eric
> 
> [...]

Applied, thanks!

[1/3] arm64: dts: qcom: sm8250-samsung-r8q: Move common parts to dtsi
      commit: 194c7636faf8bab8deea3800e168b23319a9c198
[2/3] dt-bindings: arm: qcom: document x1q board binding
      commit: 818045d1658fd4ceec06fb6efa62ed9c5b7f23cf
[3/3] arm64: dts: qcom: add initial support for Samsung Galaxy S20
      commit: af7bf2a2bf8fe01b6e2f68af19517a4eec48bdbb

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: [PATCH v1 1/3] arm64: dts: qcom: sm8250-samsung-r8q: Move common parts to dtsi

[Eric Gonçalves]

On September 8, 2025 1:00:29 PM GMT-03:00, Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> wrote:
>On 9/5/25 9:09 PM, Eric Gonçalves wrote:
>> Move common parts of the device tree to a separate dtsi in preparation for
>> adding other Samsung devices from the S20, Tab S7 or Note 20 families,
>> creating sm8250-samsung-common.dtsi. Also add support for UFS, USB and
>> GPIO keys.
>> 
>> Signed-off-by: Eric Gonçalves <ghatto404@gmail.com>
>> ---
>
>FWIW next time try:
>
>git config diff.renameLimit 999999
>
>so that moving code around will hopefully generate a smaller diff
>
>Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>
>Konrad
will do, thanks!