mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2025-04-19 20:58:31 +09:00
Bluetooth: qca: add WCN3950 support
WCN3950 is another example of the WCN39xx BT/WiFI family of chips. It requires different firmware files and has different current requirements, so add it as a separate SoC type. The firmware for these chips has been recently added to the linux-firmware repository and will be a part of the upcoming release: - qca/cmbtfw12.tlv - qca/cmbtfw13.tlv - qca/cmnv12.bin - qca/cmnv13.bin - qca/cmnv13s.bin - qca/cmnv13t.bin Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Dmitry Baryshkov
Luiz Augusto von Dentz
parent
1cc41b5092
commit
d5712c511c
@ -816,6 +816,10 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
|
||||
snprintf(config.fwname, sizeof(config.fwname), "qca/%s", rampatch_name);
|
||||
} else {
|
||||
switch (soc_type) {
|
||||
case QCA_WCN3950:
|
||||
snprintf(config.fwname, sizeof(config.fwname),
|
||||
"qca/cmbtfw%02x.tlv", rom_ver);
|
||||
break;
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
case QCA_WCN3998:
|
||||
@ -881,6 +885,15 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
|
||||
}
|
||||
} else {
|
||||
switch (soc_type) {
|
||||
case QCA_WCN3950:
|
||||
if (le32_to_cpu(ver.soc_id) == QCA_WCN3950_SOC_ID_T)
|
||||
variant = "t";
|
||||
else if (le32_to_cpu(ver.soc_id) == QCA_WCN3950_SOC_ID_S)
|
||||
variant = "u";
|
||||
|
||||
snprintf(config.fwname, sizeof(config.fwname),
|
||||
"qca/cmnv%02x%s.bin", rom_ver, variant);
|
||||
break;
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
case QCA_WCN3998:
|
||||
@ -947,6 +960,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
|
||||
* VsMsftOpCode.
|
||||
*/
|
||||
switch (soc_type) {
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
|
||||
@ -41,6 +41,9 @@
|
||||
|
||||
#define QCA_WCN3991_SOC_ID 0x40014320
|
||||
|
||||
#define QCA_WCN3950_SOC_ID_T 0x40074130
|
||||
#define QCA_WCN3950_SOC_ID_S 0x40075130
|
||||
|
||||
/* QCA chipset version can be decided by patch and SoC
|
||||
* version, combination with upper 2 bytes from SoC
|
||||
* and lower 2 bytes from patch will be used.
|
||||
@ -145,6 +148,7 @@ enum qca_btsoc_type {
|
||||
QCA_INVALID = -1,
|
||||
QCA_AR3002,
|
||||
QCA_ROME,
|
||||
QCA_WCN3950,
|
||||
QCA_WCN3988,
|
||||
QCA_WCN3990,
|
||||
QCA_WCN3998,
|
||||
|
||||
@ -623,6 +623,7 @@ static int qca_open(struct hci_uart *hu)
|
||||
qcadev = serdev_device_get_drvdata(hu->serdev);
|
||||
|
||||
switch (qcadev->btsoc_type) {
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -1366,6 +1367,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_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -1452,6 +1454,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_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -1494,6 +1497,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)
|
||||
* changing the baudrate of chip and host.
|
||||
*/
|
||||
switch (soc_type) {
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -1528,6 +1532,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)
|
||||
|
||||
error:
|
||||
switch (soc_type) {
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -1746,6 +1751,7 @@ static int qca_regulator_init(struct hci_uart *hu)
|
||||
}
|
||||
|
||||
switch (soc_type) {
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -1776,6 +1782,7 @@ static int qca_regulator_init(struct hci_uart *hu)
|
||||
qca_set_speed(hu, QCA_INIT_SPEED);
|
||||
|
||||
switch (soc_type) {
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -1807,6 +1814,7 @@ static int qca_power_on(struct hci_dev *hdev)
|
||||
return 0;
|
||||
|
||||
switch (soc_type) {
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -1891,6 +1899,7 @@ static int qca_setup(struct hci_uart *hu)
|
||||
soc_name = "qca2066";
|
||||
break;
|
||||
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -1925,6 +1934,7 @@ retry:
|
||||
clear_bit(QCA_SSR_TRIGGERED, &qca->flags);
|
||||
|
||||
switch (soc_type) {
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -1958,6 +1968,7 @@ retry:
|
||||
}
|
||||
|
||||
switch (soc_type) {
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -2046,6 +2057,17 @@ static const struct hci_uart_proto qca_proto = {
|
||||
.dequeue = qca_dequeue,
|
||||
};
|
||||
|
||||
static const struct qca_device_data qca_soc_data_wcn3950 __maybe_unused = {
|
||||
.soc_type = QCA_WCN3950,
|
||||
.vregs = (struct qca_vreg []) {
|
||||
{ "vddio", 15000 },
|
||||
{ "vddxo", 60000 },
|
||||
{ "vddrf", 155000 },
|
||||
{ "vddch0", 585000 },
|
||||
},
|
||||
.num_vregs = 4,
|
||||
};
|
||||
|
||||
static const struct qca_device_data qca_soc_data_wcn3988 __maybe_unused = {
|
||||
.soc_type = QCA_WCN3988,
|
||||
.vregs = (struct qca_vreg []) {
|
||||
@ -2338,6 +2360,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
|
||||
qcadev->btsoc_type = QCA_ROME;
|
||||
|
||||
switch (qcadev->btsoc_type) {
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -2375,6 +2398,7 @@ static int qca_serdev_probe(struct serdev_device *serdev)
|
||||
break;
|
||||
}
|
||||
fallthrough;
|
||||
case QCA_WCN3950:
|
||||
case QCA_WCN3988:
|
||||
case QCA_WCN3990:
|
||||
case QCA_WCN3991:
|
||||
@ -2683,6 +2707,7 @@ static const struct of_device_id qca_bluetooth_of_match[] = {
|
||||
{ .compatible = "qcom,qca6174-bt" },
|
||||
{ .compatible = "qcom,qca6390-bt", .data = &qca_soc_data_qca6390},
|
||||
{ .compatible = "qcom,qca9377-bt" },
|
||||
{ .compatible = "qcom,wcn3950-bt", .data = &qca_soc_data_wcn3950},
|
||||
{ .compatible = "qcom,wcn3988-bt", .data = &qca_soc_data_wcn3988},
|
||||
{ .compatible = "qcom,wcn3990-bt", .data = &qca_soc_data_wcn3990},
|
||||
{ .compatible = "qcom,wcn3991-bt", .data = &qca_soc_data_wcn3991},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user