From nobody Mon Feb 9 22:02:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8083D209F3B; Mon, 3 Feb 2025 14:43:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738593835; cv=none; b=egCMFdQEJSTNzfJJRt0TdgUN2CVQys6XfCFIHRbPuexwvUC9tQG85FcWgOLi65Nu3EAHotHiWw5R0zFYvu9cpOuKwn3H9f8RAP1R4/d6FQCnl6As6GHTVGq4+DGYKg6YvZb2XWRkpMpf+V7fwEjipTw0Vk+tLwOOi1o6On52QJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738593835; c=relaxed/simple; bh=TICPyOA+VFvMgZNCupGTPPzpxceSOSEVeWOP5X7SSPI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PM/OY1esHt5SPh1cz3rdqW1C2mkzfPcOw11h48T+oU82/SAaIPIMJnsGjsRA7JP7mcGtiW/zxVBtj/D5K0maG/BbgG5HcrVpgNDntCd6wQ2zxODt79ufKTMJ3f7aqE6G+ad2u+7tN6EPFSBaz9amSlgaGAGDs0RkLo0+Aw0FDAA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fHfEiJ5X; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fHfEiJ5X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4BD4AC4CED2; Mon, 3 Feb 2025 14:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738593833; bh=TICPyOA+VFvMgZNCupGTPPzpxceSOSEVeWOP5X7SSPI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fHfEiJ5Xi8qGxhOUIGb2jW/iBOdDisJInz1Emw+T8gzJXgyGBrFdKaPTRlhg1WKC9 j5GLqeLwPsz7SgeM9XV6StRlMTLcz99KsCEx2v9hnJePCsdNu2okzylydQhUftmfNO IO9BZtYyNtz1lnpl8CofyJXNRwfPxL2JkkZMU6XA9c6bsa+rL/2W9fGCVNSVGOPX01 6FQQHM+N5srdPcfrCeQOE7zvf0fnSc+ZfMfPH3tAj8K3OoN4MdfDE3BimgMgugXHl8 h3e3AWb93k9PA+2XOH46tnOGUjpkP6F6b8TZazrTOxcfzI2iozt7suVma2D6+AKgnk Cc0guhP4nfT3Q== From: Konrad Dybcio Date: Mon, 03 Feb 2025 15:43:24 +0100 Subject: [PATCH v2 5/6] arm64: dts: qcom: Commonize X1 CRD DTSI Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250203-topic-x1p4_dts-v2-5-72cd4cdc767b@oss.qualcomm.com> References: <20250203-topic-x1p4_dts-v2-0-72cd4cdc767b@oss.qualcomm.com> In-Reply-To: <20250203-topic-x1p4_dts-v2-0-72cd4cdc767b@oss.qualcomm.com> To: Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1738593805; l=31327; i=konrad.dybcio@oss.qualcomm.com; s=20230215; h=from:subject:message-id; bh=ugSWKcmEF1deEIKFODkXmpmclkeVEgs8fPWA54AFlmk=; b=862MKsg9ElbaZ1UCVDuD/d1X8tgIjlSXarh0tbOSddnC7cOR35OzyyzzadQDHDdkUWYNXzhDa c1wf9T5XMM9CxFJpSvQ6i+pjHBb4aJbNJetDJFYfz1etXb1QFK89OGt X-Developer-Key: i=konrad.dybcio@oss.qualcomm.com; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= From: Konrad Dybcio Certain X1 SKUs vary very noticeably, but the CRDs based on them don't. Commonize the existing X1E80100 DTSI to allow reuse. Signed-off-by: Konrad Dybcio --- .../dts/qcom/{x1e80100-crd.dts =3D> x1-crd.dtsi} | 7 - arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 1270 +---------------= ---- arch/arm64/boot/dts/qcom/x1e80100.dtsi | 2 +- 3 files changed, 4 insertions(+), 1275 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dt= s/qcom/x1-crd.dtsi similarity index 99% copy from arch/arm64/boot/dts/qcom/x1e80100-crd.dts copy to arch/arm64/boot/dts/qcom/x1-crd.dtsi index ff5b3472fafd35a2a3754c11ab0b9b9e8ea5a4b4..296b41409ad1797d1da837c2674= d6048932ff8ee 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts +++ b/arch/arm64/boot/dts/qcom/x1-crd.dtsi @@ -3,15 +3,12 @@ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ =20 -/dts-v1/; - #include #include #include #include #include =20 -#include "x1e80100.dtsi" #include "x1e80100-pmics.dtsi" =20 / { @@ -691,10 +688,6 @@ vreg_l3j_0p8: ldo3 { =20 &gpu { status =3D "okay"; - - zap-shader { - firmware-name =3D "qcom/x1e80100/gen70500_zap.mbn"; - }; }; =20 &i2c0 { diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dt= s/qcom/x1e80100-crd.dts index ff5b3472fafd35a2a3754c11ab0b9b9e8ea5a4b4..976b8e44b5763b2d6c0f4786bf5= 809fee29dcecc 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts @@ -5,1278 +5,14 @@ =20 /dts-v1/; =20 -#include -#include -#include -#include -#include - #include "x1e80100.dtsi" -#include "x1e80100-pmics.dtsi" +#include "x1-crd.dtsi" =20 / { model =3D "Qualcomm Technologies, Inc. X1E80100 CRD"; compatible =3D "qcom,x1e80100-crd", "qcom,x1e80100"; - - aliases { - serial0 =3D &uart21; - }; - - wcd938x: audio-codec { - compatible =3D "qcom,wcd9385-codec"; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&wcd_default>; - - qcom,micbias1-microvolt =3D <1800000>; - qcom,micbias2-microvolt =3D <1800000>; - qcom,micbias3-microvolt =3D <1800000>; - qcom,micbias4-microvolt =3D <1800000>; - qcom,mbhc-buttons-vthreshold-microvolt =3D <75000 150000 237000 500000 5= 00000 500000 500000 500000>; - qcom,mbhc-headset-vthreshold-microvolt =3D <1700000>; - qcom,mbhc-headphone-vthreshold-microvolt =3D <50000>; - qcom,rx-device =3D <&wcd_rx>; - qcom,tx-device =3D <&wcd_tx>; - - reset-gpios =3D <&tlmm 191 GPIO_ACTIVE_LOW>; - - vdd-buck-supply =3D <&vreg_l15b_1p8>; - vdd-rxtx-supply =3D <&vreg_l15b_1p8>; - vdd-io-supply =3D <&vreg_l15b_1p8>; - vdd-mic-bias-supply =3D <&vreg_bob1>; - - #sound-dai-cells =3D <1>; - }; - - chosen { - stdout-path =3D "serial0:115200n8"; - }; - - gpio-keys { - compatible =3D "gpio-keys"; - - pinctrl-0 =3D <&hall_int_n_default>; - pinctrl-names =3D "default"; - - switch-lid { - gpios =3D <&tlmm 92 GPIO_ACTIVE_LOW>; - linux,input-type =3D ; - linux,code =3D ; - wakeup-source; - wakeup-event-action =3D ; - }; - }; - - pmic-glink { - compatible =3D "qcom,x1e80100-pmic-glink", - "qcom,sm8550-pmic-glink", - "qcom,pmic-glink"; - #address-cells =3D <1>; - #size-cells =3D <0>; - orientation-gpios =3D <&tlmm 121 GPIO_ACTIVE_HIGH>, - <&tlmm 123 GPIO_ACTIVE_HIGH>, - <&tlmm 125 GPIO_ACTIVE_HIGH>; - - /* Left-side rear port */ - connector@0 { - compatible =3D "usb-c-connector"; - reg =3D <0>; - power-role =3D "dual"; - data-role =3D "dual"; - - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; - - port@0 { - reg =3D <0>; - - pmic_glink_ss0_hs_in: endpoint { - remote-endpoint =3D <&usb_1_ss0_dwc3_hs>; - }; - }; - - port@1 { - reg =3D <1>; - - pmic_glink_ss0_ss_in: endpoint { - remote-endpoint =3D <&usb_1_ss0_qmpphy_out>; - }; - }; - }; - }; - - /* Left-side front port */ - connector@1 { - compatible =3D "usb-c-connector"; - reg =3D <1>; - power-role =3D "dual"; - data-role =3D "dual"; - - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; - - port@0 { - reg =3D <0>; - - pmic_glink_ss1_hs_in: endpoint { - remote-endpoint =3D <&usb_1_ss1_dwc3_hs>; - }; - }; - - port@1 { - reg =3D <1>; - - pmic_glink_ss1_ss_in: endpoint { - remote-endpoint =3D <&usb_1_ss1_qmpphy_out>; - }; - }; - }; - }; - - /* Right-side port */ - connector@2 { - compatible =3D "usb-c-connector"; - reg =3D <2>; - power-role =3D "dual"; - data-role =3D "dual"; - - ports { - #address-cells =3D <1>; - #size-cells =3D <0>; - - port@0 { - reg =3D <0>; - - pmic_glink_ss2_hs_in: endpoint { - remote-endpoint =3D <&usb_1_ss2_dwc3_hs>; - }; - }; - - port@1 { - reg =3D <1>; - - pmic_glink_ss2_ss_in: endpoint { - remote-endpoint =3D <&usb_1_ss2_qmpphy_out>; - }; - }; - }; - }; - }; - - reserved-memory { - linux,cma { - compatible =3D "shared-dma-pool"; - size =3D <0x0 0x8000000>; - reusable; - linux,cma-default; - }; - }; - - sound { - compatible =3D "qcom,x1e80100-sndcard"; - model =3D "X1E80100-CRD"; - audio-routing =3D "WooferLeft IN", "WSA WSA_SPK1 OUT", - "TweeterLeft IN", "WSA WSA_SPK2 OUT", - "WooferRight IN", "WSA2 WSA_SPK2 OUT", - "TweeterRight IN", "WSA2 WSA_SPK2 OUT", - "IN1_HPHL", "HPHL_OUT", - "IN2_HPHR", "HPHR_OUT", - "AMIC2", "MIC BIAS2", - "VA DMIC0", "MIC BIAS3", - "VA DMIC1", "MIC BIAS3", - "VA DMIC2", "MIC BIAS1", - "VA DMIC3", "MIC BIAS1", - "VA DMIC0", "VA MIC BIAS3", - "VA DMIC1", "VA MIC BIAS3", - "VA DMIC2", "VA MIC BIAS1", - "VA DMIC3", "VA MIC BIAS1", - "TX SWR_INPUT1", "ADC2_OUTPUT"; - - wcd-playback-dai-link { - link-name =3D "WCD Playback"; - - cpu { - sound-dai =3D <&q6apmbedai RX_CODEC_DMA_RX_0>; - }; - - codec { - sound-dai =3D <&wcd938x 0>, <&swr1 0>, <&lpass_rxmacro 0>; - }; - - platform { - sound-dai =3D <&q6apm>; - }; - }; - - wcd-capture-dai-link { - link-name =3D "WCD Capture"; - - cpu { - sound-dai =3D <&q6apmbedai TX_CODEC_DMA_TX_3>; - }; - - codec { - sound-dai =3D <&wcd938x 1>, <&swr2 1>, <&lpass_txmacro 0>; - }; - - platform { - sound-dai =3D <&q6apm>; - }; - }; - - wsa-dai-link { - link-name =3D "WSA Playback"; - - cpu { - sound-dai =3D <&q6apmbedai WSA_CODEC_DMA_RX_0>; - }; - - codec { - sound-dai =3D <&left_woofer>, <&left_tweeter>, - <&swr0 0>, <&lpass_wsamacro 0>, - <&right_woofer>, <&right_tweeter>, - <&swr3 0>, <&lpass_wsa2macro 0>; - }; - - platform { - sound-dai =3D <&q6apm>; - }; - }; - - va-dai-link { - link-name =3D "VA Capture"; - - cpu { - sound-dai =3D <&q6apmbedai VA_CODEC_DMA_TX_0>; - }; - - codec { - sound-dai =3D <&lpass_vamacro 0>; - }; - - platform { - sound-dai =3D <&q6apm>; - }; - }; - }; - - vreg_edp_3p3: regulator-edp-3p3 { - compatible =3D "regulator-fixed"; - - regulator-name =3D "VREG_EDP_3P3"; - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - - gpio =3D <&tlmm 70 GPIO_ACTIVE_HIGH>; - enable-active-high; - - pinctrl-0 =3D <&edp_reg_en>; - pinctrl-names =3D "default"; - - regulator-boot-on; - }; - - vreg_misc_3p3: regulator-misc-3p3 { - compatible =3D "regulator-fixed"; - - regulator-name =3D "VREG_MISC_3P3"; - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - - gpio =3D <&pm8550ve_8_gpios 6 GPIO_ACTIVE_HIGH>; - enable-active-high; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&misc_3p3_reg_en>; - - regulator-boot-on; - regulator-always-on; - }; - - vreg_nvme: regulator-nvme { - compatible =3D "regulator-fixed"; - - regulator-name =3D "VREG_NVME_3P3"; - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - - gpio =3D <&tlmm 18 GPIO_ACTIVE_HIGH>; - enable-active-high; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&nvme_reg_en>; - - regulator-boot-on; - }; - - vph_pwr: regulator-vph-pwr { - compatible =3D "regulator-fixed"; - - regulator-name =3D "vph_pwr"; - regulator-min-microvolt =3D <3700000>; - regulator-max-microvolt =3D <3700000>; - - regulator-always-on; - regulator-boot-on; - }; - - vreg_wwan: regulator-wwan { - compatible =3D "regulator-fixed"; - - regulator-name =3D "SDX_VPH_PWR"; - regulator-min-microvolt =3D <3300000>; - regulator-max-microvolt =3D <3300000>; - - gpio =3D <&tlmm 221 GPIO_ACTIVE_HIGH>; - enable-active-high; - - pinctrl-0 =3D <&wwan_sw_en>; - pinctrl-names =3D "default"; - - regulator-boot-on; - }; }; =20 -&apps_rsc { - regulators-0 { - compatible =3D "qcom,pm8550-rpmh-regulators"; - qcom,pmic-id =3D "b"; - - vdd-bob1-supply =3D <&vph_pwr>; - vdd-bob2-supply =3D <&vph_pwr>; - vdd-l1-l4-l10-supply =3D <&vreg_s4c_1p8>; - vdd-l2-l13-l14-supply =3D <&vreg_bob1>; - vdd-l5-l16-supply =3D <&vreg_bob1>; - vdd-l6-l7-supply =3D <&vreg_bob2>; - vdd-l8-l9-supply =3D <&vreg_bob1>; - vdd-l12-supply =3D <&vreg_s5j_1p2>; - vdd-l15-supply =3D <&vreg_s4c_1p8>; - vdd-l17-supply =3D <&vreg_bob2>; - - vreg_bob1: bob1 { - regulator-name =3D "vreg_bob1"; - regulator-min-microvolt =3D <3008000>; - regulator-max-microvolt =3D <3960000>; - regulator-initial-mode =3D ; - }; - - vreg_bob2: bob2 { - regulator-name =3D "vreg_bob2"; - regulator-min-microvolt =3D <2504000>; - regulator-max-microvolt =3D <3008000>; - regulator-initial-mode =3D ; - }; - - vreg_l1b_1p8: ldo1 { - regulator-name =3D "vreg_l1b_1p8"; - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-initial-mode =3D ; - }; - - vreg_l2b_3p0: ldo2 { - regulator-name =3D "vreg_l2b_3p0"; - regulator-min-microvolt =3D <3072000>; - regulator-max-microvolt =3D <3100000>; - regulator-initial-mode =3D ; - }; - - vreg_l4b_1p8: ldo4 { - regulator-name =3D "vreg_l4b_1p8"; - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-initial-mode =3D ; - }; - - vreg_l5b_3p0: ldo5 { - regulator-name =3D "vreg_l5b_3p0"; - regulator-min-microvolt =3D <3000000>; - regulator-max-microvolt =3D <3000000>; - regulator-initial-mode =3D ; - }; - - vreg_l6b_1p8: ldo6 { - regulator-name =3D "vreg_l6b_1p8"; - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <2960000>; - regulator-initial-mode =3D ; - }; - - vreg_l7b_2p8: ldo7 { - regulator-name =3D "vreg_l7b_2p8"; - regulator-min-microvolt =3D <2800000>; - regulator-max-microvolt =3D <2800000>; - regulator-initial-mode =3D ; - }; - - vreg_l8b_3p0: ldo8 { - regulator-name =3D "vreg_l8b_3p0"; - regulator-min-microvolt =3D <3072000>; - regulator-max-microvolt =3D <3072000>; - regulator-initial-mode =3D ; - }; - - vreg_l9b_2p9: ldo9 { - regulator-name =3D "vreg_l9b_2p9"; - regulator-min-microvolt =3D <2960000>; - regulator-max-microvolt =3D <2960000>; - regulator-initial-mode =3D ; - }; - - vreg_l10b_1p8: ldo10 { - regulator-name =3D "vreg_l10b_1p8"; - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-initial-mode =3D ; - }; - - vreg_l12b_1p2: ldo12 { - regulator-name =3D "vreg_l12b_1p2"; - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - regulator-initial-mode =3D ; - }; - - vreg_l13b_3p0: ldo13 { - regulator-name =3D "vreg_l13b_3p0"; - regulator-min-microvolt =3D <3072000>; - regulator-max-microvolt =3D <3100000>; - regulator-initial-mode =3D ; - }; - - vreg_l14b_3p0: ldo14 { - regulator-name =3D "vreg_l14b_3p0"; - regulator-min-microvolt =3D <3072000>; - regulator-max-microvolt =3D <3072000>; - regulator-initial-mode =3D ; - }; - - vreg_l15b_1p8: ldo15 { - regulator-name =3D "vreg_l15b_1p8"; - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-initial-mode =3D ; - }; - - vreg_l16b_2p9: ldo16 { - regulator-name =3D "vreg_l16b_2p9"; - regulator-min-microvolt =3D <2912000>; - regulator-max-microvolt =3D <2912000>; - regulator-initial-mode =3D ; - }; - - vreg_l17b_2p5: ldo17 { - regulator-name =3D "vreg_l17b_2p5"; - regulator-min-microvolt =3D <2504000>; - regulator-max-microvolt =3D <2504000>; - regulator-initial-mode =3D ; - }; - }; - - regulators-1 { - compatible =3D "qcom,pm8550ve-rpmh-regulators"; - qcom,pmic-id =3D "c"; - - vdd-l1-supply =3D <&vreg_s5j_1p2>; - vdd-l2-supply =3D <&vreg_s1f_0p7>; - vdd-l3-supply =3D <&vreg_s1f_0p7>; - vdd-s4-supply =3D <&vph_pwr>; - - vreg_s4c_1p8: smps4 { - regulator-name =3D "vreg_s4c_1p8"; - regulator-min-microvolt =3D <1856000>; - regulator-max-microvolt =3D <2000000>; - regulator-initial-mode =3D ; - }; - - vreg_l1c_1p2: ldo1 { - regulator-name =3D "vreg_l1c_1p2"; - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - regulator-initial-mode =3D ; - }; - - vreg_l2c_0p8: ldo2 { - regulator-name =3D "vreg_l2c_0p8"; - regulator-min-microvolt =3D <880000>; - regulator-max-microvolt =3D <920000>; - regulator-initial-mode =3D ; - }; - - vreg_l3c_0p8: ldo3 { - regulator-name =3D "vreg_l3c_0p8"; - regulator-min-microvolt =3D <880000>; - regulator-max-microvolt =3D <920000>; - regulator-initial-mode =3D ; - }; - }; - - regulators-2 { - compatible =3D "qcom,pmc8380-rpmh-regulators"; - qcom,pmic-id =3D "d"; - - vdd-l1-supply =3D <&vreg_s1f_0p7>; - vdd-l2-supply =3D <&vreg_s1f_0p7>; - vdd-l3-supply =3D <&vreg_s4c_1p8>; - vdd-s1-supply =3D <&vph_pwr>; - - vreg_l1d_0p8: ldo1 { - regulator-name =3D "vreg_l1d_0p8"; - regulator-min-microvolt =3D <880000>; - regulator-max-microvolt =3D <920000>; - regulator-initial-mode =3D ; - }; - - vreg_l2d_0p9: ldo2 { - regulator-name =3D "vreg_l2d_0p9"; - regulator-min-microvolt =3D <912000>; - regulator-max-microvolt =3D <920000>; - regulator-initial-mode =3D ; - }; - - vreg_l3d_1p8: ldo3 { - regulator-name =3D "vreg_l3d_1p8"; - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-initial-mode =3D ; - }; - }; - - regulators-3 { - compatible =3D "qcom,pmc8380-rpmh-regulators"; - qcom,pmic-id =3D "e"; - - vdd-l2-supply =3D <&vreg_s1f_0p7>; - vdd-l3-supply =3D <&vreg_s5j_1p2>; - - vreg_l2e_0p8: ldo2 { - regulator-name =3D "vreg_l2e_0p8"; - regulator-min-microvolt =3D <880000>; - regulator-max-microvolt =3D <920000>; - regulator-initial-mode =3D ; - }; - - vreg_l3e_1p2: ldo3 { - regulator-name =3D "vreg_l3e_1p2"; - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - regulator-initial-mode =3D ; - }; - }; - - regulators-4 { - compatible =3D "qcom,pmc8380-rpmh-regulators"; - qcom,pmic-id =3D "f"; - - vdd-l1-supply =3D <&vreg_s5j_1p2>; - vdd-l2-supply =3D <&vreg_s5j_1p2>; - vdd-l3-supply =3D <&vreg_s5j_1p2>; - vdd-s1-supply =3D <&vph_pwr>; - - vreg_s1f_0p7: smps1 { - regulator-name =3D "vreg_s1f_0p7"; - regulator-min-microvolt =3D <700000>; - regulator-max-microvolt =3D <1100000>; - regulator-initial-mode =3D ; - }; - - vreg_l1f_1p0: ldo1 { - regulator-name =3D "vreg_l1f_1p0"; - regulator-min-microvolt =3D <1024000>; - regulator-max-microvolt =3D <1024000>; - regulator-initial-mode =3D ; - }; - - vreg_l2f_1p0: ldo2 { - regulator-name =3D "vreg_l2f_1p0"; - regulator-min-microvolt =3D <1024000>; - regulator-max-microvolt =3D <1024000>; - regulator-initial-mode =3D ; - }; - - vreg_l3f_1p0: ldo3 { - regulator-name =3D "vreg_l3f_1p0"; - regulator-min-microvolt =3D <1024000>; - regulator-max-microvolt =3D <1024000>; - regulator-initial-mode =3D ; - }; - }; - - regulators-6 { - compatible =3D "qcom,pm8550ve-rpmh-regulators"; - qcom,pmic-id =3D "i"; - - vdd-l1-supply =3D <&vreg_s4c_1p8>; - vdd-l2-supply =3D <&vreg_s5j_1p2>; - vdd-l3-supply =3D <&vreg_s1f_0p7>; - vdd-s1-supply =3D <&vph_pwr>; - vdd-s2-supply =3D <&vph_pwr>; - - vreg_s1i_0p9: smps1 { - regulator-name =3D "vreg_s1i_0p9"; - regulator-min-microvolt =3D <900000>; - regulator-max-microvolt =3D <920000>; - regulator-initial-mode =3D ; - }; - - vreg_s2i_1p0: smps2 { - regulator-name =3D "vreg_s2i_1p0"; - regulator-min-microvolt =3D <1000000>; - regulator-max-microvolt =3D <1100000>; - regulator-initial-mode =3D ; - }; - - vreg_l1i_1p8: ldo1 { - regulator-name =3D "vreg_l1i_1p8"; - regulator-min-microvolt =3D <1800000>; - regulator-max-microvolt =3D <1800000>; - regulator-initial-mode =3D ; - }; - - vreg_l2i_1p2: ldo2 { - regulator-name =3D "vreg_l2i_1p2"; - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - regulator-initial-mode =3D ; - }; - - vreg_l3i_0p8: ldo3 { - regulator-name =3D "vreg_l3i_0p8"; - regulator-min-microvolt =3D <880000>; - regulator-max-microvolt =3D <920000>; - regulator-initial-mode =3D ; - }; - }; - - regulators-7 { - compatible =3D "qcom,pm8550ve-rpmh-regulators"; - qcom,pmic-id =3D "j"; - - vdd-l1-supply =3D <&vreg_s1f_0p7>; - vdd-l2-supply =3D <&vreg_s5j_1p2>; - vdd-l3-supply =3D <&vreg_s1f_0p7>; - vdd-s5-supply =3D <&vph_pwr>; - - vreg_s5j_1p2: smps5 { - regulator-name =3D "vreg_s5j_1p2"; - regulator-min-microvolt =3D <1256000>; - regulator-max-microvolt =3D <1304000>; - regulator-initial-mode =3D ; - }; - - vreg_l1j_0p8: ldo1 { - regulator-name =3D "vreg_l1j_0p8"; - regulator-min-microvolt =3D <880000>; - regulator-max-microvolt =3D <920000>; - regulator-initial-mode =3D ; - }; - - vreg_l2j_1p2: ldo2 { - regulator-name =3D "vreg_l2j_1p2"; - regulator-min-microvolt =3D <1200000>; - regulator-max-microvolt =3D <1200000>; - regulator-initial-mode =3D ; - }; - - vreg_l3j_0p8: ldo3 { - regulator-name =3D "vreg_l3j_0p8"; - regulator-min-microvolt =3D <880000>; - regulator-max-microvolt =3D <920000>; - regulator-initial-mode =3D ; - }; - }; -}; - -&gpu { - status =3D "okay"; - - zap-shader { - firmware-name =3D "qcom/x1e80100/gen70500_zap.mbn"; - }; -}; - -&i2c0 { - clock-frequency =3D <400000>; - - status =3D "okay"; - - touchpad@15 { - compatible =3D "hid-over-i2c"; - reg =3D <0x15>; - - hid-descr-addr =3D <0x1>; - interrupts-extended =3D <&tlmm 3 IRQ_TYPE_LEVEL_LOW>; - - vdd-supply =3D <&vreg_misc_3p3>; - vddl-supply =3D <&vreg_l12b_1p2>; - - pinctrl-0 =3D <&tpad_default>; - pinctrl-names =3D "default"; - - wakeup-source; - }; - - keyboard@3a { - compatible =3D "hid-over-i2c"; - reg =3D <0x3a>; - - hid-descr-addr =3D <0x1>; - interrupts-extended =3D <&tlmm 67 IRQ_TYPE_LEVEL_LOW>; - - vdd-supply =3D <&vreg_misc_3p3>; - vddl-supply =3D <&vreg_l12b_1p2>; - - pinctrl-0 =3D <&kybd_default>; - pinctrl-names =3D "default"; - - wakeup-source; - }; -}; - -&i2c8 { - clock-frequency =3D <400000>; - - status =3D "okay"; - - touchscreen@10 { - compatible =3D "hid-over-i2c"; - reg =3D <0x10>; - - hid-descr-addr =3D <0x1>; - interrupts-extended =3D <&tlmm 51 IRQ_TYPE_LEVEL_LOW>; - - vdd-supply =3D <&vreg_misc_3p3>; - vddl-supply =3D <&vreg_l15b_1p8>; - - pinctrl-0 =3D <&ts0_default>; - pinctrl-names =3D "default"; - }; -}; - -&lpass_tlmm { - spkr_01_sd_n_active: spkr-01-sd-n-active-state { - pins =3D "gpio12"; - function =3D "gpio"; - drive-strength =3D <16>; - bias-disable; - output-low; - }; - - spkr_23_sd_n_active: spkr-23-sd-n-active-state { - pins =3D "gpio13"; - function =3D "gpio"; - drive-strength =3D <16>; - bias-disable; - output-low; - }; -}; - -&lpass_vamacro { - pinctrl-0 =3D <&dmic01_default>, <&dmic23_default>; - pinctrl-names =3D "default"; - - vdd-micb-supply =3D <&vreg_l1b_1p8>; - qcom,dmic-sample-rate =3D <4800000>; -}; - -&mdss { - status =3D "okay"; -}; - -&mdss_dp3 { - compatible =3D "qcom,x1e80100-dp"; - /delete-property/ #sound-dai-cells; - - status =3D "okay"; - - aux-bus { - panel { - compatible =3D "samsung,atna45af01", "samsung,atna33xc20"; - enable-gpios =3D <&pmc8380_3_gpios 4 GPIO_ACTIVE_HIGH>; - power-supply =3D <&vreg_edp_3p3>; - - pinctrl-0 =3D <&edp_bl_en>; - pinctrl-names =3D "default"; - - port { - edp_panel_in: endpoint { - remote-endpoint =3D <&mdss_dp3_out>; - }; - }; - }; - }; - - ports { - port@1 { - reg =3D <1>; - mdss_dp3_out: endpoint { - data-lanes =3D <0 1 2 3>; - link-frequencies =3D /bits/ 64 <1620000000 2700000000 5400000000 81000= 00000>; - - remote-endpoint =3D <&edp_panel_in>; - }; - }; - }; -}; - -&mdss_dp3_phy { - vdda-phy-supply =3D <&vreg_l3j_0p8>; - vdda-pll-supply =3D <&vreg_l2j_1p2>; - - status =3D "okay"; -}; - -&pcie4 { - perst-gpios =3D <&tlmm 146 GPIO_ACTIVE_LOW>; - wake-gpios =3D <&tlmm 148 GPIO_ACTIVE_LOW>; - - pinctrl-0 =3D <&pcie4_default>; - pinctrl-names =3D "default"; - - status =3D "okay"; -}; - -&pcie4_phy { - vdda-phy-supply =3D <&vreg_l3i_0p8>; - vdda-pll-supply =3D <&vreg_l3e_1p2>; - - status =3D "okay"; -}; - -&pcie5 { - perst-gpios =3D <&tlmm 149 GPIO_ACTIVE_LOW>; - wake-gpios =3D <&tlmm 151 GPIO_ACTIVE_LOW>; - - vddpe-3v3-supply =3D <&vreg_wwan>; - - pinctrl-0 =3D <&pcie5_default>; - pinctrl-names =3D "default"; - - status =3D "okay"; -}; - -&pcie5_phy { - vdda-phy-supply =3D <&vreg_l3i_0p8>; - vdda-pll-supply =3D <&vreg_l3e_1p2>; - - status =3D "okay"; -}; - -&pcie6a { - perst-gpios =3D <&tlmm 152 GPIO_ACTIVE_LOW>; - wake-gpios =3D <&tlmm 154 GPIO_ACTIVE_LOW>; - - vddpe-3v3-supply =3D <&vreg_nvme>; - - pinctrl-names =3D "default"; - pinctrl-0 =3D <&pcie6a_default>; - - status =3D "okay"; -}; - -&pcie6a_phy { - vdda-phy-supply =3D <&vreg_l1d_0p8>; - vdda-pll-supply =3D <&vreg_l2j_1p2>; - - status =3D "okay"; -}; - -&pm8550ve_8_gpios { - misc_3p3_reg_en: misc-3p3-reg-en-state { - pins =3D "gpio6"; - function =3D "normal"; - bias-disable; - input-disable; - output-enable; - drive-push-pull; - power-source =3D <1>; /* 1.8 V */ - qcom,drive-strength =3D ; - }; -}; - -&pmc8380_3_gpios { - edp_bl_en: edp-bl-en-state { - pins =3D "gpio4"; - function =3D "normal"; - power-source =3D <1>; /* 1.8V */ - input-disable; - output-enable; - }; -}; - -&qupv3_0 { - status =3D "okay"; -}; - -&qupv3_1 { - status =3D "okay"; -}; - -&qupv3_2 { - status =3D "okay"; -}; - -&remoteproc_adsp { - firmware-name =3D "qcom/x1e80100/adsp.mbn", - "qcom/x1e80100/adsp_dtb.mbn"; - - status =3D "okay"; -}; - -&remoteproc_cdsp { - firmware-name =3D "qcom/x1e80100/cdsp.mbn", - "qcom/x1e80100/cdsp_dtb.mbn"; - - status =3D "okay"; -}; - -&smb2360_0 { - status =3D "okay"; -}; - -&smb2360_0_eusb2_repeater { - vdd18-supply =3D <&vreg_l3d_1p8>; - vdd3-supply =3D <&vreg_l2b_3p0>; -}; - -&smb2360_1 { - status =3D "okay"; -}; - -&smb2360_1_eusb2_repeater { - vdd18-supply =3D <&vreg_l3d_1p8>; - vdd3-supply =3D <&vreg_l14b_3p0>; -}; - -&smb2360_2 { - status =3D "okay"; -}; - -&smb2360_2_eusb2_repeater { - vdd18-supply =3D <&vreg_l3d_1p8>; - vdd3-supply =3D <&vreg_l8b_3p0>; -}; - -&swr0 { - status =3D "okay"; - - pinctrl-0 =3D <&wsa_swr_active>, <&spkr_01_sd_n_active>; - pinctrl-names =3D "default"; - - /* WSA8845, Left Woofer */ - left_woofer: speaker@0,0 { - compatible =3D "sdw20217020400"; - reg =3D <0 0>; - reset-gpios =3D <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; - #sound-dai-cells =3D <0>; - sound-name-prefix =3D "WooferLeft"; - vdd-1p8-supply =3D <&vreg_l15b_1p8>; - vdd-io-supply =3D <&vreg_l12b_1p2>; - qcom,port-mapping =3D <1 2 3 7 10 13>; - }; - - /* WSA8845, Left Tweeter */ - left_tweeter: speaker@0,1 { - compatible =3D "sdw20217020400"; - reg =3D <0 1>; - reset-gpios =3D <&lpass_tlmm 12 GPIO_ACTIVE_LOW>; - #sound-dai-cells =3D <0>; - sound-name-prefix =3D "TweeterLeft"; - vdd-1p8-supply =3D <&vreg_l15b_1p8>; - vdd-io-supply =3D <&vreg_l12b_1p2>; - qcom,port-mapping =3D <4 5 6 7 11 13>; - }; -}; - -&swr1 { - status =3D "okay"; - - /* WCD9385 RX */ - wcd_rx: codec@0,4 { - compatible =3D "sdw20217010d00"; - reg =3D <0 4>; - qcom,rx-port-mapping =3D <1 2 3 4 5>; - }; -}; - -&swr2 { - status =3D "okay"; - - /* WCD9385 TX */ - wcd_tx: codec@0,3 { - compatible =3D "sdw20217010d00"; - reg =3D <0 3>; - qcom,tx-port-mapping =3D <2 2 3 4>; - }; -}; - -&swr3 { - status =3D "okay"; - - pinctrl-0 =3D <&wsa2_swr_active>, <&spkr_23_sd_n_active>; - pinctrl-names =3D "default"; - - /* WSA8845, Right Woofer */ - right_woofer: speaker@0,0 { - compatible =3D "sdw20217020400"; - reg =3D <0 0>; - reset-gpios =3D <&lpass_tlmm 13 GPIO_ACTIVE_LOW>; - #sound-dai-cells =3D <0>; - sound-name-prefix =3D "WooferRight"; - vdd-1p8-supply =3D <&vreg_l15b_1p8>; - vdd-io-supply =3D <&vreg_l12b_1p2>; - qcom,port-mapping =3D <1 2 3 7 10 13>; - }; - - /* WSA8845, Right Tweeter */ - right_tweeter: speaker@0,1 { - compatible =3D "sdw20217020400"; - reg =3D <0 1>; - reset-gpios =3D <&lpass_tlmm 13 GPIO_ACTIVE_LOW>; - #sound-dai-cells =3D <0>; - sound-name-prefix =3D "TweeterRight"; - vdd-1p8-supply =3D <&vreg_l15b_1p8>; - vdd-io-supply =3D <&vreg_l12b_1p2>; - qcom,port-mapping =3D <4 5 6 7 11 13>; - }; -}; - -&tlmm { - gpio-reserved-ranges =3D <34 2>, /* Unused */ - <44 4>, /* SPI (TPM) */ - <238 1>; /* UFS Reset */ - - edp_reg_en: edp-reg-en-state { - pins =3D "gpio70"; - function =3D "gpio"; - drive-strength =3D <16>; - bias-disable; - }; - - hall_int_n_default: hall-int-n-state { - pins =3D "gpio92"; - function =3D "gpio"; - bias-disable; - }; - - kybd_default: kybd-default-state { - pins =3D "gpio67"; - function =3D "gpio"; - bias-disable; - }; - - nvme_reg_en: nvme-reg-en-state { - pins =3D "gpio18"; - function =3D "gpio"; - drive-strength =3D <2>; - bias-disable; - }; - - pcie4_default: pcie4-default-state { - clkreq-n-pins { - pins =3D "gpio147"; - function =3D "pcie4_clk"; - drive-strength =3D <2>; - bias-pull-up; - }; - - perst-n-pins { - pins =3D "gpio146"; - function =3D "gpio"; - drive-strength =3D <2>; - bias-disable; - }; - - wake-n-pins { - pins =3D "gpio148"; - function =3D "gpio"; - drive-strength =3D <2>; - bias-pull-up; - }; - }; - - pcie5_default: pcie5-default-state { - clkreq-n-pins { - pins =3D "gpio150"; - function =3D "pcie5_clk"; - drive-strength =3D <2>; - bias-pull-up; - }; - - perst-n-pins { - pins =3D "gpio149"; - function =3D "gpio"; - drive-strength =3D <2>; - bias-disable; - }; - - wake-n-pins { - pins =3D "gpio151"; - function =3D "gpio"; - drive-strength =3D <2>; - bias-pull-up; - }; - }; - - pcie6a_default: pcie6a-default-state { - clkreq-n-pins { - pins =3D "gpio153"; - function =3D "pcie6a_clk"; - drive-strength =3D <2>; - bias-pull-up; - }; - - perst-n-pins { - pins =3D "gpio152"; - function =3D "gpio"; - drive-strength =3D <2>; - bias-disable; - }; - - wake-n-pins { - pins =3D "gpio154"; - function =3D "gpio"; - drive-strength =3D <2>; - bias-pull-up; - }; - }; - - tpad_default: tpad-default-state { - pins =3D "gpio3"; - function =3D "gpio"; - bias-disable; - }; - - ts0_default: ts0-default-state { - int-n-pins { - pins =3D "gpio51"; - function =3D "gpio"; - bias-disable; - }; - - reset-n-pins { - pins =3D "gpio48"; - function =3D "gpio"; - output-high; - drive-strength =3D <16>; - }; - }; - - wcd_default: wcd-reset-n-active-state { - pins =3D "gpio191"; - function =3D "gpio"; - drive-strength =3D <16>; - bias-disable; - output-low; - }; - - wwan_sw_en: wwan-sw-en-state { - pins =3D "gpio221"; - function =3D "gpio"; - drive-strength =3D <4>; - bias-disable; - }; -}; - -&uart21 { - compatible =3D "qcom,geni-debug-uart"; - status =3D "okay"; -}; - -&usb_1_ss0_hsphy { - vdd-supply =3D <&vreg_l3j_0p8>; - vdda12-supply =3D <&vreg_l2j_1p2>; - - phys =3D <&smb2360_0_eusb2_repeater>; - - status =3D "okay"; -}; - -&usb_1_ss0_qmpphy { - vdda-phy-supply =3D <&vreg_l2j_1p2>; - vdda-pll-supply =3D <&vreg_l1j_0p8>; - - status =3D "okay"; -}; - -&usb_1_ss0 { - status =3D "okay"; -}; - -&usb_1_ss0_dwc3 { - dr_mode =3D "host"; -}; - -&usb_1_ss0_dwc3_hs { - remote-endpoint =3D <&pmic_glink_ss0_hs_in>; -}; - -&usb_1_ss0_qmpphy_out { - remote-endpoint =3D <&pmic_glink_ss0_ss_in>; -}; - -&usb_1_ss1_hsphy { - vdd-supply =3D <&vreg_l3j_0p8>; - vdda12-supply =3D <&vreg_l2j_1p2>; - - phys =3D <&smb2360_1_eusb2_repeater>; - - status =3D "okay"; -}; - -&usb_1_ss1_qmpphy { - vdda-phy-supply =3D <&vreg_l2j_1p2>; - vdda-pll-supply =3D <&vreg_l2d_0p9>; - - status =3D "okay"; -}; - -&usb_1_ss1 { - status =3D "okay"; -}; - -&usb_1_ss1_dwc3 { - dr_mode =3D "host"; -}; - -&usb_1_ss1_dwc3_hs { - remote-endpoint =3D <&pmic_glink_ss1_hs_in>; -}; - -&usb_1_ss1_qmpphy_out { - remote-endpoint =3D <&pmic_glink_ss1_ss_in>; -}; - -&usb_1_ss2_hsphy { - vdd-supply =3D <&vreg_l3j_0p8>; - vdda12-supply =3D <&vreg_l2j_1p2>; - - phys =3D <&smb2360_2_eusb2_repeater>; - - status =3D "okay"; -}; - -&usb_1_ss2_qmpphy { - vdda-phy-supply =3D <&vreg_l2j_1p2>; - vdda-pll-supply =3D <&vreg_l2d_0p9>; - - status =3D "okay"; -}; - -&usb_1_ss2 { - status =3D "okay"; -}; - -&usb_1_ss2_dwc3 { - dr_mode =3D "host"; -}; - -&usb_1_ss2_dwc3_hs { - remote-endpoint =3D <&pmic_glink_ss2_hs_in>; -}; - -&usb_1_ss2_qmpphy_out { - remote-endpoint =3D <&pmic_glink_ss2_ss_in>; +&gpu_zap_shader { + firmware-name =3D "qcom/x1e80100/gen70500_zap.mbn"; }; diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/q= com/x1e80100.dtsi index a244cbb84aecc23ce11414c41f2e5d0905f455ee..9d14d53180734ed3eda2ed70b54= e9ee8acbcd892 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi +++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi @@ -3751,7 +3751,7 @@ gpu: gpu@3d00000 { =20 status =3D "disabled"; =20 - zap-shader { + gpu_zap_shader: zap-shader { memory-region =3D <&gpu_microcode_mem>; }; =20 --=20 2.48.1