Skip to content

Add bluetooth supports for NFA765A and QCA2066 #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BigfootACA wants to merge 2 commits into
base: linux-7.0.11
Choose a base branch
from
Open

Add bluetooth supports for NFA765A and QCA2066 #591

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a3cc5a
power: sequencing: pcie-m2: Add bluetooth supports for NFA765A and QC…
BigfootACA Aug 6, 2026
b02c209
power: sequencing: pcie-m2: suppress UART BT with USB interface
BigfootACA Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 118 additions & 13 deletions drivers/power/sequencing/pwrseq-pcie-m2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,13 @@ struct pwrseq_pcie_m2_ctx {
struct regulator_bulk_data *regs;
size_t num_vregs;
struct notifier_block nb;
struct notifier_block usb_nb;
struct gpio_desc *w_disable1_gpio;
struct gpio_desc *w_disable2_gpio;
unsigned int w_disable2_refcnt;
struct mutex w_disable2_lock;
struct mutex serdev_lock;
bool usb_bt_seen;
struct serdev_device *serdev;
struct of_changeset *ocs;
struct device *dev;
Expand Down Expand Up @@ -82,6 +85,7 @@ static int pwrseq_pci_m2_e_bt_enable(struct pwrseq_device *pwrseq)
static int pwrseq_pci_m2_e_bt_disable(struct pwrseq_device *pwrseq)
{
struct pwrseq_pcie_m2_ctx *ctx = pwrseq_device_get_drvdata(pwrseq);
int ret;

guard(mutex)(&ctx->w_disable2_lock);

Expand All @@ -91,7 +95,11 @@ static int pwrseq_pci_m2_e_bt_disable(struct pwrseq_device *pwrseq)
if (--ctx->w_disable2_refcnt)
return 0;

return gpiod_set_value_cansleep(ctx->w_disable2_gpio, 1);
ret = gpiod_set_value_cansleep(ctx->w_disable2_gpio, 1);
if (!ret)
msleep(100);

return ret;
}

/*
Expand Down Expand Up @@ -230,7 +238,8 @@ static int pwrseq_pcie_m2_match(struct pwrseq_device *pwrseq,
}

static int pwrseq_m2_pcie_create_bt_node(struct pwrseq_pcie_m2_ctx *ctx,
struct device_node *parent)
struct device_node *parent,
const char *compatible)
{
struct device *dev = ctx->dev;
struct device_node *np;
Expand All @@ -249,7 +258,7 @@ static int pwrseq_m2_pcie_create_bt_node(struct pwrseq_pcie_m2_ctx *ctx,
goto err_destroy_changeset;
}

ret = of_changeset_add_prop_string(ctx->ocs, np, "compatible", "qcom,wcn7850-bt");
ret = of_changeset_add_prop_string(ctx->ocs, np, "compatible", compatible);
if (ret) {
dev_err(dev, "Failed to add bluetooth compatible: %d\n", ret);
goto err_destroy_changeset;
Expand Down Expand Up @@ -333,6 +342,9 @@ static bool pwrseq_pcie_m2_has_usb_bt(struct pwrseq_pcie_m2_ctx *ctx)
{
struct pwrseq_pcie_m2_usb_match match;

if (ctx->usb_bt_seen)
return true;

struct device_node *ep __free(device_node) =
of_graph_get_endpoint_by_regs(ctx->of_node, 2, 0);
if (!ep)
Expand Down Expand Up @@ -362,22 +374,25 @@ static bool pwrseq_pcie_m2_has_usb_bt(struct pwrseq_pcie_m2_ctx *ctx)
#else
static bool pwrseq_pcie_m2_has_usb_bt(struct pwrseq_pcie_m2_ctx *ctx)
{
return false;
return ctx->usb_bt_seen;
}
#endif

static int pwrseq_pcie_m2_create_serdev(struct pwrseq_pcie_m2_ctx *ctx)
static int pwrseq_pcie_m2_create_serdev(struct pwrseq_pcie_m2_ctx *ctx,
const char *compatible)
{
struct serdev_controller *serdev_ctrl;
struct device *dev = ctx->dev;
int ret;
guard(mutex)(&ctx->serdev_lock);

struct device_node *serdev_parent __free(device_node) =
of_graph_get_remote_node(dev_of_node(ctx->dev), 3, 0);
if (!serdev_parent)
return 0;

if (pwrseq_pcie_m2_has_usb_bt(ctx)) {
ctx->usb_bt_seen = true;
dev_dbg(dev,
"Bluetooth is attached over USB, skipping UART serdev\n");
return 0;
Expand All @@ -399,13 +414,13 @@ static int pwrseq_pcie_m2_create_serdev(struct pwrseq_pcie_m2_ctx *ctx)
goto err_put_ctrl;
}

ret = pwrseq_m2_pcie_create_bt_node(ctx, serdev_parent);
ret = pwrseq_m2_pcie_create_bt_node(ctx, serdev_parent, compatible);
if (ret)
goto err_free_serdev;

ret = serdev_device_add(ctx->serdev);
if (ret) {
dev_err(dev, "Failed to add serdev for WCN7850: %d\n", ret);
dev_err(dev, "Failed to add serdev for bluetooth: %d\n", ret);
goto err_free_dt_node;
}

Expand All @@ -428,7 +443,7 @@ static int pwrseq_pcie_m2_create_serdev(struct pwrseq_pcie_m2_ctx *ctx)
return ret;
}

static void pwrseq_pcie_m2_remove_serdev(struct pwrseq_pcie_m2_ctx *ctx)
static void pwrseq_pcie_m2_remove_serdev_locked(struct pwrseq_pcie_m2_ctx *ctx)
{
if (ctx->serdev) {
device_remove_of_node(&ctx->serdev->dev);
Expand All @@ -444,11 +459,83 @@ static void pwrseq_pcie_m2_remove_serdev(struct pwrseq_pcie_m2_ctx *ctx)
}
}

static void pwrseq_pcie_m2_remove_serdev(struct pwrseq_pcie_m2_ctx *ctx)
{
guard(mutex)(&ctx->serdev_lock);

pwrseq_pcie_m2_remove_serdev_locked(ctx);
}

#if IS_ENABLED(CONFIG_USB)
static int pwrseq_pcie_m2_usb_notify(struct notifier_block *nb,
unsigned long action, void *data)
{
struct pwrseq_pcie_m2_ctx *ctx =
container_of(nb, struct pwrseq_pcie_m2_ctx, usb_nb);
struct usb_device *udev = data;
struct pwrseq_pcie_m2_usb_match match;

if (action != USB_DEVICE_ADD)
return NOTIFY_DONE;

struct device_node *ep __free(device_node) =
of_graph_get_endpoint_by_regs(ctx->of_node, 2, 0);
if (!ep)
return NOTIFY_DONE;

struct device_node *usb_port __free(device_node) =
of_graph_get_remote_port(ep);
if (!usb_port || of_property_read_u32(usb_port, "reg", &match.port))
return NOTIFY_DONE;

struct device_node *ports __free(device_node) = of_get_parent(usb_port);
if (!ports)
return NOTIFY_DONE;

struct device_node *hub __free(device_node) = of_get_parent(ports);
if (!hub)
return NOTIFY_DONE;

match.hub = hub;
if (!pwrseq_pcie_m2_match_usb_bt(udev, &match))
return NOTIFY_DONE;

guard(mutex)(&ctx->serdev_lock);

ctx->usb_bt_seen = true;
if (ctx->serdev) {
dev_info(ctx->dev,
"USB Bluetooth detected, removing UART Bluetooth\n");
pwrseq_pcie_m2_remove_serdev_locked(ctx);
}

return NOTIFY_OK;
}
#endif

static const struct pci_device_id pcie_m2_serdev_ids[] = {
{ /* QCNFA765A with QCA2066 */
PCI_VDEVICE_SUB(QCOM, 0x1103, PCI_VENDOR_ID_QCOM, 0x3374),
.driver_data = (kernel_ulong_t)"qcom,qca2066-bt",
},
{ /* QCNFA765A */
PCI_VDEVICE(QCOM, 0x1103),
.driver_data = (kernel_ulong_t)"qcom,wcn6855-bt",
},
{ /* QCNCM865A */
PCI_VDEVICE(QCOM, 0x1107),
.driver_data = (kernel_ulong_t)"qcom,wcn8750-bt",
},
{}
};

static int pwrseq_m2_pcie_notify(struct notifier_block *nb, unsigned long action,
void *data)
{
struct pwrseq_pcie_m2_ctx *ctx = container_of(nb, struct pwrseq_pcie_m2_ctx, nb);
struct pci_dev *pdev = to_pci_dev(data);
const struct pci_device_id * id;
const char *compatible;
int ret;

/*
Expand All @@ -463,18 +550,24 @@ static int pwrseq_m2_pcie_notify(struct notifier_block *nb, unsigned long action

switch (action) {
case BUS_NOTIFY_BOUND_DRIVER:
/* Create serdev device for WCN7850 */
if (pdev->vendor == PCI_VENDOR_ID_QCOM && pdev->device == 0x1107) {
ret = pwrseq_pcie_m2_create_serdev(ctx);
/* Create serdev device for matched devices */
if ((id = pci_match_id(pcie_m2_serdev_ids, pdev))) {
compatible = (const char*)id->driver_data;
ret = pwrseq_pcie_m2_create_serdev(ctx, compatible);
if (ret)
return notifier_from_errno(ret);
}
break;
case BUS_NOTIFY_UNBIND_DRIVER:
/* Destroy serdev device for WCN7850 */
if (pdev->vendor == PCI_VENDOR_ID_QCOM && pdev->device == 0x1107)
/* Destroy serdev device for matched devices */
if (pci_match_id(pcie_m2_serdev_ids, pdev))
pwrseq_pcie_m2_remove_serdev(ctx);

break;
case BUS_NOTIFY_REMOVED_DEVICE:
if (pci_match_id(pcie_m2_serdev_ids, pdev))
ctx->usb_bt_seen = false;

break;
}

Expand Down Expand Up @@ -542,6 +635,10 @@ static int pwrseq_pcie_m2_probe(struct platform_device *pdev)
if (ret)
return ret;

ret = devm_mutex_init(dev, &ctx->serdev_lock);
if (ret)
return ret;

/*
* Currently, of_regulator_bulk_get_all() is the only regulator API that
* allows to get all supplies in the devicetree node without manually
Expand Down Expand Up @@ -589,6 +686,11 @@ static int pwrseq_pcie_m2_probe(struct platform_device *pdev)
if (ret)
goto err_free_regulators;

#if IS_ENABLED(CONFIG_USB)
ctx->usb_nb.notifier_call = pwrseq_pcie_m2_usb_notify;
usb_register_notify(&ctx->usb_nb);
#endif

return 0;

err_free_regulators:
Expand All @@ -601,6 +703,9 @@ static void pwrseq_pcie_m2_remove(struct platform_device *pdev)
{
struct pwrseq_pcie_m2_ctx *ctx = platform_get_drvdata(pdev);

#if IS_ENABLED(CONFIG_USB)
usb_unregister_notify(&ctx->usb_nb);
#endif
bus_unregister_notifier(&pci_bus_type, &ctx->nb);
pwrseq_pcie_m2_remove_serdev(ctx);

Expand Down