arm64: dts: qcom: shikra: Add WCN clock to wcn3988-pmu node

[yepurisiddu]

Add WCN clock to wcn3988-pmu node in Shikra DTS to ensure the clock is explicitly managed during WCN power sequencing.

With RPMCC proxy vote removal on QCM2290, the WCN clock is no longer kept active via proxy votes. Declaring the clock in the wcn3988-pmu node allows the PMU driver to vote for it during WCN power on/off. Without this change, BT functionality will be impacted after the proxy vote removal.

Link: https://lore.kernel.org/all/20260929-bt-wcn-clk-enable-v2-1-7a90902f3df5@oss.qualcomm.com/
CRs-fixed: 4684986

[qswat-orbit-external]

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

[qswat-orbit-external]

Merge Check Failed: CR Not Eligible for Merge

CR 4684986 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4684986
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

[yepurisiddu]

Amit Kucheria (@idlethread) yijiyang Mukesh Ojha (@mukeshojha-linux), Could you please review and approve the changes.

[qlijarvis]

PR #1190 — validate-patch

PR: #1190

Verdict	Issues	Detailed Report
❌	2	Full report

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/all/20260929-bt-wcn-clk-enable-v2-1-7a90902f3df5@oss.qualcomm.com/
2. Lore link matches PR commits: No — PR modifies different files (*-evk.dts) than the lore patch (*-som.dtsi); PR also adds an extra board (CQS) not present in lore
3. Upstream patch status: ⏳ Decision Pending — maintainer (Bjorn Andersson) requested commit message revision on Sep 30, 2026; no acceptance signal yet
4. PR present in qcom-next/topics: Fail - 1/1 commit(s) are missing from both qcom-next and topics

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1190 - FROMLIST: arm64: dts: qcom: shikra: Add WCN clock to wcn3988-pmu node
Upstream commit: https://lore.kernel.org/all/20260929-bt-wcn-clk-enable-v2-1-7a90902f3df5@oss.qualcomm.com/
Verdict: ❌ FAIL

Commit Message

Check	Status	Note
Subject matches upstream	✅	Subject identical (FROMLIST prefix added correctly)
Body preserves rationale	✅	Key rationale preserved from lore patch
Fixes tag present/correct	N/A	No Fixes tag in upstream or PR (not a bug fix)
Authorship preserved	✅	Author matches lore: Yepuri Siddu yepuri.siddu@oss.qualcomm.com
Backport note (if applicable)	N/A	FROMLIST prefix used correctly (not yet merged upstream)

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts	❌	Wrong file — lore patch modifies shikra-cqm-som.dtsi, not shikra-cqm-evk.dts
arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts	❌	Extra file — not present in lore patch at all
arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts	❌	Wrong file — lore patch modifies shikra-iqs-som.dtsi, not shikra-iqs-evk.dts

Issues

Critical: File path mismatch

The PR modifies board-level EVK files (*-evk.dts), but the upstream lore patch modifies SOM-level include files (*-som.dtsi):

• Lore patch changes:

  • arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi (adds clocks = <&rpmcc RPM_SMD_RF_CLK2>;)
  • arch/arm64/boot/dts/qcom/shikra-iqs-som.dtsi (adds clocks = <&rpmcc RPM_SMD_RF_CLK1>;)

• PR changes:

  • arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts (adds clocks = <&rpmcc RPM_SMD_RF_CLK2>;)
  • arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts (adds clocks = <&rpmcc RPM_SMD_RF_CLK2>;)
  • arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts (adds clocks = <&rpmcc RPM_SMD_RF_CLK1>;)

The code change itself (adding the clocks property) is semantically identical, but the file locations differ completely. The lore patch places the clock property in the SOM-level device tree includes (which are shared across multiple board variants), while the PR duplicates the change across individual board files.

Additional issue: CQS board

The PR adds the clock to shikra-cqs-evk.dts, but the lore patch does not mention CQS at all. The lore commit message states: "CQM SOM uses RPM_SMD_RF_CLK2 while IQS SOM uses RPM_SMD_RF_CLK1" — no mention of CQS.

Upstream patch status

Bjorn Andersson (maintainer) replied on Sep 30, 2026 requesting the commit message be revised to include more technical details from the cover letter. No acceptance signal (applied, queued, Reviewed-by, Acked-by) has been issued yet.

Community verdict: ⏳ Decision Pending — maintainer requested commit message revision; no acceptance or rejection signal yet (last activity: Oct 5, 2026)

Verdict

Do not merge. The PR does not faithfully represent the lore patch:

1. File paths are completely different — the lore patch modifies SOM-level .dtsi includes, while the PR modifies board-level .dts files.
2. Extra board added — the PR includes shikra-cqs-evk.dts, which is not present in the lore patch.
3. Upstream patch is still under review — maintainer requested changes; patch has not been accepted yet.

Required actions:

1. Update the PR to match the lore patch file paths exactly: modify shikra-cqm-som.dtsi and shikra-iqs-som.dtsi, not the EVK board files.
2. Remove the shikra-cqs-evk.dts change unless there is a separate lore patch for CQS (if so, link it).
3. Wait for the lore patch to be accepted upstream before merging into the vendor tree, or update the commit message per maintainer feedback and repost upstream first.

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/all/20260929-bt-wcn-clk-enable-v2-1-7a90902f3df5@oss.qualcomm.com/
2. Lore link matches PR commits: No — PR modifies different files (*-evk.dts) than the lore patch (*-som.dtsi); PR also adds an extra board (CQS) not present in lore
3. Upstream patch status: ⏳ Decision Pending — maintainer (Bjorn Andersson) requested commit message revision on Sep 30, 2026; no acceptance signal yet
4. PR present in qcom-next/topics: No — integration_presence_report.md confirms the commit is missing from both qcom-next and all topic branches (FAIL: 1/1 commits missing)

Deterministic Integration Presence

Integration Presence Report

This report is generated by Jarvis before validate-patch runs.
It is the authoritative source for whether PR changes are already present
in qcom-next or in the kernel topic branches.

Kernel repo: /local/mnt/workspace/sgaud/Qgenie/image_pipeline/kernel
qcom-next ref: ba86f67908354f41f269ca1d64b22e4624766dcf
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit	Subject	qcom-next	topics	Final
1/1	[PATCH] FROMLIST: arm64: dts: qcom: shikra: Add WCN clock to	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing

Final Status

overall_status: FAIL
present_commits: 0/1
partial_commits: 0/1
missing_commits: 1/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Fail - 1/1 commit(s) are missing from both qcom-next and topics

[qlijarvis]

PR #1190 — checker-log-analyzer

PR: #1190
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/36103746568

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	1 CHECK warning on commit af4f5b9
dt-binding-check	⏭️	No binding changes
dtb-check	✅	Test passed
sparse-check	✅	Passed
check-uapi-headers	✅	No UAPI changes
check-patch-compliance	❌	Content mismatch on both commits
tag-check	✅	Both commits have valid FROMLIST: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1190 - FROMLIST: arm64: dts: qcom: shikra: Add WCN clock to wcn3988-pmu node
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/36103746568
Target branch: qcom-6.18.y

Checker	Result	Summary
checkpatch	❌	1 CHECK warning on commit af4f5b9
dt-binding-check	⏭️	No binding changes
dtb-check	✅	Test passed
sparse-check	✅	Passed
check-uapi-headers	✅	No UAPI changes
check-patch-compliance	❌	Content mismatch on both commits
tag-check	✅	Both commits have valid FROMLIST: prefix

---

❌ checkpatch

Root cause: Unbalanced braces around else statement in drivers/bluetooth/hci_qca.c:2515

Failure details:

Commit af4f5b93af0c ("FROMLIST: Bluetooth: hci_qca: Add WCN clock management for pwrseq-based power path")
CHECK: Unbalanced braces around else statement
#66: FILE: drivers/bluetooth/hci_qca.c:2515:
+			else {

af4f5b93af0cb59dbe31cfdd20586136df0fc2b4 total: 0 errors, 0 warnings, 1 checks, 42 lines checked

Fix: This is a CHECK (not an ERROR or WARNING), meaning it's a style suggestion. The issue is that the if branch doesn't have braces but the else branch does. To fix:

1. Either add braces to the if branch:

   if (condition) {
       statement;
   } else {
       ...
   }

2. Or remove braces from the else branch if it's a single statement:

   if (condition)
       statement;
   else
       statement;

Reproduce locally:

./scripts/checkpatch.pl --strict --ignore FILE_PATH_CHANGES --git 0230cc19506dd405b7fce4c28c4321d55f9ae84e..5d9b81ae8bd3d26d85dfbc3726f6f4fbefc1471c

---

❌ check-patch-compliance

Root cause: Both commits show "Change is different from the one mentioned in Link"

Failure details:

Checking commit: FROMLIST: Bluetooth: hci_qca: Add WCN clock management for pwrseq-based power path
Change is different from the one mentioned in Link

Checking commit: FROMLIST: arm64: dts: qcom: shikra: Add WCN clock to Bluetooth node
Change is different from the one mentioned in Link

Analysis: The checker detected that the patch content in the PR differs from the upstream lore patch at:

• https://lore.kernel.org/all/20260929-bt-wcn-clk-enable-v2-1-7a90902f3df5@oss.qualcomm.com/

This could be due to:

1. Context-only differences — the surrounding code differs between the base branch and upstream, causing context line mismatches (not a real issue)
2. Legitimate adaptations — the patch was modified to fit the target tree (should be documented in commit message)
3. Missing or extra hunks — the patch is incomplete or has additional changes not in upstream

Fix: Fetch the upstream patch and compare:

# Fetch upstream patch
b4 am --single-message -C -l -3 https://lore.kernel.org/all/20260929-bt-wcn-clk-enable-v2-1-7a90902f3df5@oss.qualcomm.com/ -o /tmp/upstream

# Compare the actual code changes (ignoring context)
git format-patch -1 af4f5b93af0c --stdout | awk '/^diff/,/^--$/' | grep -E '^[+-][^+-]' > /tmp/pr-changes
awk '/^diff/,/^--$/' /tmp/upstream/*.mbx | grep -E '^[+-][^+-]' > /tmp/upstream-changes
diff /tmp/pr-changes /tmp/upstream-changes

If the differences are:

• Context-only → No action needed; this is a checker limitation
• Legitimate adaptations → Add a note in the commit message explaining the changes
• Missing hunks → Cherry-pick the complete upstream patch
• Extra hunks → Remove them or attribute them separately

Reproduce locally:

b4 am --single-message -C -l -3 https://lore.kernel.org/all/20260929-bt-wcn-clk-enable-v2-1-7a90902f3df5@oss.qualcomm.com/

---

Verdict

2 blockers to fix before merge:

1. checkpatch (minor): Fix the unbalanced braces in drivers/bluetooth/hci_qca.c:2515 — this is a CHECK warning, so it's a style suggestion rather than a hard blocker, but should be addressed for consistency.

2. check-patch-compliance (investigate): The content mismatch needs investigation. Fetch the upstream patch with b4 and compare the actual code changes. If the differences are context-only (surrounding code differs between trees), this is acceptable. If there are real code differences, they must be either:

   • Documented in the commit message as intentional adaptations
   • Fixed by applying the complete upstream patch

Note: The PR title in the patch file says "Add WCN clock to wcn3988-pmu node" but the second commit subject says "Add WCN clock to Bluetooth node" — verify this is intentional or if the commit message needs updating.