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

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / qrb5165-rb5.dts

diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index c8cd40a..cd0db4f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -23,6 +23,7 @@
 
        aliases {
                serial0 = &uart12;
+               serial1 = &uart6;
                sdhc2 = &sdhc_2;
        };
 
@@ -64,8 +65,8 @@
                        function = LED_FUNCTION_INDICATOR;
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&pm8150_gpios 10 GPIO_ACTIVE_HIGH>;
-                       linux,default-trigger = "panic-indicator";
                        default-state = "off";
+                       panic-indicator;
                };
 
                led-wlan {
@@ -1263,6 +1264,14 @@
                "HST_WLAN_UART_TX",
                "HST_WLAN_UART_RX";
 
+       bt_en_state: bt-default-state {
+               pins = "gpio21";
+               function = "gpio";
+               drive-strength = <16>;
+               output-low;
+               bias-pull-up;
+       };
+
        lt9611_irq_pin: lt9611-irq-state {
                pins = "gpio63";
                function = "gpio";
@@ -1296,6 +1305,26 @@
        };
 };
 
+&uart6 {
+       status = "okay";
+
+       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>;
+       };
+};
+
 &uart12 {
        status = "okay";
 };
@@ -1425,7 +1454,7 @@
 
                altmodes {
                        displayport {
-                               svid = <0xff01>;
+                               svid = /bits/ 16 <0xff01>;
                                vdo = <0x00001c46>;
                        };
                };