arm64: dts: qcom: qrb5165-rb5: add the Wifi node

Add a node for the PMU module of the QCA6391 present on the RB5 board.
Assign its LDO power outputs to the existing Bluetooth module. Add a
node for the PCIe port to sm8250.dtsi and define the WLAN node on it in
the board's .dts and also make it consume the power outputs of the PMU.

Tested-by: Caleb Connolly <caleb.connolly@linaro.org> # OnePlus 8T
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240605122729.24283-5-brgl@bgdev.pl
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index f22821c133672cda7d8cee2d3c02a7b989f19f88..ccff6cd73fdfab52707b53473b1d989a0ce25a9d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -108,6 +108,67 @@
                regulator-always-on;
        };
 
+       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";
+                       };
+               };
+       };
+
        thermal-zones {
                conn-thermal {
                        thermal-sensors = <&pm8150b_adc_tm 0>;
@@ -724,6 +785,23 @@
        vdda-pll-supply = <&vreg_l9a_1p2>;
 };
 
+&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 {
        status = "okay";
 };
@@ -1293,6 +1371,14 @@
                function = "gpio";
                bias-pull-up;
        };
+
+       wlan_en_state: wlan-default-state {
+               pins = "gpio20";
+               function = "gpio";
+               drive-strength = <16>;
+               output-low;
+               bias-pull-up;
+       };
 };
 
 &uart6 {
@@ -1301,17 +1387,12 @@
        bluetooth {
                compatible = "qcom,qca6390-bt";
 
-               pinctrl-names = "default";
-               pinctrl-0 = <&bt_en_state>;
-
-               enable-gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>;
-
-               vddio-supply = <&vreg_s4a_1p8>;
-               vddpmu-supply = <&vreg_s2f_0p95>;
-               vddaon-supply = <&vreg_s6a_0p95>;
-               vddrfa0p9-supply = <&vreg_s2f_0p95>;
-               vddrfa1p3-supply = <&vreg_s8c_1p3>;
-               vddrfa1p9-supply = <&vreg_s5a_1p9>;
+               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>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index 7a8b1ba2deb0e0f3c3dcfde7e032cb74693a859f..9d6c97d1fd9d6e12e4f88900bd04555ac244b0db 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2204,7 +2204,7 @@
 
                        status = "disabled";
 
-                       pcie@0 {
+                       pcieport0: pcie@0 {
                                device_type = "pci";
                                reg = <0x0 0x0 0x0 0x0 0x0>;
                                bus-range = <0x01 0xff>;