diff --git a/Documentation/devicetree/bindings/bluetooth/bluetooth_power.txt b/Documentation/devicetree/bindings/bluetooth/bluetooth_power.txt index 8b4804d78530..c1e6e1f70623 100644 --- a/Documentation/devicetree/bindings/bluetooth/bluetooth_power.txt +++ b/Documentation/devicetree/bindings/bluetooth/bluetooth_power.txt @@ -7,6 +7,7 @@ Required properties: - compatible: Should be set to one of the following: qca,ar3002 qca,qca6174 + qca,qca6390 qca,wcn3990 - qca,bt-reset-gpio: GPIO pin to bring BT Controller out of reset diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-cdp-256.dts b/arch/arm64/boot/dts/qcom/sdxprairie-cdp-256.dts index e1b05ad3e5a8..56030239dbd6 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-cdp-256.dts +++ b/arch/arm64/boot/dts/qcom/sdxprairie-cdp-256.dts @@ -25,3 +25,7 @@ &qnand_1 { status = "ok"; }; + +&blsp1_uart2b_hs { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-cdp-256.dtsi b/arch/arm64/boot/dts/qcom/sdxprairie-cdp-256.dtsi index 958d72ad38b1..8b9bd064b91b 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-cdp-256.dtsi +++ b/arch/arm64/boot/dts/qcom/sdxprairie-cdp-256.dtsi @@ -173,3 +173,10 @@ thermal-governor = "user_space"; }; }; + +&soc { + bluetooth: bt_qca6390 { + compatible = "qca,qca6390"; + qca,bt-reset-gpio = <&pmxprairie_gpios 6 0>; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-cdp.dts b/arch/arm64/boot/dts/qcom/sdxprairie-cdp.dts index e1d4eaf14fe5..795a7f2ec99c 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-cdp.dts +++ b/arch/arm64/boot/dts/qcom/sdxprairie-cdp.dts @@ -25,3 +25,7 @@ &qnand_1 { status = "ok"; }; + +&blsp1_uart2b_hs { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-cdp.dtsi b/arch/arm64/boot/dts/qcom/sdxprairie-cdp.dtsi index 0144c8992961..f9fda8cb9e41 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-cdp.dtsi +++ b/arch/arm64/boot/dts/qcom/sdxprairie-cdp.dtsi @@ -174,6 +174,13 @@ }; }; +&soc { + bluetooth: bt_qca6390 { + compatible = "qca,qca6390"; + qca,bt-reset-gpio = <&pmxprairie_gpios 6 0>; + }; +}; + &pm8150b_charger { qcom,batteryless-platform; io-channels = <&pm8150b_vadc ADC_USB_IN_V_16>, diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-mtp-256.dts b/arch/arm64/boot/dts/qcom/sdxprairie-mtp-256.dts index 2c67cce5fa64..c679f5cc27f2 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-mtp-256.dts +++ b/arch/arm64/boot/dts/qcom/sdxprairie-mtp-256.dts @@ -25,3 +25,7 @@ &qnand_1 { status = "ok"; }; + +&blsp1_uart2b_hs { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-mtp-256.dtsi b/arch/arm64/boot/dts/qcom/sdxprairie-mtp-256.dtsi index ec1ba09e9aac..69f3c857201c 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-mtp-256.dtsi +++ b/arch/arm64/boot/dts/qcom/sdxprairie-mtp-256.dtsi @@ -181,6 +181,13 @@ }; }; +&soc { + bluetooth: bt_qca6390 { + compatible = "qca,qca6390"; + qca,bt-reset-gpio = <&pmxprairie_gpios 6 0>; + }; +}; + &pm8150b_charger { qcom,sec-charger-config = <0>; qcom,auto-recharge-soc = <98>; diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-mtp-aqc.dts b/arch/arm64/boot/dts/qcom/sdxprairie-mtp-aqc.dts index 4f8f76fa5812..5faa08d48608 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-mtp-aqc.dts +++ b/arch/arm64/boot/dts/qcom/sdxprairie-mtp-aqc.dts @@ -25,3 +25,7 @@ &qnand_1 { status = "ok"; }; + +&blsp1_uart2b_hs { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-mtp.dts b/arch/arm64/boot/dts/qcom/sdxprairie-mtp.dts index 3f2ee52a7c90..9c2a429c2775 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sdxprairie-mtp.dts @@ -25,3 +25,7 @@ &qnand_1 { status = "ok"; }; + +&blsp1_uart2b_hs { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-mtp.dtsi b/arch/arm64/boot/dts/qcom/sdxprairie-mtp.dtsi index 12a23d19286a..b90e4791b7a9 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-mtp.dtsi +++ b/arch/arm64/boot/dts/qcom/sdxprairie-mtp.dtsi @@ -181,6 +181,13 @@ }; }; +&soc { + bluetooth: bt_qca6390 { + compatible = "qca,qca6390"; + qca,bt-reset-gpio = <&pmxprairie_gpios 6 0>; + }; +}; + &pm8150b_charger { qcom,sec-charger-config = <0>; qcom,auto-recharge-soc = <98>; diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-rumi.dts b/arch/arm64/boot/dts/qcom/sdxprairie-rumi.dts index 75d183219afb..b944d1950bdb 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-rumi.dts +++ b/arch/arm64/boot/dts/qcom/sdxprairie-rumi.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -25,3 +25,7 @@ &qnand_1 { status = "ok"; }; + +&blsp1_uart2b_hs { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sdxprairie-rumi.dtsi b/arch/arm64/boot/dts/qcom/sdxprairie-rumi.dtsi index 2a7ec3c77f8d..49158a894440 100644 --- a/arch/arm64/boot/dts/qcom/sdxprairie-rumi.dtsi +++ b/arch/arm64/boot/dts/qcom/sdxprairie-rumi.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -82,3 +82,10 @@ &usb2_phy { status = "disabled"; }; + +&soc { + bluetooth: bt_qca6390 { + compatible = "qca,qca6390"; + qca,bt-reset-gpio = <&pmxprairie_gpios 6 0>; + }; +}; diff --git a/drivers/bluetooth/bluetooth-power.c b/drivers/bluetooth/bluetooth-power.c index d391faea0846..ed174bce44bc 100644 --- a/drivers/bluetooth/bluetooth-power.c +++ b/drivers/bluetooth/bluetooth-power.c @@ -43,6 +43,7 @@ static const struct of_device_id bt_power_match_table[] = { { .compatible = "qca,ar3002" }, { .compatible = "qca,qca6174" }, + { .compatible = "qca,qca6390" }, { .compatible = "qca,wcn3990" }, {} };