From f9a0ce75cfc40eb4f7da67b4c747247edb4e3479 Mon Sep 17 00:00:00 2001 From: Denys Vitali <denys@denv.it> Date: Fri, 22 Nov 2024 15:50:44 +0100 Subject: [PATCH] arm64: dts: qcom: sm8250-oneplus-instantnoodlep: Restore Wi-Fi / BT functionality --- .../qcom/sm8250-oneplus-instantnoodlep.dts | 131 +++++++++++++++--- 1 file changed, 110 insertions(+), 21 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8250-oneplus-instantnoodlep.dts b/arch/arm64/boot/dts/qcom/sm8250-oneplus-instantnoodlep.dts index 2ff46c2979e57..b3b878e6cbea8 100644 --- a/arch/arm64/boot/dts/qcom/sm8250-oneplus-instantnoodlep.dts +++ b/arch/arm64/boot/dts/qcom/sm8250-oneplus-instantnoodlep.dts @@ -78,6 +78,67 @@ vol-down { gpio-key,wakeup; }; }; + + qca6390-pmu { + compatible = "qcom,qca6390-pmu"; + + pinctrl-names = "default"; + pinctrl-0 = <&bt_en_state>, <&wlan_en_state>; + + vddaon-supply = <&vreg_s6a_0p95>; + vddpmu-supply = <&vreg_s2f_0p95>; + vddrfa0p95-supply = <&vreg_s2f_0p95>; + vddrfa1p3-supply = <&vreg_s8c_1p3>; + vddrfa1p9-supply = <&vreg_s5a_1p9>; + vddpcie1p3-supply = <&vreg_s8c_1p3>; + vddpcie1p9-supply = <&vreg_s5a_1p9>; + vddio-supply = <&vreg_s4a_1p8>; + + wlan-enable-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>; + bt-enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; + + regulators { + vreg_pmu_rfa_cmn: ldo0 { + regulator-name = "vreg_pmu_rfa_cmn"; + }; + + vreg_pmu_aon_0p59: ldo1 { + regulator-name = "vreg_pmu_aon_0p59"; + }; + + vreg_pmu_wlcx_0p8: ldo2 { + regulator-name = "vreg_pmu_wlcx_0p8"; + }; + + vreg_pmu_wlmx_0p85: ldo3 { + regulator-name = "vreg_pmu_wlmx_0p85"; + }; + + vreg_pmu_btcmx_0p85: ldo4 { + regulator-name = "vreg_pmu_btcmx_0p85"; + }; + + vreg_pmu_rfa_0p8: ldo5 { + regulator-name = "vreg_pmu_rfa_0p8"; + }; + + vreg_pmu_rfa_1p2: ldo6 { + regulator-name = "vreg_pmu_rfa_1p2"; + }; + + vreg_pmu_rfa_1p7: ldo7 { + regulator-name = "vreg_pmu_rfa_1p7"; + }; + + vreg_pmu_pcie_0p9: ldo8 { + regulator-name = "vreg_pmu_pcie_0p9"; + }; + + vreg_pmu_pcie_1p8: ldo9 { + regulator-name = "vreg_pmu_pcie_1p8"; + }; + }; + }; reserved-memory { removed_mem: memory@80b00000 { @@ -192,7 +253,7 @@ vreg_s4a_1p8: vreg-s4a-1p8 { qca639x: qca639x { compatible = "qcom,qca6390"; #power-domain-cells = <0>; - + vddaon-supply = <&vreg_s6a_0p95>; vddpmu-supply = <&vreg_s2f_0p95>; vddrfa1-supply = <&vreg_s2f_0p95>; @@ -203,9 +264,9 @@ qca639x: qca639x { vddio-supply = <&vreg_s4a_1p8>; pinctrl-names = "default", "sleep"; - pinctrl-0 = <&wlan_en_active>; + pinctrl-0 = <&wlan_en_state>; pinctrl-1 = <&wlan_en_sleep>; - + wlan-en-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>; }; @@ -390,6 +451,7 @@ vreg_s5a_1p9: smps5 { regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>; }; + vreg_s6a_0p95: smps6 { regulator-name = "vreg_s6a_0p95"; regulator-min-microvolt = <920000>; @@ -614,15 +676,32 @@ &slpi { status = "okay"; }; + &pcie0 { status = "okay"; }; &pcie0_phy { + status = "okay"; vdda-phy-supply = <&vreg_l5a_0p88>; vdda-pll-supply = <&vreg_l9a_1p2>; - status = "okay"; - power-domains = <&qca639x>; +}; + +&pcieport0 { + wifi@0 { + compatible = "pci17cb,1101"; + reg = <0x10000 0x0 0x0 0x0 0x0>; + + vddrfacmn-supply = <&vreg_pmu_rfa_cmn>; + vddaon-supply = <&vreg_pmu_aon_0p59>; + vddwlcx-supply = <&vreg_pmu_wlcx_0p8>; + vddwlmx-supply = <&vreg_pmu_wlmx_0p85>; + vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>; + vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>; + vddpcie0p9-supply = <&vreg_pmu_pcie_0p9>; + vddpcie1p8-supply = <&vreg_pmu_pcie_1p8>; + }; }; &pcie1 { @@ -697,7 +776,7 @@ &qupv3_id_2 { &tlmm { gpio-reserved-ranges = <28 4>, <40 4>; - bt_en_active: bt-default-state { + bt_en_state: bt-default-state { bt-en { pins = "gpio21"; function = "gpio"; @@ -717,7 +796,7 @@ bt_en_sleep: bt-sleep-state { bias-pull-down; }; - wlan_en_active: wlan-default-state { + wlan_en_state: wlan-default-state { wlan-en { pins = "gpio20"; function = "gpio"; @@ -752,20 +831,6 @@ ts_rst_suspend: ts-rst-suspend { }; }; -&uart6 { - status = "okay"; - - bluetooth { - compatible = "qcom,qca6390-bt"; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&bt_en_active>; - pinctrl-1 = <&bt_en_sleep>; - - power-domains = <&qca639x>; - enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; - }; -}; - &ufs_mem_hc { vcc-supply = <&vreg_l17a_3p0>; vcc-max-microamp = <800000>; @@ -830,3 +895,27 @@ &venus { firmware-name = "postmarketos/venus.mbn"; status = "okay"; }; + + +&uart6 { + status = "okay"; + + bluetooth { + compatible = "qcom,qca6390-bt"; + + vddrfacmn-supply = <&vreg_pmu_rfa_cmn>; + vddaon-supply = <&vreg_pmu_aon_0p59>; + vddbtcmx-supply = <&vreg_pmu_btcmx_0p85>; + vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>; + vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>; + vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>; + }; +}; + +&qup_i2c7_default { + status = "disabled"; +}; + +&qup_spi7_data_clk { + status = "disabled"; +}; \ No newline at end of file -- GitLab