Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / sm8550-qrd.dts

diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
index 950dfbf..eef811d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
@@ -14,7 +14,8 @@
 #include "pm8550ve.dtsi"
 #include "pm8550vs.dtsi"
 #include "pmk8550.dtsi"
-#include "pmr735d.dtsi"
+#include "pmr735d_a.dtsi"
+#include "pmr735d_b.dtsi"
 
 / {
        model = "Qualcomm Technologies, Inc. SM8550 QRD";
@@ -23,6 +24,7 @@
 
        aliases {
                serial0 = &uart7;
+               serial1 = &uart14;
        };
 
        wcd938x: audio-codec {
@@ -766,6 +768,10 @@
        status = "okay";
 };
 
+&qupv3_id_1 {
+       status = "okay";
+};
+
 &remoteproc_adsp {
        firmware-name = "qcom/sm8550/adsp.mbn",
                        "qcom/sm8550/adsp_dtb.mbn";
@@ -843,6 +849,21 @@
 &tlmm {
        gpio-reserved-ranges = <32 8>;
 
+       bt_default: bt-default-state {
+               bt-en-pins {
+                       pins = "gpio81";
+                       function = "gpio";
+                       drive-strength = <16>;
+                       bias-disable;
+               };
+
+               sw-ctrl-pins {
+                       pins = "gpio82";
+                       function = "gpio";
+                       bias-pull-down;
+               };
+       };
+
        sde_dsi_active: sde-dsi-active-state {
                pins = "gpio133";
                function = "gpio";
@@ -884,14 +905,36 @@
        status = "okay";
 };
 
+&uart14 {
+       status = "okay";
+
+       bluetooth {
+               compatible = "qcom,wcn7850-bt";
+
+               vddio-supply = <&vreg_l15b_1p8>;
+               vddaon-supply = <&vreg_s4e_0p95>;
+               vdddig-supply = <&vreg_s4e_0p95>;
+               vddrfa0p8-supply = <&vreg_s4e_0p95>;
+               vddrfa1p2-supply = <&vreg_s4g_1p25>;
+               vddrfa1p9-supply = <&vreg_s6g_1p86>;
+
+               max-speed = <3200000>;
+
+               enable-gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>;
+               swctrl-gpios = <&tlmm 82 GPIO_ACTIVE_HIGH>;
+
+               pinctrl-0 = <&bt_default>;
+               pinctrl-names = "default";
+       };
+};
+
 &ufs_mem_hc {
        reset-gpios = <&tlmm 210 GPIO_ACTIVE_LOW>;
        vcc-supply = <&vreg_l17b_2p5>;
        vcc-max-microamp = <1300000>;
        vccq-supply = <&vreg_l1g_1p2>;
        vccq-max-microamp = <1200000>;
-       vccq2-supply = <&vreg_l3g_1p2>;
-       vccq2-max-microamp = <100>;
+       vdd-hba-supply = <&vreg_l3g_1p2>;
 
        status = "okay";
 };