Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[linux-2.6-block.git] / drivers / bluetooth / hci_qca.c

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 7f75652686fee08d1851198351eb1e2a7ec0711f..57322c42bb2dd13f5b8482d2c6b4691f82b2c13e 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -54,9 +54,6 @@
 #define HCI_IBS_WAKE_ACK       0xFC
 #define HCI_MAX_IBS_SIZE       10
 
-/* Controller states */
-#define STATE_IN_BAND_SLEEP_ENABLED    1
-
 #define IBS_WAKE_RETRANS_TIMEOUT_MS    100
 #define IBS_TX_IDLE_TIMEOUT_MS         2000
 #define CMD_TRANS_TIMEOUT_MS           100
@@ -67,6 +64,10 @@
 /* Controller debug log header */
 #define QCA_DEBUG_HANDLE       0x2EDC
 
+enum qca_flags {
+       QCA_IBS_ENABLED,
+};
+
 /* HCI_IBS transmit side sleep protocol states */
 enum tx_ibs_states {
        HCI_IBS_TX_ASLEEP,
@@ -521,7 +522,7 @@ static int qca_open(struct hci_uart *hu)
        if (hu->serdev) {
 
                qcadev = serdev_device_get_drvdata(hu->serdev);
-               if (qcadev->btsoc_type != QCA_WCN3990) {
+               if (!qca_is_wcn399x(qcadev->btsoc_type)) {
                        gpiod_set_value_cansleep(qcadev->bt_en, 1);
                        /* Controller needs time to bootup. */
                        msleep(150);
@@ -629,7 +630,7 @@ static int qca_close(struct hci_uart *hu)
 
        if (hu->serdev) {
                qcadev = serdev_device_get_drvdata(hu->serdev);
-               if (qcadev->btsoc_type == QCA_WCN3990)
+               if (qca_is_wcn399x(qcadev->btsoc_type))
                        qca_power_shutdown(hu);
                else
                        gpiod_set_value_cansleep(qcadev->bt_en, 0);
@@ -792,7 +793,7 @@ static int qca_enqueue(struct hci_uart *hu, struct sk_buff *skb)
        /* Don't go to sleep in middle of patch download or
         * Out-Of-Band(GPIOs control) sleep is selected.
         */
-       if (!test_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags)) {
+       if (!test_bit(QCA_IBS_ENABLED, &qca->flags)) {
                skb_queue_tail(&qca->txq, skb);
                spin_unlock_irqrestore(&qca->hci_ibs_lock, flags);
                return 0;
@@ -1011,7 +1012,7 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)
                      msecs_to_jiffies(CMD_TRANS_TIMEOUT_MS));
 
        /* Give the controller time to process the request */
-       if (qca_soc_type(hu) == QCA_WCN3990)
+       if (qca_is_wcn399x(qca_soc_type(hu)))
                msleep(10);
        else
                msleep(300);
@@ -1087,7 +1088,7 @@ static unsigned int qca_get_speed(struct hci_uart *hu,
 
 static int qca_check_speeds(struct hci_uart *hu)
 {
-       if (qca_soc_type(hu) == QCA_WCN3990) {
+       if (qca_is_wcn399x(qca_soc_type(hu))) {
                if (!qca_get_speed(hu, QCA_INIT_SPEED) &&
                    !qca_get_speed(hu, QCA_OPER_SPEED))
                        return -EINVAL;
@@ -1119,7 +1120,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)
                /* Disable flow control for wcn3990 to deassert RTS while
                 * changing the baudrate of chip and host.
                 */
-               if (soc_type == QCA_WCN3990)
+               if (qca_is_wcn399x(soc_type))
                        hci_uart_set_flow_control(hu, true);
 
                qca_baudrate = qca_get_baudrate_value(speed);
@@ -1131,7 +1132,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)
                host_set_baudrate(hu, speed);
 
 error:
-               if (soc_type == QCA_WCN3990)
+               if (qca_is_wcn399x(soc_type))
                        hci_uart_set_flow_control(hu, false);
        }
 
@@ -1202,9 +1203,9 @@ static int qca_setup(struct hci_uart *hu)
                return ret;
 
        /* Patch downloading has to be done without IBS mode */
-       clear_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
+       clear_bit(QCA_IBS_ENABLED, &qca->flags);
 
-       if (soc_type == QCA_WCN3990) {
+       if (qca_is_wcn399x(soc_type)) {
                bt_dev_info(hdev, "setting up wcn3990");
 
                /* Enable NON_PERSISTENT_SETUP QUIRK to ensure to execute
@@ -1235,7 +1236,7 @@ static int qca_setup(struct hci_uart *hu)
                qca_baudrate = qca_get_baudrate_value(speed);
        }
 
-       if (soc_type != QCA_WCN3990) {
+       if (!qca_is_wcn399x(soc_type)) {
                /* Get QCA version information */
                ret = qca_read_soc_version(hdev, &soc_ver);
                if (ret)
@@ -1246,7 +1247,7 @@ static int qca_setup(struct hci_uart *hu)
        /* Setup patch / NVM configurations */
        ret = qca_uart_setup(hdev, qca_baudrate, soc_type, soc_ver);
        if (!ret) {
-               set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
+               set_bit(QCA_IBS_ENABLED, &qca->flags);
                qca_debugfs_init(hdev);
        } else if (ret == -ENOENT) {
                /* No patch/nvm-config found, run with original fw/config */
@@ -1260,7 +1261,7 @@ static int qca_setup(struct hci_uart *hu)
        }
 
        /* Setup bdaddr */
-       if (soc_type == QCA_WCN3990)
+       if (qca_is_wcn399x(soc_type))
                hu->hdev->set_bdaddr = qca_set_bdaddr;
        else
                hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
@@ -1283,7 +1284,7 @@ static struct hci_uart_proto qca_proto = {
        .dequeue        = qca_dequeue,
 };
 
-static const struct qca_vreg_data qca_soc_data = {
+static const struct qca_vreg_data qca_soc_data_wcn3990 = {
        .soc_type = QCA_WCN3990,
        .vregs = (struct qca_vreg []) {
                { "vddio",   1800000, 1900000,  15000  },
@@ -1294,6 +1295,17 @@ static const struct qca_vreg_data qca_soc_data = {
        .num_vregs = 4,
 };
 
+static const struct qca_vreg_data qca_soc_data_wcn3998 = {
+       .soc_type = QCA_WCN3998,
+       .vregs = (struct qca_vreg []) {
+               { "vddio",   1800000, 1900000,  10000  },
+               { "vddxo",   1800000, 1900000,  80000  },
+               { "vddrf",   1300000, 1352000,  300000 },
+               { "vddch0",  3300000, 3300000,  450000 },
+       },
+       .num_vregs = 4,
+};
+
 static void qca_power_shutdown(struct hci_uart *hu)
 {
        struct qca_data *qca = hu->priv;
@@ -1304,7 +1316,7 @@ static void qca_power_shutdown(struct hci_uart *hu)
         * data in skb's.
         */
        spin_lock_irqsave(&qca->hci_ibs_lock, flags);
-       clear_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
+       clear_bit(QCA_IBS_ENABLED, &qca->flags);
        qca_flush(hu);
        spin_unlock_irqrestore(&qca->hci_ibs_lock, flags);
 
@@ -1427,8 +1439,8 @@ static int qca_serdev_probe(struct serdev_device *serdev)
        qcadev->serdev_hu.serdev = serdev;
        data = of_device_get_match_data(&serdev->dev);
        serdev_device_set_drvdata(serdev, qcadev);
-       if (data && data->soc_type == QCA_WCN3990) {
-               qcadev->btsoc_type = QCA_WCN3990;
+       if (data && qca_is_wcn399x(data->soc_type)) {
+               qcadev->btsoc_type = data->soc_type;
                qcadev->bt_power = devm_kzalloc(&serdev->dev,
                                                sizeof(struct qca_power),
                                                GFP_KERNEL);
@@ -1492,7 +1504,7 @@ static void qca_serdev_remove(struct serdev_device *serdev)
 {
        struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);
 
-       if (qcadev->btsoc_type == QCA_WCN3990)
+       if (qca_is_wcn399x(qcadev->btsoc_type))
                qca_power_shutdown(&qcadev->serdev_hu);
        else
                clk_disable_unprepare(qcadev->susclk);
@@ -1502,7 +1514,8 @@ static void qca_serdev_remove(struct serdev_device *serdev)
 
 static const struct of_device_id qca_bluetooth_of_match[] = {
        { .compatible = "qcom,qca6174-bt" },
-       { .compatible = "qcom,wcn3990-bt", .data = &qca_soc_data},
+       { .compatible = "qcom,wcn3990-bt", .data = &qca_soc_data_wcn3990},
+       { .compatible = "qcom,wcn3998-bt", .data = &qca_soc_data_wcn3998},
        { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);