WORKAROUND: arm64: dts: qcom: Fix vdda-qref and vdda-refgen supplies for PCIe PHYs on qcs8300-ride and monaco-evk

[ziyuezhang-123]

The vdda-qref-supply and vdda-refgen-supply for pcie0_phy and pcie1_phy were incorrectly mapped. vdda-qref should be supplied by vreg_l4a and vdda-refgen should be supplied by vreg_l7a. Fix the supply assignments on both qcs8300-ride and monaco-evk boards.

Workaround will be reverted once the correct regulator mappings are confirmed and upstreamed.

Signed-off-by: Ziyue Zhang ziyue.zhang@oss.qualcomm.com
CRs-Fixed: 4537722

[qlijarvis]

🔨 Build Failure Analysis — PR #1352

PR: #1352
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/27335743054

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict in &pcie0_phy node	arch/arm64/boot/dts/qcom/monaco-evk.dts:623	Yes	PR adds vdda-qref-supply and vdda-refgen-supply properties, but integration branch has conflicting changes in the same device tree node
2	Merge conflict in &pcie1_phy node	arch/arm64/boot/dts/qcom/monaco-evk.dts:639	Yes	PR adds vdda-qref-supply and vdda-refgen-supply properties, but integration branch has conflicting changes in the same device tree node
3	Merge conflict in &pcie0_phy node	arch/arm64/boot/dts/qcom/qcs8300-ride.dts:638	Yes	PR modifies vdda-qref-supply (vreg_l7a→vreg_l4a) and vdda-refgen-supply (refgen→vreg_l7a), but integration branch has conflicting changes
4	Merge conflict in &pcie1_phy node	arch/arm64/boot/dts/qcom/qcs8300-ride.dts:659	Yes	PR modifies vdda-qref-supply (vreg_l7a→vreg_l4a) and vdda-refgen-supply (refgen→vreg_l7a), but integration branch has conflicting changes

Verdict

All 4 merge conflicts are introduced by this PR conflicting with the integration branch topic/tech/all/workaround. No compilation errors occurred because the build never reached the compilation stage.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1352

PR: #1352
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/27335743054

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict in monaco-evk.dts	arch/arm64/boot/dts/qcom/monaco-evk.dts:623-639	Yes	PR modifies &pcie0_phy and &pcie1_phy supply properties that conflict with changes already present in the integration branch (topic/tech/all/workaround)
2	Merge conflict in qcs8300-ride.dts	arch/arm64/boot/dts/qcom/qcs8300-ride.dts:638-659	Yes	PR modifies &pcie0_phy and &pcie1_phy supply properties that conflict with changes already present in the integration branch (topic/tech/all/workaround)

Verdict

Both failures are merge conflicts introduced by this PR conflicting with the integration branch; no compilation errors were encountered.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1352 — validate-patch

PR: #1352

Verdict	Issues	Detailed Report
✅	0	Full report

Final Summary

1. Lore link present: No — WORKAROUND: prefix; temporary vendor fix, no lore link expected or required
2. Lore link matches PR commits: N/A — no lore link to compare against
3. Upstream patch status: N/A — vendor-only workaround, explicitly marked for future revert once upstream solution confirmed
4. PR present in qcom-next: Not checked — WORKAROUND: vendor-only commit

Verdict: ✅ — click to expand

🔍 Patch Validation

PR: #1352 - WORKAROUND: arm64: dts: qcom: Fix vdda-qref and vdda-refgen supplies for PCIe PHYs on qcs8300-ride and monaco-evk
Upstream commit: N/A (vendor workaround)
Verdict: ✅ PASS

Commit Message

Check	Status	Note
Subject matches upstream	N/A	Vendor workaround, not upstream
Body preserves rationale	✅	Clear explanation of incorrect mappings and fix
Fixes tag present/correct	N/A	Workaround without Fixes tag is acceptable
Authorship preserved	✅	Ziyue Zhang ziyue.zhang@oss.qualcomm.com
Backport note (if applicable)	N/A	Forward-fix workaround, not a backport

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/monaco-evk.dts	✅	Adds missing vdda-qref and vdda-refgen supplies
arch/arm64/boot/dts/qcom/qcs8300-ride.dts	✅	Corrects vdda-qref (l7a→l4a) and vdda-refgen (refgen→l7a)

Verdict

Merge as-is — valid vendor workaround with clear intent to revert once upstream solution is confirmed.

Final Summary

1. Lore link present: No — WORKAROUND: prefix; temporary vendor fix, no lore link expected or required
2. Lore link matches PR commits: N/A — no lore link to compare against
3. Upstream patch status: N/A — vendor-only workaround, explicitly marked for future revert once upstream solution confirmed
4. PR present in qcom-next: Not checked — WORKAROUND: vendor-only commit

[qlijarvis]

PR #1352 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	Merge conflict - cannot run
dt-binding-check	❌	Merge conflict - cannot run
dtb-check	❌	Merge conflict - cannot run
sparse-check	❌	Merge conflict - cannot run
check-uapi-headers	❌	Merge conflict - cannot run
check-patch-compliance	❌	Merge conflict - cannot run
tag-check	✅	WORKAROUND: prefix present
qcom-next-check	⏭️	N/A - not FROMLIST/UPSTREAM commit

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1352 - WORKAROUND: arm64: dts: qcom: Fix vdda-qref and vdda-refgen supplies for PCIe PHYs on qcs8300-ride and monaco-evk
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/27335743101

Checker	Result	Summary
checkpatch	❌	Merge conflict - cannot run
dt-binding-check	❌	Merge conflict - cannot run
dtb-check	❌	Merge conflict - cannot run
sparse-check	❌	Merge conflict - cannot run
check-uapi-headers	❌	Merge conflict - cannot run
check-patch-compliance	❌	Merge conflict - cannot run
tag-check	✅	WORKAROUND: prefix present
qcom-next-check	⏭️	N/A - not FROMLIST/UPSTREAM commit

❌ All Checkers (Merge Conflict)

Root cause: PR #1352 has merge conflicts with the integration baseline when merging with topic/tech/all/workaround branch.

Failure details:

2026-06-11T09:17:56.3386969Z Auto-merging arch/arm64/boot/dts/qcom/monaco-evk.dts
2026-06-11T09:17:56.3387639Z CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts
2026-06-11T09:17:56.3388279Z Auto-merging arch/arm64/boot/dts/qcom/qcs8300-ride.dts
2026-06-11T09:17:56.3389055Z CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts
2026-06-11T09:17:56.4018334Z Automatic merge failed; fix conflicts and then commit the result.
2026-06-11T09:17:56.4130929Z Merge failed or conflicts detected. Aborting merge.

Analysis:
The PR modifies PCIe PHY supply properties in both arch/arm64/boot/dts/qcom/monaco-evk.dts and arch/arm64/boot/dts/qcom/qcs8300-ride.dts. These files have conflicting changes in the topic/tech/all/workaround branch that was merged before the PR.

The conflicts occur in the &pcie0_phy and &pcie1_phy nodes where the PR is:

• Adding vdda-qref-supply = <&vreg_l4a>; and vdda-refgen-supply = <&vreg_l7a>; to monaco-evk.dts
• Changing vdda-qref-supply from <&vreg_l7a> to <&vreg_l4a> and vdda-refgen-supply from <&refgen> to <&vreg_l7a> in qcs8300-ride.dts

Fix:

1. Rebase the PR on the latest topic/tech/all/workaround branch to resolve conflicts
2. Manually resolve conflicts by:
   • Checking what changes exist in topic/tech/all/workaround for these PHY nodes
   • Ensuring the correct supply mappings are preserved: vdda-qref-supply = <&vreg_l4a> and vdda-refgen-supply = <&vreg_l7a>
   • Keeping any other changes from the workaround branch that don't conflict with the supply fixes
3. Force-push the rebased branch to trigger a new CI run

Reproduce locally:

# Clone the repo and fetch the PR
git clone https://github.com/qualcomm-linux/kernel-topics.git
cd kernel-topics
git fetch origin pull/1352/head:pr-1352
git checkout pr-1352

# Fetch and merge the workaround branch to see conflicts
git fetch origin topic/tech/all/workaround
git merge origin/topic/tech/all/workaround

# Resolve conflicts in:
# - arch/arm64/boot/dts/qcom/monaco-evk.dts
# - arch/arm64/boot/dts/qcom/qcs8300-ride.dts

Verdict

1 blocker to fix: Merge conflicts must be resolved by rebasing the PR on the latest integration baseline (which includes topic/tech/all/workaround). Once rebased and conflicts are resolved, all checkers should run successfully as this is a simple device tree property change with proper WORKAROUND: prefix.