mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
Bluetooth: qca: add QCC2072 support
QCC2072 is a BT/WiFi combo SoC that uses different firmware
filenames and requires no external voltage regulators, so add
it as a new SoC type.
The chip supports the wideband speech and valid LE states
capabilities. Its firmware is named using the "orn" prefix and
follows the standard rom-version-based scheme:
- qca/ornbtfw<ver>.tlv
- qca/ornnv<ver>.bin
These firmware files are already present in the linux-firmware
repository.
Signed-off-by: Yepuri Siddu <yepuri.siddu@oss.qualcomm.com>
This commit is contained in:
committed by
Konrad Dybcio
parent
133a46220e
commit
d4e0195854
@@ -826,6 +826,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
|
||||
snprintf(config.fwname, sizeof(config.fwname),
|
||||
"qca/hmtbtfw%02x.tlv", rom_ver);
|
||||
break;
|
||||
case QCA_QCC2072:
|
||||
snprintf(config.fwname, sizeof(config.fwname),
|
||||
"qca/ornbtfw%02x.tlv", rom_ver);
|
||||
break;
|
||||
default:
|
||||
snprintf(config.fwname, sizeof(config.fwname),
|
||||
"qca/rampatch_%08x.bin", soc_ver);
|
||||
@@ -920,6 +924,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
|
||||
qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname),
|
||||
"hmtnv", soc_type, ver, rom_ver, boardid);
|
||||
break;
|
||||
case QCA_QCC2072:
|
||||
snprintf(config.fwname, sizeof(config.fwname),
|
||||
"qca/ornnv%02x.bin", rom_ver);
|
||||
break;
|
||||
default:
|
||||
snprintf(config.fwname, sizeof(config.fwname),
|
||||
"qca/nvm_%08x.bin", soc_ver);
|
||||
@@ -983,6 +991,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
|
||||
case QCA_WCN6750:
|
||||
case QCA_WCN6855:
|
||||
case QCA_WCN7850:
|
||||
case QCA_QCC2072:
|
||||
/* get fw build info */
|
||||
err = qca_read_fw_build_info(hdev);
|
||||
if (err < 0)
|
||||
|
||||
@@ -158,6 +158,7 @@ enum qca_btsoc_type {
|
||||
QCA_WCN6750,
|
||||
QCA_WCN6855,
|
||||
QCA_WCN7850,
|
||||
QCA_QCC2072,
|
||||
};
|
||||
|
||||
#if IS_ENABLED(CONFIG_BT_QCA)
|
||||
|
||||
@@ -1376,6 +1376,7 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)
|
||||
|
||||
/* Give the controller time to process the request */
|
||||
switch (qca_soc_type(hu)) {
|
||||
case QCA_QCC2072:
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
@@ -1463,6 +1464,7 @@ static unsigned int qca_get_speed(struct hci_uart *hu,
|
||||
static int qca_check_speeds(struct hci_uart *hu)
|
||||
{
|
||||
switch (qca_soc_type(hu)) {
|
||||
case QCA_QCC2072:
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
@@ -1514,6 +1516,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)
|
||||
case QCA_WCN6750:
|
||||
case QCA_WCN6855:
|
||||
case QCA_WCN7850:
|
||||
case QCA_QCC2072:
|
||||
hci_uart_set_flow_control(hu, true);
|
||||
break;
|
||||
|
||||
@@ -1549,6 +1552,7 @@ error:
|
||||
case QCA_WCN6750:
|
||||
case QCA_WCN6855:
|
||||
case QCA_WCN7850:
|
||||
case QCA_QCC2072:
|
||||
hci_uart_set_flow_control(hu, false);
|
||||
break;
|
||||
|
||||
@@ -1865,6 +1869,7 @@ static int qca_power_on(struct hci_dev *hdev)
|
||||
case QCA_WCN6750:
|
||||
case QCA_WCN6855:
|
||||
case QCA_WCN7850:
|
||||
case QCA_QCC2072:
|
||||
ret = qca_regulator_init(hu);
|
||||
break;
|
||||
|
||||
@@ -1964,6 +1969,10 @@ static int qca_setup(struct hci_uart *hu)
|
||||
soc_name = "wcn7850";
|
||||
break;
|
||||
|
||||
case QCA_QCC2072:
|
||||
soc_name = "qcc2072";
|
||||
break;
|
||||
|
||||
default:
|
||||
soc_name = "ROME/QCA6390";
|
||||
}
|
||||
@@ -1979,6 +1988,7 @@ retry:
|
||||
clear_bit(QCA_SSR_TRIGGERED, &qca->flags);
|
||||
|
||||
switch (soc_type) {
|
||||
case QCA_QCC2072:
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
@@ -2020,6 +2030,7 @@ retry:
|
||||
case QCA_WCN6750:
|
||||
case QCA_WCN6855:
|
||||
case QCA_WCN7850:
|
||||
case QCA_QCC2072:
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -2173,6 +2184,12 @@ static const struct qca_device_data qca_soc_data_wcn3998 __maybe_unused = {
|
||||
.num_vregs = 4,
|
||||
};
|
||||
|
||||
static const struct qca_device_data qca_soc_data_qcc2072 __maybe_unused = {
|
||||
.soc_type = QCA_QCC2072,
|
||||
.num_vregs = 0,
|
||||
.capabilities = QCA_CAP_WIDEBAND_SPEECH | QCA_CAP_VALID_LE_STATES,
|
||||
};
|
||||
|
||||
static const struct qca_device_data qca_soc_data_wcn6750 __maybe_unused = {
|
||||
.soc_type = QCA_WCN6750,
|
||||
.vregs = (struct qca_vreg []) {
|
||||
@@ -2275,6 +2292,7 @@ static void qca_power_off(struct hci_uart *hu)
|
||||
|
||||
case QCA_WCN6750:
|
||||
case QCA_WCN6855:
|
||||
case QCA_QCC2072:
|
||||
gpiod_set_value_cansleep(qcadev->bt_en, 0);
|
||||
msleep(100);
|
||||
qca_regulator_disable(qcadev);
|
||||
@@ -2421,6 +2439,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
|
||||
qcadev->btsoc_type = QCA_ROME;
|
||||
|
||||
switch (qcadev->btsoc_type) {
|
||||
case QCA_QCC2072:
|
||||
case QCA_QCA6390:
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
@@ -2441,6 +2460,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
|
||||
}
|
||||
|
||||
switch (qcadev->btsoc_type) {
|
||||
case QCA_QCC2072:
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
@@ -2499,6 +2519,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
|
||||
if (!qcadev->bt_en &&
|
||||
(data->soc_type == QCA_WCN6750 ||
|
||||
data->soc_type == QCA_WCN6855 ||
|
||||
data->soc_type == QCA_QCC2072 ||
|
||||
data->soc_type == QCA_WCN7850))
|
||||
power_ctrl_enabled = false;
|
||||
|
||||
@@ -2507,6 +2528,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
|
||||
if (IS_ERR(qcadev->sw_ctrl) &&
|
||||
(data->soc_type == QCA_WCN6750 ||
|
||||
data->soc_type == QCA_WCN6855 ||
|
||||
data->soc_type == QCA_QCC2072 ||
|
||||
data->soc_type == QCA_WCN7850)) {
|
||||
dev_err(&serdev->dev, "failed to acquire SW_CTRL gpio\n");
|
||||
return PTR_ERR(qcadev->sw_ctrl);
|
||||
@@ -2585,6 +2607,7 @@ static void qca_serdev_remove(struct serdev_device *serdev)
|
||||
struct qca_power *power = qcadev->bt_power;
|
||||
|
||||
switch (qcadev->btsoc_type) {
|
||||
case QCA_QCC2072:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@@ -2794,6 +2817,7 @@ static const struct of_device_id qca_bluetooth_of_match[] = {
|
||||
{ .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},
|
||||
{ .compatible = "qcom,qcc2072-bt", .data = &qca_soc_data_qcc2072},
|
||||
{ /* sentinel */ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);
|
||||
|
||||
Reference in New Issue
Block a user