This patch series we add support for WCN3998 BT chip set. This new chip set
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.
Changes in V4:
Added is_qca_soc_type_wcn399x_family helper function
to get the soc type is wcn399x or not.
Changes in V3:
updated to latest code base.
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 | 7 ++--
drivers/bluetooth/btqca.c | 4 +-
drivers/bluetooth/btqca.h | 3 +-
drivers/bluetooth/hci_qca.c | 48 +++++++++++++++-------
4 files changed, 42 insertions(+), 20 deletions(-)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Added new compatible for WCN3998 and corresponding voltage
and current values to WCN3998 compatible.
Changed driver code to support WCN3998
Signed-off-by: Harish Bandi <[email protected]>
---
Changes in V4:
- Added is_qca_soc_type_wcn399x_family helper function
- to get the soc type is wcn399x or not.
---
drivers/bluetooth/btqca.c | 4 ++--
drivers/bluetooth/btqca.h | 3 ++-
drivers/bluetooth/hci_qca.c | 48 ++++++++++++++++++++++++++++++++-------------
3 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index 6122685..70cab13 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -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
diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
index c72c56e..bd6a902 100644
--- a/drivers/bluetooth/btqca.h
+++ b/drivers/bluetooth/btqca.h
@@ -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)
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 4ea995d..e238c2b 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -189,6 +189,14 @@ static enum qca_btsoc_type qca_soc_type(struct hci_uart *hu)
return soc_type;
}
+bool is_qca_soc_type_wcn399x_family(enum qca_btsoc_type soc_type)
+{
+ if ((soc_type == QCA_WCN3990) || (soc_type == QCA_WCN3998))
+ return true;
+
+ return false;
+}
+
static void __serial_clock_on(struct tty_struct *tty)
{
/* TODO: Some chipset requires to enable UART clock on client
@@ -521,7 +529,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 (!is_qca_soc_type_wcn399x_family(qcadev->btsoc_type)) {
gpiod_set_value_cansleep(qcadev->bt_en, 1);
} else {
hu->init_speed = qcadev->init_speed;
@@ -627,7 +635,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 (is_qca_soc_type_wcn399x_family(qcadev->btsoc_type))
qca_power_shutdown(hu);
else
gpiod_set_value_cansleep(qcadev->bt_en, 0);
@@ -1008,7 +1016,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 (is_qca_soc_type_wcn399x_family(qca_soc_type(hu)))
msleep(10);
else
msleep(300);
@@ -1084,7 +1092,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 (is_qca_soc_type_wcn399x_family(qca_soc_type(hu)) >= QCA_WCN3990) {
if (!qca_get_speed(hu, QCA_INIT_SPEED) &&
!qca_get_speed(hu, QCA_OPER_SPEED))
return -EINVAL;
@@ -1116,7 +1124,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 (is_qca_soc_type_wcn399x_family(soc_type))
hci_uart_set_flow_control(hu, true);
qca_baudrate = qca_get_baudrate_value(speed);
@@ -1128,7 +1136,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 (is_qca_soc_type_wcn399x_family(soc_type))
hci_uart_set_flow_control(hu, false);
}
@@ -1201,7 +1209,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 (soc_type == QCA_WCN3990) {
+ if (is_qca_soc_type_wcn399x_family(soc_type)) {
bt_dev_info(hdev, "setting up wcn3990");
/* Enable NON_PERSISTENT_SETUP QUIRK to ensure to execute
@@ -1232,7 +1240,7 @@ static int qca_setup(struct hci_uart *hu)
qca_baudrate = qca_get_baudrate_value(speed);
}
- if (soc_type != QCA_WCN3990) {
+ if (!is_qca_soc_type_wcn399x_family(soc_type)) {
/* Get QCA version information */
ret = qca_read_soc_version(hdev, &soc_ver);
if (ret)
@@ -1257,7 +1265,7 @@ static int qca_setup(struct hci_uart *hu)
}
/* Setup bdaddr */
- if (soc_type == QCA_WCN3990)
+ if (is_qca_soc_type_wcn399x_family(soc_type))
hu->hdev->set_bdaddr = qca_set_bdaddr;
else
hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
@@ -1280,7 +1288,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 },
@@ -1291,6 +1299,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;
@@ -1424,8 +1443,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 && is_qca_soc_type_wcn399x_family(data->soc_type)) {
+ qcadev->btsoc_type = data->soc_type;
qcadev->bt_power = devm_kzalloc(&serdev->dev,
sizeof(struct qca_power),
GFP_KERNEL);
@@ -1489,7 +1508,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);
@@ -1499,7 +1518,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);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
This patch enables regulators for the Qualcomm Bluetooth WCN3998
controller.
Signed-off-by: Harish Bandi <[email protected]>
---
Changes in V4:
- Removed new compatible WCN3998
- changed wcn3990 to wcn399* to represent wcn399* family
---
Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt b/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
index 824c0e2..de9cefa 100644
--- a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
+++ b/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
@@ -11,20 +11,21 @@ Required properties:
- compatible: should contain one of the following:
* "qcom,qca6174-bt"
* "qcom,wcn3990-bt"
+ * "qcom,wcn3998-bt"
Optional properties for compatible string qcom,qca6174-bt:
- enable-gpios: gpio specifier used to enable chip
- clocks: clock provided to the controller (SUSCLK_32KHZ)
-Required properties for compatible string qcom,wcn3990-bt:
+Required properties for compatible string qcom,wcn399*-bt:
- vddio-supply: VDD_IO supply regulator handle.
- vddxo-supply: VDD_XO supply regulator handle.
- vddrf-supply: VDD_RF supply regulator handle.
- vddch0-supply: VDD_CH0 supply regulator handle.
-Optional properties for compatible string qcom,wcn3990-bt:
+Optional properties for compatible string qcom,wcn399*-bt:
- max-speed: see Documentation/devicetree/bindings/serial/slave-device.txt
@@ -44,7 +45,7 @@ serial@7570000 {
serial@898000 {
bluetooth {
- compatible = "qcom,wcn3990-bt";
+ compatible = "qcom,wcn399*-bt";
vddio-supply = <&vreg_s4a_1p8>;
vddxo-supply = <&vreg_l7a_1p8>;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
On Mon, Mar 25, 2019 at 05:06:39PM +0530, Harish Bandi wrote:
> Added new compatible for WCN3998 and corresponding voltage
> and current values to WCN3998 compatible.
> Changed driver code to support WCN3998
>
> Signed-off-by: Harish Bandi <[email protected]>
> ---
> Changes in V4:
> - Added is_qca_soc_type_wcn399x_family helper function
> - to get the soc type is wcn399x or not.
> ---
> drivers/bluetooth/btqca.c | 4 ++--
> drivers/bluetooth/btqca.h | 3 ++-
> drivers/bluetooth/hci_qca.c | 48 ++++++++++++++++++++++++++++++++-------------
> 3 files changed, 38 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
> index 6122685..70cab13 100644
> --- a/drivers/bluetooth/btqca.c
> +++ b/drivers/bluetooth/btqca.c
> @@ -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) {
Move qca_is_wcn399x() to btqca.c and use it here. Export the symbol
and declare the function in btqca.h, so it can be used in hci_qca.c
> /* 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)
use qca_is_wcn399x()
> snprintf(config.fwname, sizeof(config.fwname),
> "qca/crnv%02x.bin", rom_ver);
> else
> diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
> index c72c56e..bd6a902 100644
> --- a/drivers/bluetooth/btqca.h
> +++ b/drivers/bluetooth/btqca.h
> @@ -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)
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index 4ea995d..e238c2b 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -189,6 +189,14 @@ static enum qca_btsoc_type qca_soc_type(struct hci_uart *hu)
> return soc_type;
> }
>
> +bool is_qca_soc_type_wcn399x_family(enum qca_btsoc_type soc_type)
This long function name doesn't provide much value and degrades
readability of the code that uses it. A short name like
qca_is_wcn399x() is clear enough and friendlier to the code reader's
eyes.
> +{
> + if ((soc_type == QCA_WCN3990) || (soc_type == QCA_WCN3998))
> + return true;
> +
> + return false;
> +}
> +
> static void __serial_clock_on(struct tty_struct *tty)
> {
> /* TODO: Some chipset requires to enable UART clock on client
> @@ -521,7 +529,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 (!is_qca_soc_type_wcn399x_family(qcadev->btsoc_type)) {
> gpiod_set_value_cansleep(qcadev->bt_en, 1);
> } else {
> hu->init_speed = qcadev->init_speed;
> @@ -627,7 +635,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 (is_qca_soc_type_wcn399x_family(qcadev->btsoc_type))
> qca_power_shutdown(hu);
> else
> gpiod_set_value_cansleep(qcadev->bt_en, 0);
> @@ -1008,7 +1016,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 (is_qca_soc_type_wcn399x_family(qca_soc_type(hu)))
> msleep(10);
> else
> msleep(300);
> @@ -1084,7 +1092,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 (is_qca_soc_type_wcn399x_family(qca_soc_type(hu)) >= QCA_WCN3990) {
Why '>= QCA_WCN3990'?
> if (!qca_get_speed(hu, QCA_INIT_SPEED) &&
> !qca_get_speed(hu, QCA_OPER_SPEED))
> return -EINVAL;
> @@ -1116,7 +1124,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 (is_qca_soc_type_wcn399x_family(soc_type))
> hci_uart_set_flow_control(hu, true);
>
> qca_baudrate = qca_get_baudrate_value(speed);
> @@ -1128,7 +1136,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 (is_qca_soc_type_wcn399x_family(soc_type))
> hci_uart_set_flow_control(hu, false);
> }
>
> @@ -1201,7 +1209,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 (soc_type == QCA_WCN3990) {
> + if (is_qca_soc_type_wcn399x_family(soc_type)) {
> bt_dev_info(hdev, "setting up wcn3990");
>
> /* Enable NON_PERSISTENT_SETUP QUIRK to ensure to execute
> @@ -1232,7 +1240,7 @@ static int qca_setup(struct hci_uart *hu)
> qca_baudrate = qca_get_baudrate_value(speed);
> }
>
> - if (soc_type != QCA_WCN3990) {
> + if (!is_qca_soc_type_wcn399x_family(soc_type)) {
> /* Get QCA version information */
> ret = qca_read_soc_version(hdev, &soc_ver);
> if (ret)
> @@ -1257,7 +1265,7 @@ static int qca_setup(struct hci_uart *hu)
> }
>
> /* Setup bdaddr */
> - if (soc_type == QCA_WCN3990)
> + if (is_qca_soc_type_wcn399x_family(soc_type))
> hu->hdev->set_bdaddr = qca_set_bdaddr;
> else
> hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
> @@ -1280,7 +1288,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 },
> @@ -1291,6 +1299,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;
> @@ -1424,8 +1443,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 && is_qca_soc_type_wcn399x_family(data->soc_type)) {
> + qcadev->btsoc_type = data->soc_type;
> qcadev->bt_power = devm_kzalloc(&serdev->dev,
> sizeof(struct qca_power),
> GFP_KERNEL);
> @@ -1489,7 +1508,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)
use qca_is_wcn399x()
> qca_power_shutdown(&qcadev->serdev_hu);
> else
> clk_disable_unprepare(qcadev->susclk);
> @@ -1499,7 +1518,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);
On Mon, Mar 25, 2019 at 05:06:40PM +0530, Harish Bandi wrote:
> This patch enables regulators for the Qualcomm Bluetooth WCN3998
> controller.
>
> Signed-off-by: Harish Bandi <[email protected]>
> ---
> Changes in V4:
> - Removed new compatible WCN3998
> - changed wcn3990 to wcn399* to represent wcn399* family
> ---
> Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt b/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
> index 824c0e2..de9cefa 100644
> --- a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
> +++ b/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
> @@ -11,20 +11,21 @@ Required properties:
> - compatible: should contain one of the following:
> * "qcom,qca6174-bt"
> * "qcom,wcn3990-bt"
> + * "qcom,wcn3998-bt"
>
> Optional properties for compatible string qcom,qca6174-bt:
>
> - enable-gpios: gpio specifier used to enable chip
> - clocks: clock provided to the controller (SUSCLK_32KHZ)
>
> -Required properties for compatible string qcom,wcn3990-bt:
> +Required properties for compatible string qcom,wcn399*-bt:
I think in Linux drivers the use of 'x' is more common as a wildcard
for a single letter than an asterisk. It is also in line with the
function name in the driver, so I would suggest to keep thinkgs
consistent and call it wcn399x everywhere.
>
> - vddio-supply: VDD_IO supply regulator handle.
> - vddxo-supply: VDD_XO supply regulator handle.
> - vddrf-supply: VDD_RF supply regulator handle.
> - vddch0-supply: VDD_CH0 supply regulator handle.
>
> -Optional properties for compatible string qcom,wcn3990-bt:
> +Optional properties for compatible string qcom,wcn399*-bt:
>
> - max-speed: see Documentation/devicetree/bindings/serial/slave-device.txt
>
> @@ -44,7 +45,7 @@ serial@7570000 {
>
> serial@898000 {
> bluetooth {
> - compatible = "qcom,wcn3990-bt";
> + compatible = "qcom,wcn399*-bt";
Typically wildcards aren't used in DT examples as Marcel already
mentioned on v3. IMO the wildcard degrades the value of the example,
rather than enhancing it. I think just listing the compatible string
is enough, no need for an wcn3998/x specific example since it's
essentialy the same as wcn3990.
Thanks
Matthias
Hi Matthias,
On 2019-03-25 21:51, Matthias Kaehlcke wrote:
> On Mon, Mar 25, 2019 at 05:06:39PM +0530, Harish Bandi wrote:
>> Added new compatible for WCN3998 and corresponding voltage
>> and current values to WCN3998 compatible.
>> Changed driver code to support WCN3998
>>
>> Signed-off-by: Harish Bandi <[email protected]>
>> ---
>> Changes in V4:
>> - Added is_qca_soc_type_wcn399x_family helper function
>> - to get the soc type is wcn399x or not.
>> ---
>> drivers/bluetooth/btqca.c | 4 ++--
>> drivers/bluetooth/btqca.h | 3 ++-
>> drivers/bluetooth/hci_qca.c | 48
>> ++++++++++++++++++++++++++++++++-------------
>> 3 files changed, 38 insertions(+), 17 deletions(-)
>>
>> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
>> index 6122685..70cab13 100644
>> --- a/drivers/bluetooth/btqca.c
>> +++ b/drivers/bluetooth/btqca.c
>> @@ -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) {
>
> Move qca_is_wcn399x() to btqca.c and use it here. Export the symbol
> and declare the function in btqca.h, so it can be used in hci_qca.c
[Harish] - ok, will update in new patch
>
>> /* 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)
>
> use qca_is_wcn399x()
[Harish] - ok, will update in new patch
>
>> snprintf(config.fwname, sizeof(config.fwname),
>> "qca/crnv%02x.bin", rom_ver);
>> else
>> diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
>> index c72c56e..bd6a902 100644
>> --- a/drivers/bluetooth/btqca.h
>> +++ b/drivers/bluetooth/btqca.h
>> @@ -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)
>> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
>> index 4ea995d..e238c2b 100644
>> --- a/drivers/bluetooth/hci_qca.c
>> +++ b/drivers/bluetooth/hci_qca.c
>> @@ -189,6 +189,14 @@ static enum qca_btsoc_type qca_soc_type(struct
>> hci_uart *hu)
>> return soc_type;
>> }
>>
>> +bool is_qca_soc_type_wcn399x_family(enum qca_btsoc_type soc_type)
>
> This long function name doesn't provide much value and degrades
> readability of the code that uses it. A short name like
> qca_is_wcn399x() is clear enough and friendlier to the code reader's
> eyes.
>
>> +{
>> + if ((soc_type == QCA_WCN3990) || (soc_type == QCA_WCN3998))
>> + return true;
>> +
>> + return false;
>> +}
>> +
>> static void __serial_clock_on(struct tty_struct *tty)
>> {
>> /* TODO: Some chipset requires to enable UART clock on client
>> @@ -521,7 +529,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 (!is_qca_soc_type_wcn399x_family(qcadev->btsoc_type)) {
>> gpiod_set_value_cansleep(qcadev->bt_en, 1);
>> } else {
>> hu->init_speed = qcadev->init_speed;
>> @@ -627,7 +635,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 (is_qca_soc_type_wcn399x_family(qcadev->btsoc_type))
>> qca_power_shutdown(hu);
>> else
>> gpiod_set_value_cansleep(qcadev->bt_en, 0);
>> @@ -1008,7 +1016,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 (is_qca_soc_type_wcn399x_family(qca_soc_type(hu)))
>> msleep(10);
>> else
>> msleep(300);
>> @@ -1084,7 +1092,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 (is_qca_soc_type_wcn399x_family(qca_soc_type(hu)) >= QCA_WCN3990)
>> {
>
> Why '>= QCA_WCN3990'?
[Harish] - ok, it should not will check and correct it.
>
>> if (!qca_get_speed(hu, QCA_INIT_SPEED) &&
>> !qca_get_speed(hu, QCA_OPER_SPEED))
>> return -EINVAL;
>> @@ -1116,7 +1124,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 (is_qca_soc_type_wcn399x_family(soc_type))
>> hci_uart_set_flow_control(hu, true);
>>
>> qca_baudrate = qca_get_baudrate_value(speed);
>> @@ -1128,7 +1136,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 (is_qca_soc_type_wcn399x_family(soc_type))
>> hci_uart_set_flow_control(hu, false);
>> }
>>
>> @@ -1201,7 +1209,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 (soc_type == QCA_WCN3990) {
>> + if (is_qca_soc_type_wcn399x_family(soc_type)) {
>> bt_dev_info(hdev, "setting up wcn3990");
>>
>> /* Enable NON_PERSISTENT_SETUP QUIRK to ensure to execute
>> @@ -1232,7 +1240,7 @@ static int qca_setup(struct hci_uart *hu)
>> qca_baudrate = qca_get_baudrate_value(speed);
>> }
>>
>> - if (soc_type != QCA_WCN3990) {
>> + if (!is_qca_soc_type_wcn399x_family(soc_type)) {
>> /* Get QCA version information */
>> ret = qca_read_soc_version(hdev, &soc_ver);
>> if (ret)
>> @@ -1257,7 +1265,7 @@ static int qca_setup(struct hci_uart *hu)
>> }
>>
>> /* Setup bdaddr */
>> - if (soc_type == QCA_WCN3990)
>> + if (is_qca_soc_type_wcn399x_family(soc_type))
>> hu->hdev->set_bdaddr = qca_set_bdaddr;
>> else
>> hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
>> @@ -1280,7 +1288,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 },
>> @@ -1291,6 +1299,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;
>> @@ -1424,8 +1443,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 && is_qca_soc_type_wcn399x_family(data->soc_type)) {
>> + qcadev->btsoc_type = data->soc_type;
>> qcadev->bt_power = devm_kzalloc(&serdev->dev,
>> sizeof(struct qca_power),
>> GFP_KERNEL);
>> @@ -1489,7 +1508,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)
>
> use qca_is_wcn399x()
[Harish] - ok, will update in new patch
>
>> qca_power_shutdown(&qcadev->serdev_hu);
>> else
>> clk_disable_unprepare(qcadev->susclk);
>> @@ -1499,7 +1518,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);
Thanks,
Harish
Hi Matthias,
On 2019-03-25 21:59, Matthias Kaehlcke wrote:
> On Mon, Mar 25, 2019 at 05:06:40PM +0530, Harish Bandi wrote:
>> This patch enables regulators for the Qualcomm Bluetooth WCN3998
>> controller.
>>
>> Signed-off-by: Harish Bandi <[email protected]>
>> ---
>> Changes in V4:
>> - Removed new compatible WCN3998
>> - changed wcn3990 to wcn399* to represent wcn399* family
>> ---
>> Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt | 7
>> ++++---
>> 1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git
>> a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
>> b/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
>> index 824c0e2..de9cefa 100644
>> --- a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
>> +++ b/Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt
>> @@ -11,20 +11,21 @@ Required properties:
>> - compatible: should contain one of the following:
>> * "qcom,qca6174-bt"
>> * "qcom,wcn3990-bt"
>> + * "qcom,wcn3998-bt"
>>
>> Optional properties for compatible string qcom,qca6174-bt:
>>
>> - enable-gpios: gpio specifier used to enable chip
>> - clocks: clock provided to the controller (SUSCLK_32KHZ)
>>
>> -Required properties for compatible string qcom,wcn3990-bt:
>> +Required properties for compatible string qcom,wcn399*-bt:
>
> I think in Linux drivers the use of 'x' is more common as a wildcard
> for a single letter than an asterisk. It is also in line with the
> function name in the driver, so I would suggest to keep thinkgs
> consistent and call it wcn399x everywhere.
[Harish] - ok, will change it to wcn399x
>
>>
>> - vddio-supply: VDD_IO supply regulator handle.
>> - vddxo-supply: VDD_XO supply regulator handle.
>> - vddrf-supply: VDD_RF supply regulator handle.
>> - vddch0-supply: VDD_CH0 supply regulator handle.
>>
>> -Optional properties for compatible string qcom,wcn3990-bt:
>> +Optional properties for compatible string qcom,wcn399*-bt:
>>
>> - max-speed: see
>> Documentation/devicetree/bindings/serial/slave-device.txt
>>
>> @@ -44,7 +45,7 @@ serial@7570000 {
>>
>> serial@898000 {
>> bluetooth {
>> - compatible = "qcom,wcn3990-bt";
>> + compatible = "qcom,wcn399*-bt";
>
> Typically wildcards aren't used in DT examples as Marcel already
> mentioned on v3. IMO the wildcard degrades the value of the example,
> rather than enhancing it. I think just listing the compatible string
> is enough, no need for an wcn3998/x specific example since it's
> essentialy the same as wcn3990.
[Harish] - So will keep as wcn3990 only here.
>
> Thanks
>
> Matthias