Skip to content

WORKAROUND: power: sequencing: qcom-wcn: skip BT devices without bt-enable GPIO #689

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
shuaz-shuai wants to merge 1 commit into
base: qcom-6.18.y
Choose a base branch
from
+12 −6
Open

WORKAROUND: power: sequencing: qcom-wcn: skip BT devices without bt-enable GPIO #689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions drivers/power/sequencing/pwrseq-qcom-wcn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ struct pwrseq_qcom_wcn_pdata {
unsigned int pwup_delay_ms;
unsigned int gpio_enable_delay_ms;
const struct pwrseq_target_data **targets;
bool bt_gpio_required; /* BT enable path requires a dedicated GPIO */
};

struct pwrseq_qcom_wcn_ctx {
Expand Down Expand Up @@ -309,6 +310,7 @@ static const struct pwrseq_qcom_wcn_pdata pwrseq_wcn6855_of_data = {
.pwup_delay_ms = 50,
.gpio_enable_delay_ms = 5,
.targets = pwrseq_qcom_wcn6855_targets,
.bt_gpio_required = true,
};

static const char *const pwrseq_wcn7850_vregs[] = {
Expand All @@ -326,6 +328,7 @@ static const struct pwrseq_qcom_wcn_pdata pwrseq_wcn7850_of_data = {
.num_vregs = ARRAY_SIZE(pwrseq_wcn7850_vregs),
.pwup_delay_ms = 50,
.targets = pwrseq_qcom_wcn_targets,
.bt_gpio_required = true,
};

static int pwrseq_qcom_wcn_match(struct pwrseq_device *pwrseq,
Expand Down Expand Up @@ -358,17 +361,20 @@ static int pwrseq_qcom_wcn_match(struct pwrseq_device *pwrseq,
return PWRSEQ_NO_MATCH;

/*
* If this is a Bluetooth consumer device but the bt-enable GPIO is not
* configured in the power sequencer (e.g. BT_EN is tied high via a
* hardware pull-up and therefore absent from the DT), don't match.
* The consumer driver will fall back to its legacy power control path
* and correctly set power_ctrl_enabled to false.
* If this chip requires a dedicated BT enable GPIO (bt_gpio_required)
* but the bt-enable GPIO is not configured in the power sequencer
* (e.g. BT_EN is tied high via a hardware pull-up and therefore absent
* from the DT), don't match. The consumer driver will fall back to its
* legacy power control path and correctly set power_ctrl_enabled to
* false. Chips like WCN3990 have no separate BT/WLAN enable pins by
* design, so the flag is left unset for them and matching proceeds.
*
* BT device nodes are conventionally named "bluetooth" in the DT,
* so use of_node_name_eq() as a generic check rather than enumerating
* specific compatible strings.
*/
if (!ctx->bt_gpio && of_node_name_eq(dev_node, "bluetooth"))
if (ctx->pdata->bt_gpio_required && !ctx->bt_gpio &&
of_node_name_eq(dev_node, "bluetooth"))
return PWRSEQ_NO_MATCH;

return PWRSEQ_MATCH_OK;
Expand Down