From 360b41bc657818769c368712861e1cc442a09220 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 May 2024 12:44:03 +0000 Subject: [PATCH] Revert "Bluetooth: qca: add support for WCN7850" This reverts commit 67ffc334b92a96e65b627b6b3349c25946ff69f6 which is commit 67ffc334b92a96e65b627b6b3349c25946ff69f6 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I62f7e652e6cd20291b5897431865e8a3ebbacb4d Signed-off-by: Greg Kroah-Hartman --- drivers/bluetooth/btqca.c | 10 ---------- drivers/bluetooth/btqca.h | 1 - drivers/bluetooth/hci_qca.c | 31 +------------------------------ 3 files changed, 1 insertion(+), 41 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index 0211f704a358..8331090af86e 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -631,10 +631,6 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, snprintf(config.fwname, sizeof(config.fwname), "qca/hpbtfw%02x.tlv", rom_ver); break; - case QCA_WCN7850: - snprintf(config.fwname, sizeof(config.fwname), - "qca/hmtbtfw%02x.tlv", rom_ver); - break; default: snprintf(config.fwname, sizeof(config.fwname), "qca/rampatch_%08x.bin", soc_ver); @@ -683,10 +679,6 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, snprintf(config.fwname, sizeof(config.fwname), "qca/hpnv%02x.bin", rom_ver); break; - case QCA_WCN7850: - snprintf(config.fwname, sizeof(config.fwname), - "qca/hmtnv%02x.bin", rom_ver); - break; default: snprintf(config.fwname, sizeof(config.fwname), @@ -705,7 +697,6 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, case QCA_QCA6390: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: err = qca_disable_soc_logging(hdev); if (err < 0) return err; @@ -740,7 +731,6 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, case QCA_WCN3991: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: /* get fw build info */ err = qca_read_fw_build_info(hdev); if (err < 0) diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h index 03bff5c0059d..fe51c632d772 100644 --- a/drivers/bluetooth/btqca.h +++ b/drivers/bluetooth/btqca.h @@ -149,7 +149,6 @@ enum qca_btsoc_type { QCA_QCA6390, QCA_WCN6750, QCA_WCN6855, - QCA_WCN7850, }; #if IS_ENABLED(CONFIG_BT_QCA) diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 43abdaf92a0e..e6ead996948a 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c @@ -1330,7 +1330,6 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: usleep_range(1000, 10000); break; @@ -1416,7 +1415,6 @@ static int qca_check_speeds(struct hci_uart *hu) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: if (!qca_get_speed(hu, QCA_INIT_SPEED) && !qca_get_speed(hu, QCA_OPER_SPEED)) return -EINVAL; @@ -1458,7 +1456,6 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: hci_uart_set_flow_control(hu, true); break; @@ -1492,7 +1489,6 @@ error: case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: hci_uart_set_flow_control(hu, false); break; @@ -1760,7 +1756,6 @@ static int qca_power_on(struct hci_dev *hdev) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: ret = qca_regulator_init(hu); break; @@ -1818,10 +1813,6 @@ static int qca_setup(struct hci_uart *hu) soc_name = "wcn6855"; break; - case QCA_WCN7850: - soc_name = "wcn7850"; - break; - default: soc_name = "ROME/QCA6390"; } @@ -1843,7 +1834,6 @@ retry: case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); hci_set_aosp_capable(hdev); @@ -1873,7 +1863,6 @@ retry: case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: break; default: @@ -2027,20 +2016,6 @@ static const struct qca_device_data qca_soc_data_wcn6855 = { .capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES, }; -static const struct qca_device_data qca_soc_data_wcn7850 __maybe_unused = { - .soc_type = QCA_WCN7850, - .vregs = (struct qca_vreg []) { - { "vddio", 5000 }, - { "vddaon", 26000 }, - { "vdddig", 126000 }, - { "vddrfa0p8", 102000 }, - { "vddrfa1p2", 257000 }, - { "vddrfa1p9", 302000 }, - }, - .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; @@ -2224,7 +2199,6 @@ static int qca_serdev_probe(struct serdev_device *serdev) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: qcadev->bt_power = devm_kzalloc(&serdev->dev, sizeof(struct qca_power), GFP_KERNEL); @@ -2254,8 +2228,7 @@ static int qca_serdev_probe(struct serdev_device *serdev) GPIOD_IN); if (IS_ERR_OR_NULL(qcadev->sw_ctrl) && (data->soc_type == QCA_WCN6750 || - data->soc_type == QCA_WCN6855 || - data->soc_type == QCA_WCN7850)) + 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); @@ -2334,7 +2307,6 @@ static void qca_serdev_remove(struct serdev_device *serdev) case QCA_WCN3998: case QCA_WCN6750: case QCA_WCN6855: - case QCA_WCN7850: if (power->vregs_on) { qca_power_shutdown(&qcadev->serdev_hu); break; @@ -2527,7 +2499,6 @@ static const struct of_device_id qca_bluetooth_of_match[] = { { .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}, - { .compatible = "qcom,wcn7850-bt", .data = &qca_soc_data_wcn7850}, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);