Bluetooth: hci_qca: Add support for QTI Bluetooth chip wcn6855

[ Upstream commit 095327fede005f4b14d40b2183b2f7965c739dbd ]

Add regulators, GPIOs and changes required to power on/off wcn6855.
Add support for firmware download for wcn6855 which is in the
linux-firmware repository as hpbtfw21.tlv and hpnv21.bin.

Based on the assumption that this is similar to the wcn6750

Tested-on: BTFW.HSP.2.1.0-00538-VER_PATCHZ-1

Signed-off-by: Steev Klimaszewski <steev@kali.org>
Reviewed-by: Bjorn Andersson <andersson@kernel.org>
Tested-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Stable-dep-of: 56d074d26c58 ("Bluetooth: hci_qca: don't use IS_ERR_OR_NULL() with gpiod_get_optional()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index be04d74037d203deac365aa3dce7f85775620df5..0f3943ac541796bf4dac0b9b50b04ae5a9080a9a 100644 (file)
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -566,6 +566,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
                config.type = ELF_TYPE_PATCH;
                snprintf(config.fwname, sizeof(config.fwname),
                         "qca/msbtfw%02x.mbn", rom_ver);
+       } else if (soc_type == QCA_WCN6855) {
+               snprintf(config.fwname, sizeof(config.fwname),
+                        "qca/hpbtfw%02x.tlv", rom_ver);
        } else {
                snprintf(config.fwname, sizeof(config.fwname),
                         "qca/rampatch_%08x.bin", soc_ver);
@@ -600,6 +603,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
        else if (soc_type == QCA_WCN6750)
                snprintf(config.fwname, sizeof(config.fwname),
                         "qca/msnv%02x.bin", rom_ver);
+       else if (soc_type == QCA_WCN6855)
+               snprintf(config.fwname, sizeof(config.fwname),
+                        "qca/hpnv%02x.bin", rom_ver);
        else
                snprintf(config.fwname, sizeof(config.fwname),
                         "qca/nvm_%08x.bin", soc_ver);
@@ -637,11 +643,17 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
                return err;
        }
 
-       if (soc_type == QCA_WCN3991 || soc_type == QCA_WCN6750) {
+       switch (soc_type) {
+       case QCA_WCN3991:
+       case QCA_WCN6750:
+       case QCA_WCN6855:
                /* get fw build info */
                err = qca_read_fw_build_info(hdev);
                if (err < 0)
                        return err;
+               break;
+       default:
+               break;
        }
 
        bt_dev_info(hdev, "QCA setup on UART is completed");

diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
index 30afa7703afd3a0c636df5d2fe8652f43020213a..b83bf202ea604cc5e2bd937a9067adff2ff85ec9 100644 (file)
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
@@ -145,6 +145,7 @@ enum qca_btsoc_type {
        QCA_WCN3991,
        QCA_QCA6390,
        QCA_WCN6750,
+       QCA_WCN6855,
 };
 
 #if IS_ENABLED(CONFIG_BT_QCA)
@@ -166,6 +167,10 @@ static inline bool qca_is_wcn6750(enum qca_btsoc_type soc_type)
 {
        return soc_type == QCA_WCN6750;
 }
+static inline bool qca_is_wcn6855(enum qca_btsoc_type soc_type)
+{
+       return soc_type == QCA_WCN6855;
+}
 
 #else
 
@@ -204,6 +209,11 @@ static inline bool qca_is_wcn6750(enum qca_btsoc_type soc_type)
        return false;
 }
 
+static inline bool qca_is_wcn6855(enum qca_btsoc_type soc_type)
+{
+       return false;
+}
+
 static inline int qca_send_pre_shutdown_cmd(struct hci_dev *hdev)
 {
        return -EOPNOTSUPP;

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index d10f1fe0f5fa856a0262ea300a731a2174ee3114..7c641cabea7c89188d2d3847225f1279195bb229 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1315,7 +1315,8 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)
 
        /* Give the controller time to process the request */
        if (qca_is_wcn399x(qca_soc_type(hu)) ||
-           qca_is_wcn6750(qca_soc_type(hu)))
+           qca_is_wcn6750(qca_soc_type(hu)) ||
+           qca_is_wcn6855(qca_soc_type(hu)))
                usleep_range(1000, 10000);
        else
                msleep(300);
@@ -1392,7 +1393,8 @@ static unsigned int qca_get_speed(struct hci_uart *hu,
 static int qca_check_speeds(struct hci_uart *hu)
 {
        if (qca_is_wcn399x(qca_soc_type(hu)) ||
-           qca_is_wcn6750(qca_soc_type(hu))) {
+           qca_is_wcn6750(qca_soc_type(hu)) ||
+           qca_is_wcn6855(qca_soc_type(hu))) {
                if (!qca_get_speed(hu, QCA_INIT_SPEED) &&
                    !qca_get_speed(hu, QCA_OPER_SPEED))
                        return -EINVAL;
@@ -1426,7 +1428,8 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)
                 * changing the baudrate of chip and host.
                 */
                if (qca_is_wcn399x(soc_type) ||
-                   qca_is_wcn6750(soc_type))
+                   qca_is_wcn6750(soc_type) ||
+                   qca_is_wcn6855(soc_type))
                        hci_uart_set_flow_control(hu, true);
 
                if (soc_type == QCA_WCN3990) {
@@ -1444,7 +1447,8 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)
 
 error:
                if (qca_is_wcn399x(soc_type) ||
-                   qca_is_wcn6750(soc_type))
+                   qca_is_wcn6750(soc_type) ||
+                   qca_is_wcn6855(soc_type))
                        hci_uart_set_flow_control(hu, false);
 
                if (soc_type == QCA_WCN3990) {
@@ -1680,7 +1684,8 @@ static int qca_power_on(struct hci_dev *hdev)
                return 0;
 
        if (qca_is_wcn399x(soc_type) ||
-           qca_is_wcn6750(soc_type)) {
+           qca_is_wcn6750(soc_type) ||
+           qca_is_wcn6855(soc_type)) {
                ret = qca_regulator_init(hu);
        } else {
                qcadev = serdev_device_get_drvdata(hu->serdev);
@@ -1721,7 +1726,8 @@ static int qca_setup(struct hci_uart *hu)
 
        bt_dev_info(hdev, "setting up %s",
                qca_is_wcn399x(soc_type) ? "wcn399x" :
-               (soc_type == QCA_WCN6750) ? "wcn6750" : "ROME/QCA6390");
+               (soc_type == QCA_WCN6750) ? "wcn6750" :
+               (soc_type == QCA_WCN6855) ? "wcn6855" : "ROME/QCA6390");
 
        qca->memdump_state = QCA_MEMDUMP_IDLE;
 
@@ -1733,7 +1739,8 @@ retry:
        clear_bit(QCA_SSR_TRIGGERED, &qca->flags);
 
        if (qca_is_wcn399x(soc_type) ||
-           qca_is_wcn6750(soc_type)) {
+           qca_is_wcn6750(soc_type) ||
+           qca_is_wcn6855(soc_type)) {
                set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
 
                ret = qca_read_soc_version(hdev, &ver, soc_type);
@@ -1754,7 +1761,8 @@ retry:
        }
 
        if (!(qca_is_wcn399x(soc_type) ||
-            qca_is_wcn6750(soc_type))) {
+             qca_is_wcn6750(soc_type) ||
+             qca_is_wcn6855(soc_type))) {
                /* Get QCA version information */
                ret = qca_read_soc_version(hdev, &ver, soc_type);
                if (ret)
@@ -1880,6 +1888,20 @@ static const struct qca_device_data qca_soc_data_wcn6750 = {
        .capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES,
 };
 
+static const struct qca_device_data qca_soc_data_wcn6855 = {
+       .soc_type = QCA_WCN6855,
+       .vregs = (struct qca_vreg []) {
+               { "vddio", 5000 },
+               { "vddbtcxmx", 126000 },
+               { "vddrfacmn", 12500 },
+               { "vddrfa0p8", 102000 },
+               { "vddrfa1p7", 302000 },
+               { "vddrfa1p2", 257000 },
+       },
+       .num_vregs = 6,
+       .capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES,
+};
+
 static void qca_power_shutdown(struct hci_uart *hu)
 {
        struct qca_serdev *qcadev;
@@ -1909,7 +1931,7 @@ static void qca_power_shutdown(struct hci_uart *hu)
                host_set_baudrate(hu, 2400);
                qca_send_power_pulse(hu, false);
                qca_regulator_disable(qcadev);
-       } else if (soc_type == QCA_WCN6750) {
+       } else if (soc_type == QCA_WCN6750 || soc_type == QCA_WCN6855) {
                gpiod_set_value_cansleep(qcadev->bt_en, 0);
                msleep(100);
                qca_regulator_disable(qcadev);
@@ -2044,7 +2066,8 @@ static int qca_serdev_probe(struct serdev_device *serdev)
 
        if (data &&
            (qca_is_wcn399x(data->soc_type) ||
-           qca_is_wcn6750(data->soc_type))) {
+            qca_is_wcn6750(data->soc_type) ||
+            qca_is_wcn6855(data->soc_type))) {
                qcadev->btsoc_type = data->soc_type;
                qcadev->bt_power = devm_kzalloc(&serdev->dev,
                                                sizeof(struct qca_power),
@@ -2064,14 +2087,18 @@ static int qca_serdev_probe(struct serdev_device *serdev)
 
                qcadev->bt_en = devm_gpiod_get_optional(&serdev->dev, "enable",
                                               GPIOD_OUT_LOW);
-               if (IS_ERR_OR_NULL(qcadev->bt_en) && data->soc_type == QCA_WCN6750) {
+               if (IS_ERR_OR_NULL(qcadev->bt_en) &&
+                   (data->soc_type == QCA_WCN6750 ||
+                    data->soc_type == QCA_WCN6855)) {
                        dev_err(&serdev->dev, "failed to acquire BT_EN gpio\n");
                        power_ctrl_enabled = false;
                }
 
                qcadev->sw_ctrl = devm_gpiod_get_optional(&serdev->dev, "swctrl",
                                               GPIOD_IN);
-               if (IS_ERR_OR_NULL(qcadev->sw_ctrl) && data->soc_type == QCA_WCN6750)
+               if (IS_ERR_OR_NULL(qcadev->sw_ctrl) &&
+                   (data->soc_type == QCA_WCN6750 ||
+                    data->soc_type == QCA_WCN6855))
                        dev_warn(&serdev->dev, "failed to acquire SW_CTRL gpio\n");
 
                qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL);
@@ -2147,8 +2174,9 @@ static void qca_serdev_remove(struct serdev_device *serdev)
        struct qca_power *power = qcadev->bt_power;
 
        if ((qca_is_wcn399x(qcadev->btsoc_type) ||
-            qca_is_wcn6750(qcadev->btsoc_type)) &&
-            power->vregs_on)
+            qca_is_wcn6750(qcadev->btsoc_type) ||
+            qca_is_wcn6855(qcadev->btsoc_type)) &&
+           power->vregs_on)
                qca_power_shutdown(&qcadev->serdev_hu);
        else if (qcadev->susclk)
                clk_disable_unprepare(qcadev->susclk);
@@ -2332,6 +2360,7 @@ static const struct of_device_id qca_bluetooth_of_match[] = {
        { .compatible = "qcom,wcn3991-bt", .data = &qca_soc_data_wcn3991},
        { .compatible = "qcom,wcn3998-bt", .data = &qca_soc_data_wcn3998},
        { .compatible = "qcom,wcn6750-bt", .data = &qca_soc_data_wcn6750},
+       { .compatible = "qcom,wcn6855-bt", .data = &qca_soc_data_wcn6855},
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);