Skip to content

FROMLIST: arm64: dts: qcom: shikra: Add WCN3988 PMU and fix WiFi/BT s… - #752

Closed
Komal Bajaj (Komal-Bajaj) wants to merge 1 commit into
qualcomm-linux:qcom-6.18.yfrom
Komal-Bajaj:qcom-6.18.y
Closed

FROMLIST: arm64: dts: qcom: shikra: Add WCN3988 PMU and fix WiFi/BT s…#752
Komal Bajaj (Komal-Bajaj) wants to merge 1 commit into
qualcomm-linux:qcom-6.18.yfrom
Komal-Bajaj:qcom-6.18.y

Conversation

@Komal-Bajaj

@Komal-BajajKomal Bajaj (Komal-Bajaj) commented Jun 22, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

…upply routing

Align with latest upstream submission by adding the wcn3988-pmu node, routing bluetooth/wifi supplies through PMU child regulators, adding sw_ctrl pinctrl and bluetooth compatible to the shared dtsi, and fixing the wifi firmware-name to "shikra" across all EVK variants.

Link: https://lore.kernel.org/all/20260608-shikra-dt-m1-v4-10-2114300594a6@oss.qualcomm.com/
CRs-Fixed: 4580270
Depends-on: #760

@qswat-orbit-external

qswat-orbit-externalBot commented Jun 22, 2026

Copy link
Copy Markdown

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.

@qcomlnxci

qcomlnxci commented Jun 22, 2026

Copy link
Copy Markdown

Test jobs on acc17b0

@qcomlnxci

qcomlnxci commented Jun 22, 2026

Copy link
Copy Markdown

Test Matrix

Test Caselemans-evkmonaco-evkqcs615-rideqcs6490-rb3gen2qcs8300-rideqcs9100-ride-r3x1e80100-crd
BT_FW_KMD_Service✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
BT_ON_OFF✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
BT_SCAN✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
CPUFreq_Validation✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
CPU_affinity✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
DSP_AudioPD✅ Pass✅ Pass⚠️ skip✅ Pass✅ Pass⚠️ skip◻️
Ethernet⚠️ skip✅ Pass⚠️ skip⚠️ skip⚠️ skip⚠️ skip◻️
Freq_Scaling✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
GIC✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
IPA✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
Interrupts✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
OpenCV✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
PCIe✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
Probe_Failure_Check❌ Fail❌ Fail❌ Fail❌ Fail❌ Fail❌ Fail◻️
RMNET✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
UFS_Validation✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
USBHost❌ Fail❌ Fail❌ Fail❌ Fail❌ Fail❌ Fail◻️
WiFi_Firmware_Driver❌ Fail❌ Fail✅ Pass✅ Pass✅ Pass✅ Pass◻️
WiFi_OnOff✅ Pass❌ Fail✅ Pass✅ Pass✅ Pass✅ Pass◻️
adsp_remoteproc✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass❌ Fail◻️
cdsp_remoteproc✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass❌ Fail◻️
gpdsp_remoteproc✅ Pass✅ Pass⚠️ skip⚠️ skip✅ Pass❌ Fail◻️
hotplug✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
irq✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
kaslr✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
pinctrl✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
qcom_hwrng✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
remoteproc✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass❌ Fail◻️
rngtest✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
shmbridge✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
smmu❌ Fail✅ Pass❌ Fail✅ Pass✅ Pass❌ Fail◻️
watchdog✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
wpss_remoteproc✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️

@qswat-orbit-external

qswat-orbit-externalBot commented Jun 23, 2026

Copy link
Copy Markdown

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.

@yepurisidduyepurisiddu mentioned this pull request Jun 24, 2026
Closed
@Komal-Bajaj
FROMLIST: arm64: dts: qcom: shikra: Add WCN3988 PMU and fix WiFi/BT s…
5132280
…upply routing
Align with latest upstream submission by adding the wcn3988-pmu node,
routing bluetooth/wifi supplies through PMU child regulators, adding
sw_ctrl pinctrl and bluetooth compatible to the shared dtsi, and
fixing the wifi firmware-name to "shikra" across all EVK variants.
Link: https://lore.kernel.org/all/20260608-shikra-dt-m1-v4-10-2114300594a6@oss.qualcomm.com/
Signed-off-by: Komal Bajaj <komal.bajaj@oss.qualcomm.com>
@qcomlnxci
qcomlnxci requested a review from a teamJune 25, 2026 09:32
@qlijarvis

qlijarvis commented Jun 25, 2026

Copy link
Copy Markdown

PR #752 — validate-patch

PR:#752

VerdictIssuesDetailed Report
⚠️5Full report

Final Summary

  1. Lore link present: Yes — Link tag points to lore.kernel.org message-ID 20260608-shikra-dt-m1-v4-10-2114300594a6@oss.qualcomm.com
  2. Lore link matches PR commits: Cannot verify — network access restricted; unable to fetch upstream patch for byte-level comparison
  3. Upstream patch status: In review — FROMLIST: prefix indicates patch posted to mailing list but not yet merged to mainline
  4. PR present in qcom-next: Not checked — no kernel tree access per constraints
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR:#752 - arm64: dts: qcom: shikra: Add WCN3988 PMU and fix WiFi/BT supply routing
Upstream commit:https://lore.kernel.org/all/20260608-shikra-dt-m1-v4-10-2114300594a6@oss.qualcomm.com/
Verdict:⚠️ PARTIAL

Commit Message

CheckStatusNote
Subject matches upstream⚠️Cannot verify - network restricted; subject format is correct
Body preserves rationale✅Clear description of changes: PMU node, supply routing, pinctrl, firmware-name
Fixes tag present/correctN/ANo Fixes tag; not a bugfix patch
Authorship preserved✅Author: Komal Bajaj komal.bajaj@oss.qualcomm.com
Backport note (if applicable)✅FROMLIST: prefix correctly indicates upstream submission in review

Diff

FileStatusNotes
arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts✅Adds wcn3988-pmu node, updates BT/WiFi supplies, fixes firmware-name
arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts✅Adds wcn3988-pmu node, updates BT/WiFi supplies, fixes firmware-name
arch/arm64/boot/dts/qcom/shikra-evk.dtsi✅Adds sw_ctrl pinctrl, moves bluetooth node to shared dtsi
arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts✅Adds wcn3988-pmu + vreg_wcn_3p3, updates supplies, fixes firmware-name
arch/arm64/boot/dts/qcom/shikra.dtsi✅Removes bluetooth node with enable-gpios (moved to evk.dtsi)

Issues

None detected in commit message or diff structure. The patch:

  • Follows kernel DT conventions (node naming, property ordering, indentation)
  • Has proper FROMLIST: prefix indicating upstream submission status
  • Includes valid lore.kernel.org Link: tag
  • Maintains consistent authorship and sign-off
  • Changes are logically grouped and described accurately in commit message

Verdict

Merge as-is pending upstream acceptance verification (network access required to confirm lore link validity and patch status).

Final Summary

  1. Lore link present: Yes — Link tag points to lore.kernel.org message-ID 20260608-shikra-dt-m1-v4-10-2114300594a6@oss.qualcomm.com
  2. Lore link matches PR commits: Cannot verify — network access restricted; unable to fetch upstream patch for byte-level comparison
  3. Upstream patch status: In review — FROMLIST: prefix indicates patch posted to mailing list but not yet merged to mainline
  4. PR present in qcom-next: Not checked — no kernel tree access per constraints

@qlijarvis

qlijarvis commented Jun 25, 2026

Copy link
Copy Markdown

PR #752 — checker-log-analyzer

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

CheckerResultSummary
CheckerResultSummary
checkpatch❌3 warnings: undocumented DT compatible string "qcom,wcn3988-pmu"
dt-binding-check⏭️Skipped (no binding changes)
dtb-check❌Failed to match schema for "qcom,wcn3988-pmu" in 6 DTBs
sparse-check⏭️Skipped (no C code changes)
check-uapi-headers⏭️Skipped (no UAPI changes)
check-patch-compliance❌Patch differs from upstream lore link
tag-checkN/AFROMLIST prefix present
qcom-next-check✅FROMLIST commit allowed

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR:#752 - FROMLIST: arm64: dts: qcom: shikra: Add WCN3988 PMU and fix WiFi/BT supply routing
Source:https://github.com/qualcomm-linux/kernel-config/actions/runs/28160784487

CheckerResultSummary
checkpatch❌3 warnings: undocumented DT compatible string "qcom,wcn3988-pmu"
dt-binding-check⏭️Skipped (no binding changes)
dtb-check❌Failed to match schema for "qcom,wcn3988-pmu" in 6 DTBs
sparse-check⏭️Skipped (no C code changes)
check-uapi-headers⏭️Skipped (no UAPI changes)
check-patch-compliance❌Patch differs from upstream lore link
tag-checkN/AFROMLIST prefix present
qcom-next-check✅FROMLIST commit allowed

❌ checkpatch

Root cause: The compatible string "qcom,wcn3988-pmu" is used in DTS files but has no corresponding YAML binding documentation.

Failure details:

WARNING: DT compatible string "qcom,wcn3988-pmu" appears un-documented -- check ./Documentation/devicetree/bindings/
#32: FILE: arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts:120:
+ compatible = "qcom,wcn3988-pmu";
WARNING: DT compatible string "qcom,wcn3988-pmu" appears un-documented -- check ./Documentation/devicetree/bindings/
#110: FILE: arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts:102:
+ compatible = "qcom,wcn3988-pmu";
WARNING: DT compatible string "qcom,wcn3988-pmu" appears un-documented -- check ./Documentation/devicetree/bindings/
#222: FILE: arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts:144:
+ compatible = "qcom,wcn3988-pmu";
5132280bba126ac189e402f909136adf6f30a9d7 total: 0 errors, 3 warnings, 0 checks, 255 lines checked

Fix: Add the DT binding schema for qcom,wcn3988-pmu in Documentation/devicetree/bindings/ before merging this DTS change, or ensure the binding patch is merged upstream first. The binding should document all properties used: vddio-supply, vddxo-supply, vddrf-supply, vddch0-supply, swctrl-gpios, and the regulators child node with ldo0-ldo4.

Reproduce locally:

./scripts/checkpatch.pl --strict --summary-file --ignore FILE_PATH_CHANGES --git c9744addfb04eec214121e1fc11040e828576da4..dfc7484d720b9e0f10f28fb9e940af0e8d197341

❌ dtb-check

Root cause: DTB validation fails because the schema for "qcom,wcn3988-pmu" does not exist in the kernel tree.

Failure details:

arch/arm64/boot/dts/qcom/shikra-cqm-evk.dtb: /wcn3988-pmu: failed to match any schema with compatible: ['qcom,wcn3988-pmu']
arch/arm64/boot/dts/qcom/shikra-cqm-evk-imx577-camera.dtb: /wcn3988-pmu: failed to match any schema with compatible: ['qcom,wcn3988-pmu']
arch/arm64/boot/dts/qcom/shikra-cqs-evk.dtb: /wcn3988-pmu: failed to match any schema with compatible: ['qcom,wcn3988-pmu']
arch/arm64/boot/dts/qcom/shikra-cqs-evk-imx577-camera.dtb: /wcn3988-pmu: failed to match any schema with compatible: ['qcom,wcn3988-pmu']
arch/arm64/boot/dts/qcom/shikra-iqs-evk.dtb: /wcn3988-pmu: failed to match any schema with compatible: ['qcom,wcn3988-pmu']
arch/arm64/boot/dts/qcom/shikra-iqs-evk-imx577-camera.dtb: /wcn3988-pmu: failed to match any schema with compatible: ['qcom,wcn3988-pmu']

Fix: Same as checkpatch - add the YAML binding schema for qcom,wcn3988-pmu in Documentation/devicetree/bindings/net/wireless/ (or appropriate subsystem directory). The schema must validate all properties and the regulators child node structure used in the DTS files.

Reproduce locally:

make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig
make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -j$(nproc) CHECK_DTBS=y qcom/shikra-cqm-evk.dtb

❌ check-patch-compliance

Root cause: The patch content in the PR differs from the upstream patch referenced in the Link tag.

Failure details:

Checking commit: FROMLIST: arm64: dts: qcom: shikra: Add WCN3988 PMU and fix WiFi/BT supply routing
Change is different from the one mentioned in Link

Fix:

  1. Verify the lore link: https://lore.kernel.org/all/20260608-shikra-dt-m1-v4-10-2114300594a6@oss.qualcomm.com/
  2. Compare the PR patch with the upstream patch using b4 am to fetch the upstream version
  3. Either:
    • Update the PR to exactly match the upstream patch, OR
    • Update the Link tag to point to the correct upstream version that matches this PR, OR
    • If this is intentionally different (e.g., additional downstream changes), document the delta in the commit message and consider using a different tag prefix

Reproduce locally:

# Fetch the upstream patch
b4 am 20260608-shikra-dt-m1-v4-10-2114300594a6@oss.qualcomm.com
# Compare with your local commit
git diff <upstream-commit><your-commit>

Verdict

3 blockers must be fixed before merge:

  1. Missing DT binding schema - Add Documentation/devicetree/bindings/.../qcom,wcn3988-pmu.yaml (blocks checkpatch + dtb-check)
  2. Patch compliance mismatch - Align PR content with upstream lore link or update the Link tag
  3. Dependency ordering - If the binding is in a separate upstream patch, ensure it's merged to the target branch first

Recommended action: Check if the binding patch exists upstream. If it's part of the same series (v4 patch 10), you may need to cherry-pick earlier patches from that series, or wait for the binding to land upstream before merging this DTS change.

@qcomlnxci

qcomlnxci commented Jun 25, 2026

Copy link
Copy Markdown

Test jobs on 5132280

@qcomlnxci

qcomlnxci commented Jun 25, 2026

Copy link
Copy Markdown

Test Matrix

Test Caselemans-evkmonaco-evkqcs615-rideqcs6490-rb3gen2qcs8300-rideqcs9100-ride-r3x1e80100-crd
BT_FW_KMD_Service✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
BT_ON_OFF✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
BT_SCAN✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
CPUFreq_Validation✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
CPU_affinity✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
DSP_AudioPD✅ Pass✅ Pass⚠️ skip✅ Pass✅ Pass⚠️ skip◻️
Ethernet⚠️ skip✅ Pass⚠️ skip⚠️ skip⚠️ skip⚠️ skip◻️
Freq_Scaling✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
GIC✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
IPA✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
Interrupts✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
OpenCV✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
PCIe✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
Probe_Failure_Check❌ Fail❌ Fail❌ Fail❌ Fail❌ Fail❌ Fail◻️
RMNET✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
UFS_Validation✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
USBHost❌ Fail❌ Fail❌ Fail❌ Fail❌ Fail❌ Fail◻️
WiFi_Firmware_Driver❌ Fail❌ Fail✅ Pass✅ Pass✅ Pass✅ Pass◻️
WiFi_OnOff✅ Pass❌ Fail✅ Pass✅ Pass✅ Pass✅ Pass◻️
adsp_remoteproc✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass❌ Fail◻️
cdsp_remoteproc✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass❌ Fail◻️
gpdsp_remoteproc✅ Pass✅ Pass⚠️ skip⚠️ skip✅ Pass❌ Fail◻️
hotplug✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
irq✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
kaslr✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
pinctrl✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
qcom_hwrng✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
remoteproc✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass❌ Fail◻️
rngtest✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
shmbridge✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
smmu❌ Fail✅ Pass❌ Fail✅ Pass✅ Pass❌ Fail◻️
watchdog✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️
wpss_remoteproc✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass✅ Pass◻️

sgaud-quic
Salendarsingh Gaud (sgaud-quic) requested changes Jun 29, 2026
View reviewed changes

@sgaud-quicSalendarsingh Gaud (sgaud-quic) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rebase once dependency PR is merged

@shuaz-shuaishuaz-shuai mentioned this pull request Jul 10, 2026
Merged
@sgaud-quic

Salendarsingh Gaud (sgaud-quic) commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

As PR is dependent on PR#760, rebase this once it is merged

@Komal-Bajaj

Komal Bajaj (Komal-Bajaj) commented Jul 22, 2026

Copy link
Copy Markdown
ContributorAuthor

Closing, as already part of PR #817

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sgaud-quicSalendarsingh Gaud (sgaud-quic)sgaud-quic requested changes
@shashim-quicShiraz Hashim (shashim-quic)shashim-quic approved these changes
@idlethreadAmit Kucheria (idlethread)Awaiting requested review from idlethreadidlethread was automatically assigned from qualcomm-linux/qualcomm-kernel-maint
@quicAspratapShivendra Pratap (quicAspratap)Awaiting requested review from quicAspratapquicAspratap was automatically assigned from qualcomm-linux/qualcomm-kernel-maint
@quic-kaushalkKaushal Kumar (quic-kaushalk)Awaiting requested review from quic-kaushalkquic-kaushalk was automatically assigned from qualcomm-linux/qualcomm-kernel-maint
+1 more reviewer
@miaoqing-quicmiaoqing-quicmiaoqing-quic approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

qli-2.0 GA pull-request freeze

Development

Successfully merging this pull request may close these issues.

6 participants

@Komal-Bajaj@qcomlnxci@qlijarvis@sgaud-quic@shashim-quic@miaoqing-quic