Enable Bluetooth functionality for wcn3998.
Subsystems (5)
v2 cover Enable Bluetooth functionality for wcn3998.
This patch series we add support for wcn3998 BT chip set. This new chipset is based from the wcn3990 with minimal power numbers. So here in this patch The major difference between wcn3990 and wcn3998 is only power numbers. where as init process and fw download is same with wcn3990.So we add new compatible for wcn3998.
Removed the Reading of regulator values from dts.
Added new compatible for wcn3998.
Harish Bandi (2):
Bluetooth: hci_qca: Added support for wcn3998
dt-bindings: net: bluetooth: Add device tree bindings for QTI chip
wcn3998
.../devicetree/bindings/net/qualcomm-bluetooth.txt | 15 ++++++++ drivers/bluetooth/btqca.c | 4 +-- drivers/bluetooth/btqca.h | 3 +- drivers/bluetooth/hci_qca.c | 40 ++++++++++++++-------- 4 files changed, 45 insertions(+), 17 deletions(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v2 1/2 Bluetooth: hci_qca: Added support for wcn3998
Added new compatible for wcn3998 and corresponding voltage and current values to wcn3998 compatible.
Changed driver code to support wcn3998
---
Changes in V2:
- Removed the Reading of regulator values from dts.
- Added new compatible for wcn3998.
--- drivers/bluetooth/btqca.c | 4 ++-- drivers/bluetooth/btqca.h | 3 ++- drivers/bluetooth/hci_qca.c | 40 ++++++++++++++++++++++++++-------------- 3 files changed, 30 insertions(+), 17 deletions(-)
drivers/bluetooth/btqca.c +2 -2
@@ -344,7 +344,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,/* Download rampatch file */ config.type =TLV_TYPE_PATCH ; -if (soc_type ==QCA_WCN3990 ) { +if (soc_type >=QCA_WCN3990 ) {/* Firmware files to download are based on ROM version. * ROM version is derived from last two bytes of soc_ver. */
@@ -365,7 +365,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,/* Download NVM configuration */ config.type =TLV_TYPE_NVM ; -if (soc_type ==QCA_WCN3990 ) +if (soc_type >=QCA_WCN3990 )snprintf (config.fwname,sizeof (config.fwname),"qca/crnv%02x.bin" , rom_ver);else
drivers/bluetooth/btqca.h +2 -1
@@ -132,7 +132,8 @@ enum qca_btsoc_type {QCA_INVALID =-1 ,QCA_AR3002 ,QCA_ROME , - QCA_WCN3990 +QCA_WCN3990 , + QCA_WCN3998 };#if IS_ENABLED (CONFIG_BT_QCA )
drivers/bluetooth/hci_qca.c +26 -14
@@ -506,7 +506,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 (qcadev->btsoc_type ==QCA_ROME ) {gpiod_set_value_cansleep (qcadev->bt_en,1 ); }else { hu->init_speed = qcadev->init_speed;
@@ -612,7 +612,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 (qcadev->btsoc_type >=QCA_WCN3990 )qca_power_shutdown (hu);else gpiod_set_value_cansleep (qcadev->bt_en,0 );
@@ -996,7 +996,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 (qcadev->btsoc_type ==QCA_WCN3990 ) +if (qcadev->btsoc_type >=QCA_WCN3990 )msleep (10 );else msleep (300 );
@@ -1075,7 +1075,7 @@ static int qca_check_speeds(struct hci_uart *hu)struct qca_serdev *qcadev; qcadev =serdev_device_get_drvdata (hu->serdev); -if (qcadev->btsoc_type ==QCA_WCN3990 ) { +if (qcadev->btsoc_type >=QCA_WCN3990 ) {if (!qca_get_speed (hu,QCA_INIT_SPEED ) && !qca_get_speed (hu,QCA_OPER_SPEED ))return -EINVAL ;
@@ -1107,7 +1107,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)* changing the baudrate of chip and host. */ qcadev =serdev_device_get_drvdata (hu->serdev); -if (qcadev->btsoc_type ==QCA_WCN3990 ) +if (qcadev->btsoc_type >=QCA_WCN3990 )hci_uart_set_flow_control (hu, true); qca_baudrate =qca_get_baudrate_value (speed);
@@ -1119,7 +1119,7 @@ static int qca_set_speed(struct hci_uart *hu, enum qca_speed_type speed_type)host_set_baudrate (hu, speed); error: -if (qcadev->btsoc_type ==QCA_WCN3990 ) +if (qcadev->btsoc_type >=QCA_WCN3990 )hci_uart_set_flow_control (hu, false); }
@@ -1194,7 +1194,7 @@ static int qca_setup(struct hci_uart *hu)/* Patch downloading has to be done without IBS mode */ clear_bit (STATE_IN_BAND_SLEEP_ENABLED , &qca->flags); -if (qcadev->btsoc_type ==QCA_WCN3990 ) { +if (qcadev->btsoc_type >=QCA_WCN3990 ) {bt_dev_info (hdev,"setting up wcn3990" );/* Enable NON_PERSISTENT_SETUP QUIRK to ensure to execute
@@ -1225,7 +1225,7 @@ static int qca_setup(struct hci_uart *hu) qca_baudrate =qca_get_baudrate_value (speed); } -if (qcadev->btsoc_type !=QCA_WCN3990 ) { +if (qcadev->btsoc_type ==QCA_ROME ) {/* Get QCA version information */ ret =qca_read_soc_version (hdev, &soc_ver);if (ret)
@@ -1250,7 +1250,7 @@ static int qca_setup(struct hci_uart *hu) }/* Setup bdaddr */ -if (qcadev->btsoc_type ==QCA_WCN3990 ) +if (qcadev->btsoc_type >=QCA_WCN3990 ) hu->hdev->set_bdaddr = qca_set_bdaddr;else hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
@@ -1273,7 +1273,7 @@ static int qca_setup(struct hci_uart *hu) .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 },
@@ -1284,6 +1284,17 @@ static int qca_setup(struct hci_uart *hu) .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;
@@ -1417,8 +1428,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 && data->soc_type >=QCA_WCN3990 ) { + qcadev->btsoc_type = data->soc_type; qcadev->bt_power =devm_kzalloc (&serdev->dev,sizeof (struct qca_power ),GFP_KERNEL );
@@ -1482,7 +1493,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 (qcadev->btsoc_type >=QCA_WCN3990 )qca_power_shutdown (&qcadev->serdev_hu);else clk_disable_unprepare (qcadev->susclk);
@@ -1492,7 +1503,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);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v2 2/2 dt-bindings: net: bluetooth: Add device tree bindings for QTI chip wcn3998
In reply to Harish BandiThis patch enables regulators for the Qualcomm Bluetooth wcn3998 controller.
---
Changes in V2:
- Removed the regulator values in dts.
- Added new compatible for wcn3998.
--- .../devicetree/bindings/net/qualcomm-bluetooth.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt +15 -0
@@ -53,3 +53,18 @@ serial@898000 { max-speed = <3200000>; }; }; + +&blsp1_uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&blsp1_uart3_default>; + status = "okay"; + + bluetooth: wcn3998-bt { + compatible = "qcom,wcn3998-bt"; + vddio-supply = <&vreg_l6_1p8>; + vddxo-supply = <&vreg_l5_1p8>; + vddrf-supply = <&vreg_s5_1p35>; + vddch0-supply = <&vdd_ch0_3p3>; + max-speed = <3200000>; + }; +};
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project