Skip to content

Shikra bt wcn clock enable #1190

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
yepurisiddu wants to merge 2 commits into
base: qcom-6.18.y
Choose a base branch
from
Open

Shikra bt wcn clock enable #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af4f5b9
FROMLIST: Bluetooth: hci_qca: Add WCN clock management for pwrseq-bas…
yepurisiddu Sep 24, 2026
204d514
FROMLIST: arm64: dts: qcom: shikra: Add WCN clock to Bluetooth node
yepurisiddu Sep 24, 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
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,7 @@
vddxo-supply = <&vreg_pmu_xo>;
vddrf-supply = <&vreg_pmu_rf>;
vddch0-supply = <&vreg_pmu_ch0>;
clocks = <&rpmcc RPM_SMD_RF_CLK2>;
};
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@
vddxo-supply = <&vreg_pmu_xo>;
vddrf-supply = <&vreg_pmu_rf>;
vddch0-supply = <&vreg_pmu_ch0>;
clocks = <&rpmcc RPM_SMD_RF_CLK2>;
};
};

Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@
vddxo-supply = <&vreg_pmu_xo>;
vddrf-supply = <&vreg_pmu_rf>;
vddch0-supply = <&vreg_pmu_ch0>;
clocks = <&rpmcc RPM_SMD_RF_CLK1>;
};
};

Expand Down
23 changes: 20 additions & 3 deletions drivers/bluetooth/hci_qca.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2272,6 +2272,8 @@ static void qca_power_shutdown(struct hci_uart *hu)
}

if (power && power->pwrseq) {
if (qcadev->susclk)
clk_disable_unprepare(qcadev->susclk);
pwrseq_power_off(power->pwrseq);
set_bit(QCA_BT_OFF, &qca->flags);
return;
Expand Down Expand Up @@ -2332,8 +2334,17 @@ static int qca_regulator_enable(struct qca_serdev *qcadev)
struct qca_power *power = qcadev->bt_power;
int ret;

if (power->pwrseq)
return pwrseq_power_on(power->pwrseq);
if (power->pwrseq) {
ret = pwrseq_power_on(power->pwrseq);
if (ret)
return ret;
if (qcadev->susclk) {
ret = clk_prepare_enable(qcadev->susclk);
if (ret)
pwrseq_power_off(power->pwrseq);
}
return ret;
}

/* Already enabled */
if (power->vregs_on)
Expand Down Expand Up @@ -2501,8 +2512,14 @@ static int qca_serdev_probe(struct serdev_device *serdev)
*/
if (IS_ERR(qcadev->bt_power->pwrseq))
qcadev->bt_power->pwrseq = NULL;
else
else {
qcadev->susclk = devm_clk_get_optional(&serdev->dev, NULL);
if (IS_ERR(qcadev->susclk)) {
dev_err(&serdev->dev, "failed to acquire clk\n");
return PTR_ERR(qcadev->susclk);
}
break;
}
}

qcadev->bt_power->dev = &serdev->dev;
Expand Down