Squashed 'dts/upstream/' changes from aaba2d45dc2a..b35b9bd1d4ee

[thirdparty/u-boot.git] / src / arm64 / qcom / qrb4210-rb2.dts

diff --git a/src/arm64/qcom/qrb4210-rb2.dts b/src/arm64/qcom/qrb4210-rb2.dts
index a7278a9472ed9bfed1bea6dbb8c9d28e1499fce8..7c19f874fa716d1ca616deaf5537001204e7f9f0 100644 (file)
--- a/src/arm64/qcom/qrb4210-rb2.dts
+++ b/src/arm64/qcom/qrb4210-rb2.dts
@@ -15,6 +15,7 @@
 
        aliases {
                serial0 = &uart4;
+               serial1 = &uart3;
        };
 
        chosen {
@@ -280,6 +281,12 @@
        status = "okay";
 };
 
+&remoteproc_mpss {
+       firmware-name = "qcom/qrb4210/modem.mbn";
+
+       status = "okay";
+};
+
 &rpm_requests {
        regulators {
                compatible = "qcom,rpm-pm6125-regulators";
@@ -346,13 +353,14 @@
                };
 
                vreg_l8a_0p664: l8 {
-                       regulator-min-microvolt = <400000>;
-                       regulator-max-microvolt = <728000>;
+                       regulator-min-microvolt = <640000>;
+                       regulator-max-microvolt = <640000>;
                };
 
                vreg_l9a_1p8: l9 {
                        regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <2000000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-allow-set-load;
                };
 
                vreg_l10a_1p8: l10 {
@@ -389,11 +397,13 @@
                vreg_l16a_1p3: l16 {
                        regulator-min-microvolt = <1704000>;
                        regulator-max-microvolt = <1904000>;
+                       regulator-allow-set-load;
                };
 
                vreg_l17a_1p3: l17 {
                        regulator-min-microvolt = <1152000>;
                        regulator-max-microvolt = <1384000>;
+                       regulator-allow-set-load;
                };
 
                vreg_l18a_1p232: l18 {
@@ -424,8 +434,9 @@
                };
 
                vreg_l23a_3p3: l23 {
-                       regulator-min-microvolt = <3200000>;
-                       regulator-max-microvolt = <3400000>;
+                       regulator-min-microvolt = <3312000>;
+                       regulator-max-microvolt = <3312000>;
+                       regulator-allow-set-load;
                };
 
                vreg_l24a_2p96: l24 {
@@ -487,6 +498,66 @@
                               <56 3>, <61 2>, <64 1>,
                               <68 1>, <72 8>, <96 1>;
 
+       uart3_default: uart3-default-state {
+               cts-pins {
+                       pins = "gpio8";
+                       function = "qup3";
+                       drive-strength = <2>;
+                       bias-bus-hold;
+               };
+
+               rts-pins {
+                       pins = "gpio9";
+                       function = "qup3";
+                       drive-strength = <2>;
+                       bias-disable;
+               };
+
+               tx-pins {
+                       pins = "gpio10";
+                       function = "qup3";
+                       drive-strength = <2>;
+                       bias-disable;
+               };
+
+               rx-pins {
+                       pins = "gpio11";
+                       function = "qup3";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
+       uart3_sleep: uart3-sleep-state {
+               cts-pins {
+                       pins = "gpio8";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-bus-hold;
+               };
+
+               rts-pins {
+                       pins = "gpio9";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-down;
+               };
+
+               tx-pins {
+                       pins = "gpio10";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+
+               rx-pins {
+                       pins = "gpio11";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+       };
+
        lt9611_rst_pin: lt9611-rst-state {
                pins = "gpio41";
                function = "gpio";
@@ -508,6 +579,26 @@
        };
 };
 
+&uart3 {
+       interrupts-extended = <&intc GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
+                             <&tlmm 11 IRQ_TYPE_LEVEL_HIGH>;
+       pinctrl-0 = <&uart3_default>;
+       pinctrl-1 = <&uart3_sleep>;
+       pinctrl-names = "default", "sleep";
+       status = "okay";
+
+       bluetooth {
+               compatible = "qcom,wcn3988-bt";
+
+               vddio-supply = <&vreg_l9a_1p8>;
+               vddxo-supply = <&vreg_l16a_1p3>;
+               vddrf-supply = <&vreg_l17a_1p3>;
+               vddch0-supply = <&vreg_l23a_3p3>;
+               enable-gpios = <&tlmm 87 GPIO_ACTIVE_HIGH>;
+               max-speed = <3200000>;
+       };
+};
+
 &uart4 {
        status = "okay";
 };
@@ -518,7 +609,6 @@
 
 &usb_dwc3 {
        maximum-speed = "super-speed";
-       dr_mode = "peripheral";
 };
 
 &usb_hsphy {
@@ -536,6 +626,16 @@
        status = "okay";
 };
 
+&wifi {
+       vdd-0.8-cx-mx-supply = <&vreg_l8a_0p664>;
+       vdd-1.8-xo-supply = <&vreg_l16a_1p3>;
+       vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
+       vdd-3.3-ch0-supply = <&vreg_l23a_3p3>;
+       qcom,ath10k-calibration-variant = "Thundercomm_RB2";
+
+       status = "okay";
+};
+
 &xo_board {
        clock-frequency = <19200000>;
 };