arm64: dts: qcom: Add X1P42100 SoC and CRD

The X1 family is split into two parts: the 10- and 12-core parts are
variants of the same silicon with different fusing, whereas the 8-core
ones are a separate design. Thankfully, the software interface is only
barely different, letting us reuse much of the existing X1 work.

Introduce support for the X1P42100 SoC and the CRD based on it, through
overlaying some bits. Everything we already support on X1E80100 and
friends, minus the GPU, should work as-is.

Tested-by: Jens Glathe <jens.glathe@oldschoolsolutions.biz>
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250203-topic-x1p4_dts-v2-6-72cd4cdc767b@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 140b0b2abfb555b8ef61bd9ed0217d8997800809..b54f45b3bec812f4f029c5a991ad3ea30585d4e5 100644 (file)
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -298,3 +298,4 @@ dtb-$(CONFIG_ARCH_QCOM)     += x1e80100-lenovo-yoga-slim7x.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += x1e80100-microsoft-romulus13.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += x1e80100-microsoft-romulus15.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += x1e80100-qcp.dtb
+dtb-$(CONFIG_ARCH_QCOM)        += x1p42100-crd.dtb

diff --git a/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi
index d7a2a2b8fc6c30bdb10df81eac7d92306998838f..bf6cdede156bc66f681c53f9bd19966bae23da14 100644 (file)
--- a/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi
@@ -110,7 +110,7 @@
                        };
                };
 
-               pmc8380-6-thermal {
+               pmc8380_6_thermal: pmc8380-6-thermal {
                        polling-delay-passive = <100>;
 
                        thermal-sensors = <&pmc8380_6_temp_alarm>;

diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
index ae27e147febf20ffcb813f3396aca59b1c6e6ea7..5c091e234ca3d540c15c9eb13cbe87143df031fe 100644 (file)
--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
@@ -252,7 +252,7 @@
                                };
                        };
 
-                       cluster2 {
+                       cpu_map_cluster2: cluster2 {
                                core0 {
                                        cpu = <&cpu8>;
                                };
@@ -8212,7 +8212,7 @@
                };
 
                /* cluster0 */
-               pmu@240b3400 {
+               bwmon_cluster0: pmu@240b3400 {
                        compatible = "qcom,x1e80100-cpu-bwmon", "qcom,sdm845-bwmon";
                        reg = <0 0x240b3400 0 0x600>;
 
@@ -8222,6 +8222,19 @@
                                         &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ACTIVE_ONLY>;
 
                        operating-points-v2 = <&cpu_bwmon_opp_table>;
+               };
+
+               /* cluster2 */
+               bwmon_cluster2: pmu@240b5400 {
+                       compatible = "qcom,x1e80100-cpu-bwmon", "qcom,sdm845-bwmon";
+                       reg = <0 0x240b5400 0 0x600>;
+
+                       interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH>;
+
+                       interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ACTIVE_ONLY>;
+
+                       operating-points-v2 = <&cpu_bwmon_opp_table>;
 
                        cpu_bwmon_opp_table: opp-table {
                                compatible = "operating-points-v2";
@@ -8252,19 +8265,6 @@
                        };
                };
 
-               /* cluster2 */
-               pmu@240b5400 {
-                       compatible = "qcom,x1e80100-cpu-bwmon", "qcom,sdm845-bwmon";
-                       reg = <0 0x240b5400 0 0x600>;
-
-                       interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH>;
-
-                       interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
-                                        &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ACTIVE_ONLY>;
-
-                       operating-points-v2 = <&cpu_bwmon_opp_table>;
-               };
-
                /* cluster1 */
                pmu@240b6400 {
                        compatible = "qcom,x1e80100-cpu-bwmon", "qcom,sdm845-bwmon";

diff --git a/arch/arm64/boot/dts/qcom/x1p42100-crd.dts b/arch/arm64/boot/dts/qcom/x1p42100-crd.dts
new file mode 100644 (file)
index 0000000..cf07860
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/x1p42100-crd.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+
+#include "x1p42100.dtsi"
+#include "x1-crd.dtsi"
+
+/delete-node/ &pmc8380_6;
+/delete-node/ &pmc8380_6_thermal;
+
+/ {
+       model = "Qualcomm Technologies, Inc. X1P42100 CRD";
+       compatible = "qcom,x1p42100-crd", "qcom,x1p42100";
+};

diff --git a/arch/arm64/boot/dts/qcom/x1p42100.dtsi b/arch/arm64/boot/dts/qcom/x1p42100.dtsi
new file mode 100644 (file)
index 0000000..27f4790
--- /dev/null
+++ b/arch/arm64/boot/dts/qcom/x1p42100.dtsi
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/* X1P42100 is heavily based on X1E80100, with some meaningful differences */
+#include "x1e80100.dtsi"
+
+/delete-node/ &bwmon_cluster0;
+/delete-node/ &cluster_pd2;
+/delete-node/ &cpu_map_cluster2;
+/delete-node/ &cpu8;
+/delete-node/ &cpu9;
+/delete-node/ &cpu10;
+/delete-node/ &cpu11;
+/delete-node/ &cpu_pd8;
+/delete-node/ &cpu_pd9;
+/delete-node/ &cpu_pd10;
+/delete-node/ &cpu_pd11;
+/delete-node/ &pcie3_phy;
+
+&gcc {
+       compatible = "qcom,x1p42100-gcc", "qcom,x1e80100-gcc";
+};
+
+/* The GPU is physically different and will be brought up later */
+&gpu {
+       /delete-property/ compatible;
+};
+
+&gpucc {
+       compatible = "qcom,x1p42100-gpucc";
+};
+
+/* PCIe3 has half the lanes compared to X1E80100 */
+&pcie3 {
+       num-lanes = <4>;
+};
+
+&pcie6a_phy {
+       compatible = "qcom,x1p42100-qmp-gen4x4-pcie-phy";
+};
+
+&soc {
+       /* The PCIe3 PHY on X1P42100 uses a different IP block */
+       pcie3_phy: phy@1bd4000 {
+               compatible = "qcom,x1p42100-qmp-gen4x4-pcie-phy";
+               reg = <0x0 0x01bd4000 0x0 0x2000>,
+                     <0x0 0x01bd6000 0x0 0x2000>;
+
+               clocks = <&gcc GCC_PCIE_3_PHY_AUX_CLK>,
+                        <&gcc GCC_PCIE_3_CFG_AHB_CLK>,
+                        <&tcsr TCSR_PCIE_8L_CLKREF_EN>,
+                        <&gcc GCC_PCIE_3_PHY_RCHNG_CLK>,
+                        <&gcc GCC_PCIE_3_PIPE_CLK>,
+                        <&gcc GCC_PCIE_3_PIPEDIV2_CLK>;
+               clock-names = "aux",
+                             "cfg_ahb",
+                             "ref",
+                             "rchng",
+                             "pipe",
+                             "pipediv2";
+
+               resets = <&gcc GCC_PCIE_3_PHY_BCR>,
+                        <&gcc GCC_PCIE_3_NOCSR_COM_PHY_BCR>;
+               reset-names = "phy",
+                             "phy_nocsr";
+
+               assigned-clocks = <&gcc GCC_PCIE_3_PHY_RCHNG_CLK>;
+               assigned-clock-rates = <100000000>;
+
+               power-domains = <&gcc GCC_PCIE_3_PHY_GDSC>;
+
+               #clock-cells = <0>;
+               clock-output-names = "pcie3_pipe_clk";
+
+               #phy-cells = <0>;
+
+               status = "disabled";
+       };
+};