Hi Balakrishna,
> Add support to set voltage/current of various regulators
> to power up/down Bluetooth chip wcn3990.
> Add support to read baudrate from dts.
>
> Signed-off-by: Balakrishna Godavarthi <bgodavar@xxxxxxxxxxxxxx>
> ---
> drivers/bluetooth/btqca.h | 6 +
> drivers/bluetooth/hci_qca.c | 547 ++++++++++++++++++++++++++++++++++++++------
> 2 files changed, 480 insertions(+), 73 deletions(-)
>
> diff --git a/drivers/bluetooth/btqca.h b/drivers/bluetooth/btqca.h
> index 2a7366b..8e2142a 100644
> --- a/drivers/bluetooth/btqca.h
> +++ b/drivers/bluetooth/btqca.h
> @@ -37,6 +37,9 @@
> #define EDL_TAG_ID_HCI (17)
> #define EDL_TAG_ID_DEEP_SLEEP (27)
>
> +#define CHEROKEE_POWERON_PULSE (0xFC)
> +#define CHEROKEE_POWEROFF_PULSE (0xC0)
> +
> enum qca_bardrate {
> QCA_BAUDRATE_115200 = 0,
> QCA_BAUDRATE_57600,
> @@ -124,6 +127,9 @@ struct tlv_type_hdr {
> __u8 data[0];
> } __packed;
>
> +int btqca_power_setup(bool on);
my initial comment on this has not yet been addressed. They are all per hci_dev or I am not going to merge it.
> +int qca_btsoc_cleanup(struct hci_dev *hdev);
> +
> #if IS_ENABLED(CONFIG_BT_QCA)
>
> int qca_set_bdaddr_rome(struct hci_dev *hdev, const bdaddr_t *bdaddr);
> diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
> index f05382b..71f9591 100644
> --- a/drivers/bluetooth/hci_qca.c
> +++ b/drivers/bluetooth/hci_qca.c
> @@ -5,7 +5,7 @@
> * protocol extension to H4.
> *
> * Copyright (C) 2007 Texas Instruments, Inc.
> - * Copyright (c) 2010, 2012 The Linux Foundation. All rights reserved.
> + * Copyright (c) 2010, 2012, 2018 The Linux Foundation. All rights reserved.
> *
> * Acknowledgements:
> * This file is based on hci_ll.c, which was...
> @@ -35,6 +35,11 @@
> #include <linux/mod_devicetable.h>
> #include <linux/module.h>
> #include <linux/serdev.h>
> +#include <linux/delay.h>
> +#include <linux/platform_device.h>
> +#include <linux/regulator/consumer.h>
> +#include <linux/of_device.h>
> +#include <linux/device.h>
>
> #include <net/bluetooth/bluetooth.h>
> #include <net/bluetooth/hci_core.h>
> @@ -119,12 +124,51 @@ struct qca_data {
> u64 votes_off;
> };
>
> +enum btqca_soc_t {
> + BTQCA_INVALID = -1,
> + BTQCA_AR3002,
> + BTQCA_ROME,
> + BTQCA_CHEROKEE
> +};
> +
> struct qca_serdev {
> struct hci_uart serdev_hu;
> struct gpio_desc *bt_en;
> struct clk *susclk;
> + enum btqca_soc_t btsoc_type;
> + u32 init_speed;
> + u32 oper_speed;
> +};
> +
> +/*
> + * voltage regulator information required for configuring the
> + * QCA bluetooth chipset
> + */
> +struct btqca_vreg {
> + const char *name;
> + unsigned int min_v;
> + unsigned int max_v;
> + unsigned int load_ua;
> +};
> +
> +struct btqca_vreg_data {
> + enum btqca_soc_t soc_type;
> + struct btqca_vreg *vregs;
> + size_t num_vregs;
> +};
> +
> +/*
> + * Platform data for the QCA bluetooth power driver.
> + */
> +struct btqca_power {
> + struct device *dev;
> + const struct btqca_vreg_data *vreg_data;
> + struct regulator_bulk_data *vreg_bulk;
> + bool vregs_on;
> };
>
> +static struct btqca_power *qca;
> +
No such global variable.
> static void __serial_clock_on(struct tty_struct *tty)
> {
> /* TODO: Some chipset requires to enable UART clock on client
> @@ -402,6 +446,7 @@ static int qca_open(struct hci_uart *hu)
> {
> struct qca_serdev *qcadev;
> struct qca_data *qca;
> + int ret = 0;
>
> BT_DBG("hu %p qca_open", hu);
>
> @@ -463,13 +508,22 @@ static int qca_open(struct hci_uart *hu)
> serdev_device_open(hu->serdev);
>
> qcadev = serdev_device_get_drvdata(hu->serdev);
> - gpiod_set_value_cansleep(qcadev->bt_en, 1);
> + if (qcadev->btsoc_type == BTQCA_CHEROKEE) {
> + hu->init_speed = qcadev->init_speed;
> + hu->oper_speed = qcadev->oper_speed;
> + ret = btqca_power_setup(true);
> + if (ret)
> + goto out;
Doing return btqca_power_setup is the same and less complicated.
> + } else {
> + gpiod_set_value_cansleep(qcadev->bt_en, 1);
> + }
> }
>
> BT_DBG("HCI_UART_QCA open, tx_idle_delay=%u, wake_retrans=%u",
> qca->tx_idle_delay, qca->wake_retrans);
>
> - return 0;
> +out:
> + return ret;
> }
>
> static void qca_debugfs_init(struct hci_dev *hdev)
> @@ -552,7 +606,10 @@ static int qca_close(struct hci_uart *hu)
> serdev_device_close(hu->serdev);
>
> qcadev = serdev_device_get_drvdata(hu->serdev);
> - gpiod_set_value_cansleep(qcadev->bt_en, 0);
> + if (qcadev->btsoc_type == BTQCA_CHEROKEE)
> + qca_btsoc_cleanup(hu->hdev);
> + else
> + gpiod_set_value_cansleep(qcadev->bt_en, 0);
> }
>
> kfree_skb(qca->rx_skb);
> @@ -872,6 +929,8 @@ static uint8_t qca_get_baudrate_value(int speed)
> return QCA_BAUDRATE_2000000;
> case 3000000:
> return QCA_BAUDRATE_3000000;
> + case 3200000:
> + return QCA_BAUDRATE_3200000;
> case 3500000:
> return QCA_BAUDRATE_3500000;
> default:
> @@ -886,7 +945,7 @@ static int qca_set_baudrate(struct hci_dev *hdev, uint8_t baudrate)
> struct sk_buff *skb;
> u8 cmd[] = { 0x01, 0x48, 0xFC, 0x01, 0x00 };
>
> - if (baudrate > QCA_BAUDRATE_3000000)
> + if (baudrate > QCA_BAUDRATE_3200000)
> return -EINVAL;
The baud rate addition can be a separate patch.
>
> cmd[4] = baudrate;
> @@ -923,68 +982,260 @@ static inline void host_set_baudrate(struct hci_uart *hu, unsigned int speed)
> hci_uart_set_baudrate(hu, speed);
> }
>
> +static int qca_send_vendor_cmd(struct hci_dev *hdev, u8 cmd)
> +{
> + struct hci_uart *hu = hci_get_drvdata(hdev);
> + struct qca_data *qca = hu->priv;
> + struct sk_buff *skb;
> +
> + BT_DBG("%s:sending command %02x to SoC", hdev->name, cmd);
> +
> + skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL);
> + if (!skb) {
> + BT_ERR("Failed to allocate memory for skb packet");
> + return -ENOMEM;
> + }
> +
> + skb_put_data(skb, &cmd, sizeof(cmd));
> + hci_skb_pkt_type(skb) = HCI_COMMAND_PKT;
> +
> + skb_queue_tail(&qca->txq, skb);
> + hci_uart_tx_wakeup(hu);
> +
> + /* Wait for 100 us for soc to settle down */
> + set_current_state(TASK_UNINTERRUPTIBLE);
> + schedule_timeout(usecs_to_jiffies(100));
> + set_current_state(TASK_INTERRUPTIBLE);
Any reason to not use msleep.
> +
> + return 0;
> +}
> +
> +static int qca_serdev_open(struct hci_uart *hu)
> +{
> + int ret = 0;
> +
> + if (hu->serdev) {
> + serdev_device_open(hu->serdev);
> + } else {
> + bt_dev_err(hu->hdev, "open operation not supported");
> + ret = 1;
> + }
> +
> + return ret;
> +}
> +
> +int qca_btsoc_cleanup(struct hci_dev *hdev)
> +{
> + struct hci_uart *hu = hci_get_drvdata(hdev);
> +
> + /* change host baud rate before sending power off command */
> + host_set_baudrate(hu, 2400);
> + /* send 0xC0 command to btsoc before turning off regulators */
> + qca_send_vendor_cmd(hdev, CHEROKEE_POWEROFF_PULSE);
> + /* turn off btsoc */
> + return btqca_power_setup(false);
> +}
> +
> +static int qca_serdev_close(struct hci_uart *hu)
> +{
> + int ret = 0;
> +
> + if (hu->serdev) {
> + serdev_device_close(hu->serdev);
> + } else {
> + bt_dev_err(hu->hdev, "close operation not supported");
> + ret = 1;
> + }
> +
> + return ret;
> +}
> static int qca_setup(struct hci_uart *hu)
> {
> struct hci_dev *hdev = hu->hdev;
> struct qca_data *qca = hu->priv;
> + struct qca_serdev *qcadev;
> unsigned int speed, qca_baudrate = QCA_BAUDRATE_115200;
> int ret;
> + int soc_ver;
> +
> + qcadev = serdev_device_get_drvdata(hu->serdev);
> +
> + switch (qcadev->btsoc_type) {
> + case BTQCA_CHEROKEE:
> + bt_dev_info(hdev, "setting up wcn3990”);
Nope. This is debug level stuff.
> + /* Patch downloading has to be done without IBS mode */
> + clear_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
> + /* Setup initial baudrate */
> + speed = 0;
> + if (hu->init_speed)
> + speed = hu->init_speed;
> + else if (hu->proto->init_speed)
> + speed = hu->proto->init_speed;
> +
> + if (speed) {
> + host_set_baudrate(hu, speed);
> + } else {
> + bt_dev_err(hdev, "initial speed %u", speed);
> + return -1;
> + }
> +
> + /* disable flow control, as chip is still not turned on */
> + hci_uart_set_flow_control(hu, true);
> + /* send 0xFC command to btsoc */
> + ret = qca_send_vendor_cmd(hdev, CHEROKEE_POWERON_PULSE);
> + if (ret) {
> + bt_dev_err(hdev, "Failed to send power on command");
> + return ret;
> + }
> +
> + /* close serial port */
> + ret = qca_serdev_close(hu);
> + if (ret)
> + return ret;
> + /* open serial port */
> + ret = qca_serdev_open(hu);
> + if (ret)
> + return ret;
>
> - bt_dev_info(hdev, "ROME setup");
> + /* Setup initial baudrate */
> + speed = 0;
> + if (hu->init_speed)
> + speed = hu->init_speed;
> + else if (hu->proto->init_speed)
> + speed = hu->proto->init_speed;
> + if (speed) {
> + host_set_baudrate(hu, speed);
> + } else {
> + BT_ERR("%s:initial speed %u", hdev->name, speed);
> + return -1;
> + }
>
> - /* Patch downloading has to be done without IBS mode */
> - clear_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
> + /* Enable flow control */
> + hci_uart_set_flow_control(hu, false);
> + /* wait until flow control settled */
> + msleep(100);
> + bt_dev_info(hdev, "wcn3990 Patch Version Request");
> + ret = rome_patch_ver_req(hdev, &soc_ver);
> + if (ret < 0 || soc_ver == 0) {
> + BT_ERR("%s: Failed to get version 0x%x", hdev->name,
> + ret);
> + return ret;
> + }
>
> - /* Setup initial baudrate */
> - speed = 0;
> - if (hu->init_speed)
> - speed = hu->init_speed;
> - else if (hu->proto->init_speed)
> - speed = hu->proto->init_speed;
> + bt_dev_info(hdev, "wcn3990 controller version 0x%08x", soc_ver);
> +
> + /* clear flow control */
> + hci_uart_set_flow_control(hu, true);
> + /* set operating speed */
> + speed = 0;
> + if (hu->oper_speed)
> + speed = hu->oper_speed;
> + else if (hu->proto->oper_speed)
> + speed = hu->proto->oper_speed;
> + if (speed) {
> + qca_baudrate = qca_get_baudrate_value(speed);
> + bt_dev_info(hdev, "Set UART speed to %d", speed);
> + ret = qca_set_baudrate(hdev, qca_baudrate);
> + if (ret) {
> + BT_ERR("%s:Failed to change the baud rate(%d)",
> + hdev->name, ret);
> + return ret;
> + }
> + if (speed) {
> + host_set_baudrate(hu, speed);
> + } else {
> + BT_ERR("%s:Error in setting operator speed:%u",
> + hdev->name, speed);
> + return -1;
> + }
> + }
>
> - if (speed)
> - host_set_baudrate(hu, speed);
> + /* Set flow control */
> + hci_uart_set_flow_control(hu, false);
> + /* Setup patch and NVM configurations */
> + ret = qca_uart_setup_cherokee(hdev, qca_baudrate, &soc_ver);
> + if (!ret) {
> + set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
> + qca_debugfs_init(hdev);
> + } else if (ret == -ENOENT) {
> + /* No patch/nvm-config found, run with original
> + * fw/config.
> + */
> + ret = 0;
> + } else if (ret == -EAGAIN) {
> + /*
> + * Userspace firmware loader will return -EAGAIN in
> + * case no patch/nvm-config is found, so run with
> + * original fw/config.
> + */
> + ret = 0;
> + }
>
> - /* Setup user speed if needed */
> - speed = 0;
> - if (hu->oper_speed)
> - speed = hu->oper_speed;
> - else if (hu->proto->oper_speed)
> - speed = hu->proto->oper_speed;
> + /* Setup wcn3990 bdaddr */
> + hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
>
> - if (speed) {
> - qca_baudrate = qca_get_baudrate_value(speed);
> + return ret;
>
> - bt_dev_info(hdev, "Set UART speed to %d", speed);
> - ret = qca_set_baudrate(hdev, qca_baudrate);
> - if (ret) {
> - bt_dev_err(hdev, "Failed to change the baud rate (%d)",
> - ret);
> + default:
> + bt_dev_info(hdev, "ROME setup");
> +
> + /* Patch downloading has to be done without IBS mode */
> + clear_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
> +
> + /* Setup initial baudrate */
> + speed = 0;
> + if (hu->init_speed)
> + speed = hu->init_speed;
> + else if (hu->proto->init_speed)
> + speed = hu->proto->init_speed;
> +
> + if (speed)
> + host_set_baudrate(hu, speed);
> +
> + /* Setup user speed if needed */
> + speed = 0;
> + if (hu->oper_speed)
> + speed = hu->oper_speed;
> + else if (hu->proto->oper_speed)
> + speed = hu->proto->oper_speed;
> +
> + if (speed) {
> + qca_baudrate = qca_get_baudrate_value(speed);
> +
> + bt_dev_info(hdev, "Set UART speed to %d", speed);
> + ret = qca_set_baudrate(hdev, qca_baudrate);
> + if (ret) {
> + bt_dev_err(hdev, "Failed to change the baud rate (%d)",
> + ret);
> return ret;
> + }
> + host_set_baudrate(hu, speed);
> }
> - host_set_baudrate(hu, speed);
> - }
>
> - /* Setup patch / NVM configurations */
> - ret = qca_uart_setup_rome(hdev, qca_baudrate);
> - if (!ret) {
> - set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
> - qca_debugfs_init(hdev);
> - } else if (ret == -ENOENT) {
> - /* No patch/nvm-config found, run with original fw/config */
> - ret = 0;
> - } else if (ret == -EAGAIN) {
> - /*
> - * Userspace firmware loader will return -EAGAIN in case no
> - * patch/nvm-config is found, so run with original fw/config.
> - */
> - ret = 0;
> - }
> + /* Setup patch / NVM configurations */
> + ret = qca_uart_setup_rome(hdev, qca_baudrate);
> + if (!ret) {
> + set_bit(STATE_IN_BAND_SLEEP_ENABLED, &qca->flags);
> + qca_debugfs_init(hdev);
> + } else if (ret == -ENOENT) {
> + /* No patch/nvm-config found, run with original
> + * fw/config
> + */
> + ret = 0;
> + } else if (ret == -EAGAIN) {
> + /*
> + * Userspace firmware loader will return -EAGAIN in
> + * case no patch/nvm-config is found, so run with
> + * original fw/config.
> + */
> + ret = 0;
> + }
>
> - /* Setup bdaddr */
> - hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
> + /* Setup bdaddr */
> + hu->hdev->set_bdaddr = qca_set_bdaddr_rome;
>
> - return ret;
> + return ret;
> + }
> }
This change is so complex and convoluted that I can not review it.
>
> static struct hci_uart_proto qca_proto = {
> @@ -1002,44 +1253,189 @@ static int qca_setup(struct hci_uart *hu)
> .dequeue = qca_dequeue,
> };
>
> +static const struct btqca_vreg_data cherokee_data = {
> + .soc_type = BTQCA_CHEROKEE,
> + .vregs = (struct btqca_vreg []) {
> + { "vddio", 1352000, 1352000, 0 },
> + { "vddxtal", 1904000, 2040000, 0 },
> + { "vddcore", 1800000, 1800000, 1 },
> + { "vddpa", 1304000, 1304000, 1 },
> + { "vddldo", 3000000, 3312000, 1 },
> + },
> + .num_vregs = 5,
> +};
> +
> +static int btqca_enable_regulators(int i, struct btqca_vreg *vregs)
> +{
> + int ret = 0;
> +
> + ret = regulator_set_voltage(qca->vreg_bulk[i].consumer, vregs[i].min_v,
> + vregs[i].max_v);
> + if (ret)
> + goto out;
> +
> + if (vregs[i].load_ua)
> + ret = regulator_set_load(qca->vreg_bulk[i].consumer,
> + vregs[i].load_ua);
> +
> + if (ret)
> + goto out;
> +
> + ret = regulator_enable(qca->vreg_bulk[i].consumer);
> +
> +out:
> + return ret;
> +
> +}
> +
> +static void btqca_disable_regulators(int reg_nu, struct btqca_vreg *vregs)
> +{
> + int i;
> +
> + /* disable the regulator if requested by user
> + * or when fault to enable any regulator.
> + */
> + for (i = reg_nu - 1; i >= 0 ; i--) {
> + regulator_disable(qca->vreg_bulk[i].consumer);
> + regulator_set_voltage(qca->vreg_bulk[i].consumer, 0,
> + vregs[i].max_v);
> + if (vregs[i].load_ua)
> + regulator_set_load(qca->vreg_bulk[i].consumer, 0);
> + }
> +}
> +
> +int btqca_power_setup(bool on)
> +{
> + int ret = 0;
> + int i;
> + struct btqca_vreg *vregs;
> +
> + if (!qca || !qca->vreg_data || !qca->vreg_bulk)
> + return -EINVAL;
> + vregs = qca->vreg_data->vregs;
> +
> + BT_DBG("on: %d", on);
> + /* turn on if regualtors are off */
> + if (on == true && qca->vregs_on == false) {
> + qca->vregs_on = true;
> + for (i = 0; i < qca->vreg_data->num_vregs; i++) {
> + ret = btqca_enable_regulators(i, vregs);
> + if (ret)
> + break;
> + }
> + } else if (on == false && qca->vregs_on == true) {
> + qca->vregs_on = false;
> + /* turn off regulator in reverse order */
> + btqca_disable_regulators(qca->vreg_data->num_vregs, vregs);
> + }
I do not get this function separation. Please clean this up. And use x and !x instead of == false and == true.
> +
> + /* regulators failed */
> + if (ret) {
> + qca->vregs_on = false;
> + BT_ERR("failed to enable regulator:%s", vregs[i].name);
> + /* turn off regulators which are enabled */
> + btqca_disable_regulators(i, vregs);
> + }
> +
> + return ret;
> +}
> +
> +static int init_regulators(struct btqca_power *qca,
> + const struct btqca_vreg *vregs,
> + size_t num_vregs)
> +{
> + int i;
> +
> + qca->vreg_bulk = devm_kzalloc(qca->dev, num_vregs *
> + sizeof(struct regulator_bulk_data),
> + GFP_KERNEL);
> + if (!qca->vreg_bulk)
> + return -ENOMEM;
> +
> + for (i = 0; i < num_vregs; i++)
> + qca->vreg_bulk[i].supply = vregs[i].name;
> +
> + return devm_regulator_bulk_get(qca->dev, num_vregs, qca->vreg_bulk);
> +}
> +
> static int qca_serdev_probe(struct serdev_device *serdev)
> {
> struct qca_serdev *qcadev;
> - int err;
> + const struct btqca_vreg_data *data;
> + int err = 0;
>
> qcadev = devm_kzalloc(&serdev->dev, sizeof(*qcadev), GFP_KERNEL);
> if (!qcadev)
> return -ENOMEM;
>
> qcadev->serdev_hu.serdev = serdev;
> + data = of_device_get_match_data(&serdev->dev);
> + if (data && data->soc_type == BTQCA_CHEROKEE)
> + qcadev->btsoc_type = BTQCA_CHEROKEE;
> + else
> + qcadev->btsoc_type = BTQCA_ROME;
> +
> serdev_device_set_drvdata(serdev, qcadev);
> + if (qcadev->btsoc_type == BTQCA_CHEROKEE) {
> + qca = devm_kzalloc(&serdev->dev, sizeof(struct btqca_power),
> + GFP_KERNEL);
> + if (!qca)
> + return -ENOMEM;
> +
> + qca->dev = &serdev->dev;
> + qca->vreg_data = data;
> + err = init_regulators(qca, data->vregs, data->num_vregs);
> + if (err) {
> + BT_ERR("Failed to init regulators:%d", err);
> + kfree(qca);
> + goto out;
> + }
>
> - qcadev->bt_en = devm_gpiod_get(&serdev->dev, "enable",
> - GPIOD_OUT_LOW);
> - if (IS_ERR(qcadev->bt_en)) {
> - dev_err(&serdev->dev, "failed to acquire enable gpio\n");
> - return PTR_ERR(qcadev->bt_en);
> - }
> + /* set voltage regulator status as false */
> + qca->vregs_on = false;
> + /* get operating speed */
> + device_property_read_u32(&serdev->dev, "oper-speed",
> + &qcadev->oper_speed);
> + device_property_read_u32(&serdev->dev, "init-speed",
> + &qcadev->init_speed);
Not even defined in DT.
> + if (!qcadev->oper_speed)
> + BT_INFO("UART will pick default proto operating speed");
> + err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
> + if (err) {
> + BT_ERR("wcn3990 serdev registration failed");
> + kfree(qca);
> + goto out;
> + }
>
> - qcadev->susclk = devm_clk_get(&serdev->dev, NULL);
> - if (IS_ERR(qcadev->susclk)) {
> - dev_err(&serdev->dev, "failed to acquire clk\n");
> - return PTR_ERR(qcadev->susclk);
> - }
> + } else {
> + qcadev->bt_en = devm_gpiod_get(&serdev->dev, "enable",
> + GPIOD_OUT_LOW);
> + if (IS_ERR(qcadev->bt_en)) {
> + dev_err(&serdev->dev, "failed to acquire enable gpio\n");
> + return PTR_ERR(qcadev->bt_en);
> + }
>
> - err = clk_set_rate(qcadev->susclk, SUSCLK_RATE_32KHZ);
> - if (err)
> - return err;
> + qcadev->susclk = devm_clk_get(&serdev->dev, NULL);
> + if (IS_ERR(qcadev->susclk)) {
> + dev_err(&serdev->dev, "failed to acquire clk\n");
> + return PTR_ERR(qcadev->susclk);
> + }
>
> - err = clk_prepare_enable(qcadev->susclk);
> - if (err)
> - return err;
> + err = clk_set_rate(qcadev->susclk, SUSCLK_RATE_32KHZ);
> + if (err)
> + return err;
>
> - err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
> - if (err)
> - clk_disable_unprepare(qcadev->susclk);
> + err = clk_prepare_enable(qcadev->susclk);
> + if (err)
> + return err;
> +
> + err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
> + if (err)
> + clk_disable_unprepare(qcadev->susclk);
> + }
> +
> +out: return err;
>
> - return err;
> }
>
> static void qca_serdev_remove(struct serdev_device *serdev)
> @@ -1047,12 +1443,17 @@ static void qca_serdev_remove(struct serdev_device *serdev)
> struct qca_serdev *qcadev = serdev_device_get_drvdata(serdev);
>
> hci_uart_unregister_device(&qcadev->serdev_hu);
> -
> - clk_disable_unprepare(qcadev->susclk);
> + if (qcadev->btsoc_type == BTQCA_CHEROKEE) {
> + btqca_power_setup(false);
I am really not merging this. A driver that supports only one instance is not okay.
> + kfree(qca);
> + } else {
> + clk_disable_unprepare(qcadev->susclk);
> + }
> }
>
> static const struct of_device_id qca_bluetooth_of_match[] = {
> { .compatible = "qcom,qca6174-bt" },
> + { .compatible = "qcom,wcn3990-bt", .data = &cherokee_data},
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, qca_bluetooth_of_match);
Regards
Marcel
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
