FROMLIST: arm64: dts: qcom: shikra: Add Support for usb0 and usb1 on …

[akakum-qualcomm]

FROMLIST: arm64: dts: qcom: shikra: Add Support for usb0 and usb1 on shikra QLI

Reapply the CYPD6129/CYPD6229 UCSI Type-C controller wiring for USB
role switching on shikra-cqm-evk, shikra-cqs-evk, and shikra-iqs-evk
via &i2c3/typec@40, restore the cypd6129 dt-binding doc, and fix
dr_mode from "peripheral" to "otg" on usb_1/usb_2 in shikra-evk.dtsi
so the boards operate correctly in OTG mode.

Also wire up the missing "qcom,shikra-qmp-usb3-phy" of_device_id entry
in phy-qcom-qmp-usbc.c so the existing qcs615_usb3phy_cfg is reachable
for the non-DP Shikra USB3 PHY variant.

Link: https://lore.kernel.org/all/20260820145036.2035641-4-akash.kumar@oss.qualcomm.com/
Signed-off-by: Akash Kumar akash.kumar@oss.qualcomm.com

CRs-Fixed: 4652998
CRs-Fixed:: 4635219

[qlijarvis]

🔨 Build Failure Analysis — PR #1856

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml	No	Pre-existing conflict between integration branches; file not touched by PR

Verdict

The build failure is NOT caused by this PR. The failure occurred during the automerge phase due to a pre-existing merge conflict in a file that this PR does not modify.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1856

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml	No	Pre-existing conflict between base branch tech/all/shikra and integration branches during automerge. File not touched by PR.

Verdict

This is not a compilation failure. The build failed during the automerge step due to a pre-existing merge conflict in a file that is not modified by this PR. The PR itself does not introduce any build errors.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1856 — validate-patch

PR: #1856

Verdict	Issues	Detailed Report
❌	0	Full report

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/all/20260820145036.2035641-4-akash.kumar@oss.qualcomm.com/ (v1 patch 3/3)
2. Lore link matches PR commits: No — PR contains ~2700 lines of ucsi_ccg.c driver refactoring not in lore, plus 2 extra files (shikra-evk.dtsi, phy-qcom-qmp-usbc.c) not in the lore series, and squashes 3 separate patches without clear documentation
3. Upstream patch status: ⏳ Decision Pending — Acked-by from Conor Dooley and Reviewed-by from Abel Vesa present, but no "applied"/"merged" confirmation from maintainer; v2 series posted one day after v1
4. PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1856 - FROMLIST: arm64: dts: qcom: shikra: Add Support for usb0 and usb1 on shikra QLI
Upstream commit: https://lore.kernel.org/all/20260820145036.2035641-4-akash.kumar@oss.qualcomm.com/
Verdict: ❌ FAIL

Commit Message

Check	Status	Note
Subject matches upstream	❌	PR squashes 3-patch series into one commit; subject differs from any single lore patch
Body preserves rationale	⚠️	PR commit message mentions content not in the linked lore patch (shikra-evk.dtsi dr_mode fix, phy-qcom-qmp-usbc.c changes)
Fixes tag present/correct	N/A	No Fixes tag in lore or PR
Authorship preserved	✅	FROMLIST: original author's Signed-off-by present (akash.kumar@oss.qualcomm.com)
Backport note (if applicable)	N/A	Not a backport

Diff

File	Status	Notes
Documentation/devicetree/bindings/usb/cypress,cypd6129.yaml	⚠️	From lore patch 1/3, squashed into PR
drivers/usb/typec/ucsi/ucsi_ccg.c	❌	CRITICAL: Lore patch 2/3 adds 2 lines; PR adds ~2700+ lines of driver refactoring NOT in lore
arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts	⚠️	From lore patch 3/3 but content differs
arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts	⚠️	From lore patch 3/3 but content differs
arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts	⚠️	From lore patch 3/3 but content differs
arch/arm64/boot/dts/qcom/shikra-evk.dtsi	❌	NOT in any lore patch - adds dr_mode changes not posted upstream
drivers/phy/qualcomm/phy-qcom-qmp-usbc.c	❌	NOT in any lore patch - adds qcom,shikra-qmp-usb3-phy compatible not posted upstream

Issues

1. Massive undocumented driver refactoring: The PR adds ~2700 lines of new code to drivers/usb/typec/ucsi/ucsi_ccg.c including new HPIv2 core addresses, flash commands, response codes, and extensive new functionality. The linked lore patch 2/3 only adds 2 compatible string entries to the of_device_id table. This is a completely different change.

2. Extra files not in lore series: The PR modifies arch/arm64/boot/dts/qcom/shikra-evk.dtsi (changing dr_mode from "peripheral" to "otg") and drivers/phy/qualcomm/phy-qcom-qmp-usbc.c (adding "qcom,shikra-qmp-usb3-phy" compatible). Neither file is touched by any patch in the linked 3-patch lore series.

3. Series squashing without documentation: The PR squashes patches 1/3 (dt-binding), 2/3 (driver compatible strings), and 3/3 (DTS wiring) from the lore series into a single commit, but the commit message does not clearly document this is a squash of multiple upstream patches.

4. DTS content differences: The lore v1 patch 3/3 touches 3 DTS files; the lore v2 patch 3/3 touches 4 files (adds shikra-cqm-som.dtsi). The PR touches 3 DTS files but the content differs from both v1 and v2 (e.g., v2 wires usb_2_dwc3_hs to ucsi_ccg_port, but PR wires usb_1_dwc3_hs).

5. Wrong lore revision linked: The PR links to v1 patch 3/3 (message-ID ending in -4-), but a v2 series exists in the same thread with different content. The PR should link to the latest revision.

Verdict

❌ REJECT - Do not merge without major corrections:

1. Remove the massive ucsi_ccg.c refactoring (~2700 lines) that is not in the lore patch. If this refactoring is needed, it must be posted upstream separately and linked with its own lore URL.

2. Split or document the extra changes: The shikra-evk.dtsi dr_mode fix and phy-qcom-qmp-usbc.c compatible addition are not in the lore series. Either:

   • Remove them and submit separately with their own lore links, OR
   • Post them upstream first and update the PR to link to those postings

3. Fix the series squashing: If squashing a multi-patch series is intentional, the commit message must clearly state "This commit combines patches 1/3, 2/3, and 3/3 from the upstream series" and explain why squashing is appropriate for this tree.

4. Update to v2: The PR links to v1 of the series, but v2 exists with different content. Verify which revision is correct and update the Link: tag accordingly.

5. Verify DTS content: The DTS changes in the PR differ from both v1 and v2 of the lore series. Confirm the correct endpoint wiring (usb_1_dwc3_hs vs usb_2_dwc3_hs) and ensure it matches the intended lore revision.

Final Summary

1. Lore link present: Yes — https://lore.kernel.org/all/20260820145036.2035641-4-akash.kumar@oss.qualcomm.com/ (v1 patch 3/3)
2. Lore link matches PR commits: No — PR contains ~2700 lines of ucsi_ccg.c driver refactoring not in lore, plus 2 extra files (shikra-evk.dtsi, phy-qcom-qmp-usbc.c) not in the lore series, and squashes 3 separate patches without clear documentation
3. Upstream patch status: ⏳ Decision Pending — Acked-by from Conor Dooley and Reviewed-by from Abel Vesa present, but no "applied"/"merged" confirmation from maintainer; v2 series posted one day after v1
4. PR present in qcom-next/topics: Partial — integration_presence_report.md shows "partial - subject or partial tree evidence found, but full change was not verified" (1/1 commit partial)

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: d49c33864d06e9672dce57738be8851384578fcf
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 Support for usb0 and	partial - subject or partial tree evidence found, but full change was not verified	missing - no subject, patch-id, or full tree-content match found	partial

Final Status

overall_status: PARTIAL
present_commits: 0/1
partial_commits: 1/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

[qlijarvis]

PR #1856 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	Automerge conflict - checker did not run
dt-binding-check	❌	Automerge conflict - checker did not run
dtb-check	❌	Automerge conflict - checker did not run
sparse-check	❌	Automerge conflict - checker did not run
check-uapi-headers	❌	Automerge conflict - checker did not run
check-patch-compliance	❌	Automerge conflict - checker did not run
tag-check	N/A	Cannot determine - automerge failed

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1856 - FROMLIST: arm64: dts: qcom: shikra: Add Support for usb0 and usb1 on shikra QLI
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/35294154774

Checker	Result	Summary
checkpatch	❌	Automerge conflict - checker did not run
dt-binding-check	❌	Automerge conflict - checker did not run
dtb-check	❌	Automerge conflict - checker did not run
sparse-check	❌	Automerge conflict - checker did not run
check-uapi-headers	❌	Automerge conflict - checker did not run
check-patch-compliance	❌	Automerge conflict - checker did not run
tag-check	N/A	Cannot determine - automerge failed

---

❌ All Checkers — Automerge Conflict

Root cause: The PR branch cannot be merged with the base branch due to a merge conflict in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml.

Failure details:

Normal merge conflict for 'Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml':
  {local}: modified file
  {remote}: modified file
automerge returned non-zero; check logs for conflicts
##[error]Process completed with exit code 1.

Analysis:

All six kernel checkers (checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, check-patch-compliance) failed at the automerge stage before any actual checking could occur. The CI workflow attempts to merge the PR branch with the target base branch to create an integrated tree for testing, but this merge failed due to a conflict.

Important: The conflict file Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml is not modified by this PR. The PR touches:

• Documentation/devicetree/bindings/usb/cypress,cypd6129.yaml (new file)
• arch/arm64/boot/dts/qcom/shikra-*.dts* (DTS files)
• drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
• drivers/usb/typec/ucsi/ucsi_ccg.c

This indicates the conflict arose from changes in the base branch that occurred after the PR branch was created. The base branch has modifications to qcom,coresight-tnoc.yaml that conflict with the state of that file in the PR's merge-base.

Fix:

The PR author needs to rebase the PR branch onto the latest base branch to resolve the conflict:

# In the PR branch
git fetch origin
git rebase origin/<base-branch>

# If conflicts appear during rebase:
git status  # identify conflicted files
# Manually resolve conflicts in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml
git add Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml
git rebase --continue

# Force-push the rebased branch
git push --force-with-lease

Alternative (if rebase is complex):

# Merge the base branch into the PR branch
git fetch origin
git merge origin/<base-branch>

# Resolve conflicts
git status
# Manually resolve conflicts in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml
git add Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml
git commit

# Push the merge commit
git push

Note: Since the conflicting file is not touched by this PR, the resolution should be straightforward — accept the base branch's version of qcom,coresight-tnoc.yaml (the "remote" side in the conflict).

---

Verdict

Cannot assess patch quality — all checkers blocked by automerge conflict.

The PR must be rebased or merged with the latest base branch to resolve the conflict in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml before any checker validation can occur. Once the conflict is resolved and CI is re-triggered, the checkers will run and provide feedback on:

• Patch formatting (checkpatch)
• DT binding schema validation (dt-binding-check) for the new cypress,cypd6129.yaml
• DTB validation (dtb-check) for the shikra DTS changes
• Sparse static analysis (sparse-check) for the C driver changes
• UAPI/ABI compliance (check-uapi-headers)
• Upstream link and author validation (check-patch-compliance)

Action required: Rebase the PR branch onto the latest base branch and force-push to re-trigger CI.

[qlijarvis]

🔨 Build Failure Analysis — PR #1856

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml	No	Pre-existing merge conflict in the base branch tech/all/shikra unrelated to PR changes

Verdict

The build failure is not caused by this PR. The failure occurred during the automerge step due to a pre-existing merge conflict in a file that is not modified by this PR.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1856

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml	No	Pre-existing conflict in unrelated file during integration of multiple topic branches into tech/all/shikra

Verdict

This is NOT a build failure caused by PR #1856. The failure occurred during the automerge step when integrating multiple topic branches, and the conflict is in a file (qcom,coresight-tnoc.yaml) that is completely unrelated to this PR's changes (USB Type-C support for Shikra).

📎 Detailed analysis: Full report

[qlijarvis]

PR #1856 — validate-patch

PR: #1856

Verdict	Issues	Detailed Report
❌	0	Full report

Final Summary

1. Lore link present: Yes - all 4 commits have lore.kernel.org links
2. Lore link matches PR commits: Partial - Commit 1/4 links to review message instead of original patch; commit 3/4 has authorship mismatch; commits 2/4 and 4/4 appear correct
3. Upstream patch status: Mixed - Commit 3/4 is ACKed (Applied); commits 1/4, 2/4, 4/4 are Decision Pending (under review, Acked-by present for 1/4 but no merge confirmation)
4. PR present in qcom-next/topics: Fail - 2/4 commit(s) are missing from both qcom-next and topics

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1856 - Add USB Type-C support for Shikra
Upstream commits: Multiple lore.kernel.org links (see per-commit analysis)
Verdict: ❌ FAIL

Summary by Commit

Commit 1/4: FROMLIST: dt-bindings: usb: Add Cypress cypd6129/cypd6229

Check	Status	Note
Subject matches upstream	✅	Subject preserved correctly
Body preserves rationale	✅	Key rationale preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream
Authorship preserved	✅	FROMLIST: lore author's SOB present
Lore link correct	⚠️	Links to review message 20260820-strength-stylus-bf618dae41c7@spud, not original patch 20260820145036.2035641-2
Content match	⚠️	PR has 107 lines, lore has 99 lines - minor differences in example section

Upstream status: ⏳ Decision Pending - Acked-by: Conor Dooley present, but no merge confirmation yet

---

Commit 2/4: FROMLIST: usb: typec: ucsi: ccg: Add support for cypd6129/cypd6229

Check	Status	Note
Subject matches upstream	✅	Subject preserved correctly
Body preserves rationale	✅	Key rationale preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream
Authorship preserved	✅	FROMLIST: lore author's SOB present
Lore link correct	✅	Correct message-ID
Content match	✅	Diff appears faithful to lore

Upstream status: ⏳ Decision Pending - no merge signals found in thread

---

Commit 3/4: FROMLIST: phy: qcom: qmp-usbc: Add qmp configuration for Shikra

Check	Status	Note
Subject matches upstream	✅	Subject preserved correctly
Body preserves rationale	✅	Key rationale preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream
Authorship preserved	❌	CRITICAL: PR has From: Akash Kumar <akakum@qti.qualcomm.com> but lore author is Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>. Only Krishna's SOB present, not Akash's.
Lore link correct	✅	Correct message-ID
Content match	✅	Diff appears faithful to lore

Upstream status: ✅ ACKed - "Applied, thanks!" from maintainer; Reviewed-by: Dmitry Baryshkov present

---

Commit 4/4: FROMLIST: arm64: dts: qcom: shikra: Wire up usb-role-switch

Check	Status	Note
Subject matches upstream	✅	Subject preserved correctly
Body preserves rationale	✅	Key rationale preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream
Authorship preserved	✅	FROMLIST: lore author's SOB present
Lore link correct	✅	Correct message-ID
Content match	✅	Diff appears faithful to lore

Upstream status: ⏳ Decision Pending - no merge signals found in thread

---

Issues

1. ❌ CRITICAL - Commit 3/4 authorship violation: The PR commit has From: Akash Kumar <akakum@qti.qualcomm.com> but the upstream lore patch author is Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>. For FROMLIST commits, the original author must be preserved in the From: field. The PR only has Krishna's Signed-off-by:, not Akash's, indicating this was cherry-picked without preserving authorship.

   Fix required: git commit --amend --author="Krishna Kurapati <krishna.kurapati@oss.qualcomm.com>" on commit 3/4, then add Akash's SOB as the submitter.

2. ⚠️ WARNING - Commit 1/4 lore link mismatch: The Link points to a review/reply message (20260820-strength-stylus-bf618dae41c7@spud) rather than the original patch message-ID (20260820145036.2035641-2-akash.kumar@oss.qualcomm.com). While the content is from the same series, the link should point to the actual patch.

   Fix recommended: Update Link to https://lore.kernel.org/all/20260820145036.2035641-2-akash.kumar@oss.qualcomm.com/

3. ⚠️ WARNING - Commit 1/4 content differences: The PR version has 107 lines while the lore patch has 99 lines. The differences appear to be in the example section (additional properties or formatting). This may indicate the PR is based on a later revision (v7 references found in thread) or has local modifications.

   Recommendation: Verify whether the PR should reference a later patch revision, or document the intentional differences.

Verdict

❌ FAIL - Do not merge without fixing the authorship violation in commit 3/4. The original patch author (Krishna Kurapati) must be preserved in the From: field per kernel contribution guidelines and FROMLIST prefix requirements.

Final Summary

1. Lore link present: Yes - all 4 commits have lore.kernel.org links
2. Lore link matches PR commits: Partial - Commit 1/4 links to review message instead of original patch; commit 3/4 has authorship mismatch; commits 2/4 and 4/4 appear correct
3. Upstream patch status: Mixed - Commit 3/4 is ACKed (Applied); commits 1/4, 2/4, 4/4 are Decision Pending (under review, Acked-by present for 1/4 but no merge confirmation)
4. PR present in qcom-next/topics: Fail - per integration_presence_report.md: 2/4 commits missing from both qcom-next and topics; 1/4 present; 1/4 partial

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: d49c33864d06e9672dce57738be8851384578fcf
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit	Subject	qcom-next	topics	Final
1/4	[PATCH 1/4] FROMLIST: dt-bindings: usb: Add Cypress cypd6129/cypd6229	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
2/4	[PATCH 2/4] FROMLIST: usb: typec: ucsi: ccg: Add support for	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
3/4	[PATCH 3/4] FROMLIST: phy: qcom: qmp-usbc: Add qmp configuration for	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present
4/4	[PATCH 4/4] FROMLIST: arm64: dts: qcom: shikra: Wire up	partial - subject or partial tree evidence found, but full change was not verified	partial - subject or partial tree evidence found, but full change was not verified	partial

Final Status

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

[qlijarvis]

PR #1856 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Not executed - merge conflict
dt-binding-check	⏭️	Not executed - merge conflict
dtb-check	⏭️	Not executed - merge conflict
sparse-check	⏭️	Not executed - merge conflict
check-uapi-headers	⏭️	Not executed - merge conflict
check-patch-compliance	⏭️	Not executed - merge conflict
tag-check	✅	All 4 commits have valid FROMLIST: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1856 - Add Cypress cypd6129/cypd6229 Type-C controller support for Shikra
Target branch: tech/all/shikra
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/35317103031

Checker	Result	Summary
checkpatch	⏭️	Not executed - merge conflict
dt-binding-check	⏭️	Not executed - merge conflict
dtb-check	⏭️	Not executed - merge conflict
sparse-check	⏭️	Not executed - merge conflict
check-uapi-headers	⏭️	Not executed - merge conflict
check-patch-compliance	⏭️	Not executed - merge conflict
tag-check	✅	All 4 commits have valid FROMLIST: prefix

---

❌ CI Infrastructure Failure — Merge Conflicts

Root cause: The CI run failed during the automerge step when attempting to merge the PR branch into the integrated baseline. The automerge process encountered 150+ merge conflicts across DT bindings, device trees, drivers, and sound subsystems.

Failure details:

The automerge step attempts to integrate all topic branches from the tech/all/shikra configuration before applying the PR commits. This integration failed with conflicts in:

• DT bindings (17 files): qcom,coresight-tnoc.yaml, qcom.yaml, qcom,glymur-evacc.yaml, qcom,shikra-audiocorecc.yaml, and others
• Device trees (50+ files): Shikra platform files (shikra.dtsi, shikra-*-evk.dts, shikra-*-som.dtsi), plus conflicts in glymur, kaanapali, hamoa, lemans, and other platforms
• Drivers (80+ files): Clock controllers (gcc-shikra.c, audiocorecc-shikra.c), PHY drivers, sound codecs, DRM/MSM, networking, thermal, and more
• Sound subsystem (15+ files): ASoC codecs, QAIF drivers, AudioReach topology

Key conflict examples:

CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/shikra.dtsi
CONFLICT (add/add): Merge conflict in drivers/clk/qcom/gcc-shikra.c
CONFLICT (content): Merge conflict in sound/soc/qcom/qdsp6/topology.c
CONFLICT (content): Merge conflict in sound/soc/qcom/sc8280xp.c
CONFLICT (modify/delete): arch/arm64/boot/dts/qcom/lemans-auto.dtsi deleted in topic/tech/all/shikra and modified in HEAD

Why this happened:

The tech/all/shikra branch configuration includes multiple topic branches that have overlapping changes with the PR's target files. When the CI attempts to merge all topics together (automerge), it encounters conflicts that cannot be automatically resolved. This is a topic branch integration issue, not a defect in the PR patches themselves.

None of the actual checker tools (checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, check-patch-compliance) were able to run because the merge failed before the checker stage.

---

✅ tag-check — PASS

Analysis: The PR targets tech/all/shikra, which is not qcom-next or qcom-next-staging. Therefore, every commit must have a valid subject prefix.

Commits in PR:

1. FROMLIST: dt-bindings: usb: Add Cypress cypd6129/cypd6229 Type-C controller
2. FROMLIST: usb: typec: ucsi: ccg: Add support for ...
3. FROMLIST: phy: qcom: qmp-usbc: Add qmp configuration for ...
4. FROMLIST: arm64: dts: qcom: shikra: Wire up ...

All 4 commits correctly start with the FROMLIST: prefix, indicating they have been posted to the upstream mailing list.

Verdict: ✅ PASS

---

Recommendation

The PR cannot be merged until the merge conflicts are resolved.

This is not a patch quality issue — the patches themselves appear well-formed with proper prefixes and upstream links. The failure is due to topic branch integration conflicts in the tech/all/shikra configuration.

Next steps:

1. Rebase the PR on top of the current integrated tech/all/shikra baseline (after automerge completes successfully)
2. Resolve conflicts locally — the conflicts span 150+ files across DT bindings, device trees, drivers, and sound subsystems
3. Re-trigger CI after rebasing to verify:
   • checkpatch (coding style)
   • dt-binding-check (YAML schema validation)
   • dtb-check (compiled DTB validation)
   • sparse-check (static analysis)
   • check-uapi-headers (ABI compatibility)
   • check-patch-compliance (upstream link & author verification)

Alternative approach:

If the conflicts are too extensive, consider:

• Splitting the PR into smaller, more targeted changes
• Coordinating with maintainers of conflicting topic branches
• Targeting a different integration branch with fewer conflicts

No patch changes are required — the commits have proper FROMLIST: prefixes and appear to follow kernel coding conventions. The issue is purely integration-related.

[qlijarvis]

🔨 Build Failure Analysis — PR #1856

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml	No	Pre-existing merge conflict between baseline branch (qcom-next) and topic branch (tech/all/shikra). The conflicting file is not modified by this PR.

Verdict

This build failure is NOT caused by this PR. The failure occurred during the automerge step when integrating the topic branch with the baseline, due to a pre-existing conflict in a file unrelated to the PR changes.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1856

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml	No	Pre-existing conflict in integration branch; file not modified by PR

Verdict

This is NOT a PR-introduced failure. The build failed during the automerge step due to a pre-existing merge conflict in the integration branch with a file (qcom,coresight-tnoc.yaml) that is not touched by this PR.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1856 — validate-patch

PR: #1856

Verdict	Issues	Detailed Report
❌	1	Full report

Final Summary

1. Lore link present: Yes — all 4 commits have lore.kernel.org links
2. Lore link matches PR commits: No — Commit 1/4 links to wrong message-ID (review comment instead of patch); Commit 3/4 contains only 6% of the upstream patch content (3 lines vs 53 lines)
3. Upstream patch status: ⏳ Decision Pending — All patches have Reviewed-by/Acked-by tags from maintainers (Conor Dooley, Abel Vesa, Dmitry Baryshkov) but no merge confirmation yet
4. PR present in qcom-next/topics: Fail - 2/4 commit(s) are missing from both qcom-next and topics

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1856 - Add USB Type-C support for Shikra platforms
Verdict: ❌ FAIL

---

Commit 1/4: FROMLIST: dt-bindings: usb: Add Cypress cypd6129/cypd6229 Type-C controller

Upstream commit: https://lore.kernel.org/all/20260820-strength-stylus-bf618dae41c7@spud/
Verdict: ⚠️ PARTIAL

Commit Message

Check	Status	Note
Subject matches upstream	✅	Identical to lore v2 patch
Body preserves rationale	✅	Key description preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream
Authorship preserved	✅	Original author akash.kumar@oss.qualcomm.com present in Signed-off-by (FROMLIST allows different From:)
Backport note	N/A	Not a backport

Diff

File	Status	Notes
Documentation/devicetree/bindings/usb/cypress,cypd6129.yaml	✅	Matches lore v2 patch exactly (107 lines added)

Issues

• Incorrect lore link: PR links to 20260820-strength-stylus-bf618dae41c7@spud (Conor Dooley's review comment on v1), but the actual patch is 20260821-shikra-usb-dt-v7-apply-v2-1-030647f06285@oss.qualcomm.com (v2 of the series). The diff content matches v2, so this is just a link metadata issue.

Upstream Status

⏳ Decision Pending — Acked-by: Conor Dooley; Reviewed-by: Abel Vesa; no merge confirmation yet

Integration Presence

⚠️ Not in qcom-next/topics — missing from both qcom-next and topics branches

---

Commit 2/4: FROMLIST: usb: typec: ucsi: ccg: Add support for cypd6129/cypd6229

Upstream commit: https://lore.kernel.org/all/20260820145036.2035641-3-akash.kumar@oss.qualcomm.com/
Verdict: ✅ PASS

Commit Message

Check	Status	Note
Subject matches upstream	✅	Identical
Body preserves rationale	✅	Key description preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream
Authorship preserved	✅	Original author present in Signed-off-by
Backport note	N/A	Not a backport

Diff

File	Status	Notes
drivers/usb/typec/ucsi/ucsi_ccg.c	✅	Matches lore patch exactly (2 lines added)

Upstream Status

⏳ Decision Pending — Acked-by: Conor Dooley; Reviewed-by: Abel Vesa; no merge confirmation yet

Integration Presence

⚠️ Not in qcom-next/topics — missing from both qcom-next and topics branches

---

Commit 3/4: FROMLIST: phy: qcom: qmp-usbc: Add qmp configuration for Shikra

Upstream commit: https://lore.kernel.org/all/20260712-usb-shikra-phy-v6-v6-4-1b3e51bf1541@oss.qualcomm.com/
Verdict: ❌ FAIL

Commit Message

Check	Status	Note
Subject matches upstream	✅	Identical
Body preserves rationale	✅	Key description preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream
Authorship preserved	✅	Original author Krishna Kurapati present in Signed-off-by
Backport note	N/A	Not a backport

Diff

File	Status	Notes
drivers/phy/qualcomm/phy-qcom-qmp-usbc.c	❌	MAJOR MISMATCH: PR adds only 3 lines; lore patch adds 53 lines including init sequences, reset handling, and platform data

Issues

• Incomplete backport: The lore patch [PATCH v6 4/4] contains extensive changes:

  • Adds qcs615_usb3_phy_cfg structure with init sequences
  • Adds support for 3 resets (renames usb3dpphy_reset_l to qcs615_usb3dpphy_reset_l, adds shikra_usb3dpphy_reset_l)
  • Adds shikra_usb3phy_cfg platform data
  • Adds qcom,shikra-qmp-usb3-phy compatible entry

  The PR commit contains only the last 3 lines (the compatible entry), omitting all the critical init sequence and reset handling code. This is not a faithful representation of the upstream patch.

Upstream Status

⏳ Decision Pending — Reviewed-by: Dmitry Baryshkov; no merge confirmation yet

Integration Presence

✅ Present in qcom-next — all checked added lines are present (but note: qcom-next likely has the full patch, not this truncated version)

---

Commit 4/4: FROMLIST: arm64: dts: qcom: shikra: Wire up usb-role-switch for USB Type-C ports

Upstream commit: https://lore.kernel.org/all/20260820145036.2035641-4-akash.kumar@oss.qualcomm.com/
Verdict: ⚠️ PARTIAL

Commit Message

Check	Status	Note
Subject matches upstream	✅	Identical
Body preserves rationale	✅	Key description preserved
Fixes tag present/correct	N/A	No Fixes tag in upstream
Authorship preserved	✅	Original author present in Signed-off-by
Backport note	N/A	Not a backport

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts	⚠️	Line count differs: PR adds 58 lines, lore adds 64 lines
arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts	⚠️	Line count differs: PR adds 60 lines, lore adds 64 lines
arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts	⚠️	Line count differs: PR adds 95 lines, lore adds 108 lines

Issues

• Context differences: The PR patch shows different baseline line numbers and context than the lore patch, suggesting the PR was applied to a tree with different prior changes. The lore patch shows @@ -42,6 +42,43 @@ while PR shows @@ -194,6 +194,43 @@. This is expected for patches applied to different tree states, but the actual content additions should be verified to match.
• Missing wakeup-source property: The PR commit for shikra-cqm-evk.dts includes wakeup-source; property, but the lore v1 patch does not show this property in the initial context. This may be a v2 change or a legitimate adaptation.

Upstream Status

⏳ Decision Pending — Acked-by: Conor Dooley; Reviewed-by: Abel Vesa; no merge confirmation yet

Integration Presence

⚠️ Partial in qcom-next/topics — subject or partial tree evidence found, but full change was not verified

---

Overall Issues

1. Commit 3/4 is critically incomplete: Only 3 lines of a 53-line patch were included. The missing code includes essential init sequences and reset handling. This commit should either:

   • Include the full upstream patch, OR
   • Be split into separate commits with proper attribution if the init sequences are already present elsewhere

2. Incorrect lore link in commit 1/4: Links to a review comment instead of the actual patch message-ID. Should be updated to 20260821-shikra-usb-dt-v7-apply-v2-1-030647f06285@oss.qualcomm.com

3. Integration status: 2/4 commits are missing from qcom-next/topics, 1/4 is partial, only 1/4 is fully present

---

Verdict

❌ FAIL — Do not merge without correction.

Required actions:

1. Commit 3/4 must be corrected: Either include the full 53-line upstream patch, or explain why only 3 lines are needed (e.g., if the rest is already present in the tree via another commit)
2. Commit 1/4 lore link: Update to point to the actual v2 patch message-ID
3. Verify commit 4/4 content: Confirm the DTS changes match the intended upstream version (v1 or v2)

---

Final Summary

1. Lore link present: Yes — all 4 commits have lore.kernel.org links
2. Lore link matches PR commits: No — Commit 1/4 links to wrong message-ID (review comment instead of patch); Commit 3/4 contains only 6% of the upstream patch content (3 lines vs 53 lines)
3. Upstream patch status: ⏳ Decision Pending — All patches have Reviewed-by/Acked-by tags from maintainers (Conor Dooley, Abel Vesa, Dmitry Baryshkov) but no merge confirmation yet
4. PR present in qcom-next/topics: Fail — 2/4 commits missing, 1/4 partial, 1/4 present (per integration_presence_report.md)

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: d49c33864d06e9672dce57738be8851384578fcf
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit	Subject	qcom-next	topics	Final
1/4	[PATCH 1/4] FROMLIST: dt-bindings: usb: Add Cypress cypd6129/cypd6229	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
2/4	[PATCH 2/4] FROMLIST: usb: typec: ucsi: ccg: Add support for	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
3/4	[PATCH 3/4] FROMLIST: phy: qcom: qmp-usbc: Add qmp configuration for	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present
4/4	[PATCH 4/4] FROMLIST: arm64: dts: qcom: shikra: Wire up	partial - subject or partial tree evidence found, but full change was not verified	partial - subject or partial tree evidence found, but full change was not verified	partial

Final Status

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

[qlijarvis]

PR #1856 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Skipped - merge conflict prevented execution
dt-binding-check	⏭️	Skipped - merge conflict prevented execution
dtb-check	⏭️	Skipped - merge conflict prevented execution
sparse-check	⏭️	Skipped - merge conflict prevented execution
check-uapi-headers	⏭️	Skipped - merge conflict prevented execution
check-patch-compliance	⏭️	Skipped - merge conflict prevented execution
tag-check	✅	All commits have valid FROMLIST: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1856 - Add Cypress cypd6129/cypd6229 Type-C controller support
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/35320102749

Checker	Result	Summary
checkpatch	⏭️	Skipped - merge conflict prevented execution
dt-binding-check	⏭️	Skipped - merge conflict prevented execution
dtb-check	⏭️	Skipped - merge conflict prevented execution
sparse-check	⏭️	Skipped - merge conflict prevented execution
check-uapi-headers	⏭️	Skipped - merge conflict prevented execution
check-patch-compliance	⏭️	Skipped - merge conflict prevented execution
tag-check	✅	All commits have valid FROMLIST: prefix

---

⚠️ CI Infrastructure Issue: Merge Conflicts

Root cause: The CI workflow failed during the merge phase before any checkers could execute.

Failure details:
All six checker jobs encountered the same merge conflict when attempting to merge the PR branch with the base branch:

Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge
CONFLICT (content): Merge conflict in sound/soc/qcom/qdsp6/q6prm-clocks.c
CONFLICT (content): Merge conflict in sound/soc/qcom/qdsp6/q6prm.h
CONFLICT (content): Merge conflict in sound/soc/qcom/qdsp6/topology.c
CONFLICT (content): Merge conflict in sound/soc/qcom/sc8280xp.c

Analysis:

This is not a patch quality issue. The PR commits themselves appear well-formed:

• ✅ All 4 commits have proper FROMLIST: subject prefix
• ✅ Commits include proper Link: trailers to lore.kernel.org
• ✅ Commits have proper Signed-off-by: trailers

The merge conflicts occurred in files not touched by this PR (sound/soc/qcom/qdsp6/*.c, sound/soc/qcom/sc8280xp.c), indicating that the base branch has diverged significantly since the PR was created or last rebased.

Fix: Rebase the PR branch on the current base branch tip to resolve conflicts:

# In the PR branch
git fetch origin
git rebase origin/<base-branch>

# Resolve conflicts in:
#   sound/soc/qcom/qdsp6/q6prm-clocks.c
#   sound/soc/qcom/qdsp6/q6prm.h
#   sound/soc/qcom/qdsp6/topology.c
#   sound/soc/qcom/sc8280xp.c

git add <resolved-files>
git rebase --continue
git push --force-with-lease

Reproduce locally:

git fetch origin pull/1856/head:pr-1856
git checkout pr-1856
git merge origin/<base-branch>  # Will show the same conflicts

---

✅ tag-check (Manual Verification)

Status: PASS

All commit subjects in the PR start with the required FROMLIST: prefix:

1. FROMLIST: dt-bindings: usb: Add Cypress cypd6129/cypd6229
2. FROMLIST: usb: typec: ucsi: ccg: Add support for
3. FROMLIST: phy: qcom: qmp-usbc: Add qmp configuration for
4. FROMLIST: arm64: dts: qcom: shikra: Wire up

This satisfies the subject-prefix requirement for all branches except qcom-next and qcom-next-staging.

---

Verdict

Cannot assess patch quality — CI checkers did not execute due to merge conflicts in unrelated files.

Required action: Rebase the PR on the current base branch tip to resolve merge conflicts in sound/soc/qcom/ files, then re-trigger CI.

Patch quality indicators (from manual inspection):

• ✅ Proper commit message formatting
• ✅ Valid subject prefixes (FROMLIST:)
• ✅ Upstream links present
• ✅ Signed-off-by trailers present

Once rebased, the checkers should execute successfully and provide detailed feedback on:

• Code style (checkpatch)
• DT binding schema validation (dt-binding-check)
• Device tree compilation (dtb-check)
• Static analysis (sparse-check)
• UAPI/ABI compatibility (check-uapi-headers)
• Upstream link validation (check-patch-compliance)

[Komal Bajaj (Komal-Bajaj)]

Signed-off-by: Akash Kumar akash.kumar@oss.qualcomm.com
Signed-off-by: Akash Kumar akakum@qti.qualcomm.com

why two sign offs?

FROMLIST: dt-bindings: usb: Add Cypress cypd6129/cypd6229 Type-C controller
Add the device-tree binding documentation for the Cypress cypd6129
and cypd6229 dual Type-C PD controllers. These are used on Shikra
CQM/CQS/IQS platforms to handle usb-role-switch for the USB Type-C
ports over an I2C interface, similarly to the existing cypd4226
binding.
cypd6229 is a variant of cypd6129 and is described with a
"cypress,cypd6129" fallback compatible string.
Link: https://lore.kernel.org/all/20260820-strength-stylus-bf618dae41c7@spud/

Link is not pointing to this commit

FROMLIST: phy: qcom: qmp-usbc: Add qmp configuration for Shikra
Add init sequence and phy configuration for the Super Speed port on Shikra
SoC. Also since Shikra uses 3 resets, add support for the third reset and
configure Shikra platform data to use 3 resets.
Link: https://lore.kernel.org/all/20260712-usb-shikra-phy-v6-v6-4-1b3e51bf1541@oss.qualcomm.com/
Signed-off-by: Krishna Kurapati krishna.kurapati@oss.qualcomm.com
Reviewed-by: Dmitry Baryshkov dmitry.baryshkov@oss.qualcomm.com
Signed-off-by: Akash Kumar akakum@qti.qualcomm.com

Again, this is not the correct commit link

[akakum-qualcomm]

Signed-off-by: Akash Kumar akash.kumar@oss.qualcomm.com
Signed-off-by: Akash Kumar akakum@qti.qualcomm.com

why two sign offs?
DCO error needs QTI mail signoff, in upstream it is pushed with OSS.

FROMLIST: dt-bindings: usb: Add Cypress cypd6129/cypd6229 Type-C controller
Add the device-tree binding documentation for the Cypress cypd6129
and cypd6229 dual Type-C PD controllers. These are used on Shikra
CQM/CQS/IQS platforms to handle usb-role-switch for the USB Type-C
ports over an I2C interface, similarly to the existing cypd4226
binding.
cypd6229 is a variant of cypd6129 and is described with a
"cypress,cypd6129" fallback compatible string.
Link: https://lore.kernel.org/all/20260820-strength-stylus-bf618dae41c7@spud/

Link is not pointing to this commit
--->
is this correct https://lore.kernel.org/all/20260821-shikra-usb-dt-v7-apply-v2-1-030647f06285@oss.qualcomm.com/ ?

FROMLIST: phy: qcom: qmp-usbc: Add qmp configuration for Shikra
Add init sequence and phy configuration for the Super Speed port on Shikra
SoC. Also since Shikra uses 3 resets, add support for the third reset and
configure Shikra platform data to use 3 resets.
Link: https://lore.kernel.org/all/20260712-usb-shikra-phy-v6-v6-4-1b3e51bf1541@oss.qualcomm.com/
Signed-off-by: Krishna Kurapati krishna.kurapati@oss.qualcomm.com
Reviewed-by: Dmitry Baryshkov dmitry.baryshkov@oss.qualcomm.com
Signed-off-by: Akash Kumar akakum@qti.qualcomm.com

Again, this is not the correct commit link

https://lore.kernel.org/all/230aef5f-43da-4b7a-994c-7a63b631ae8e@oss.qualcomm.com/

updating with this should be fine?

[Komal Bajaj (Komal-Bajaj)]

DCO error needs QTI mail signoff, in upstream it is pushed with OSS.

Not required

is this correct https://lore.kernel.org/all/20260821-shikra-usb-dt-v7-apply-v2-1-030647f06285@oss.qualcomm.com/ ?

yes, this seems correct

https://lore.kernel.org/all/230aef5f-43da-4b7a-994c-7a63b631ae8e@oss.qualcomm.com/

updating with this should be fine?

correct link: 81decc8

[akakum-qualcomm]

DCO error needs QTI mail signoff, in upstream it is pushed with OSS.

Not required

one signoff is for upstream , i am pushing the change with qti mail so it expects qti mail signoff, so qti sign off is added.

is this correct https://lore.kernel.org/all/20260821-shikra-usb-dt-v7-apply-v2-1-030647f06285@oss.qualcomm.com/ ?

yes, this seems correct

https://lore.kernel.org/all/230aef5f-43da-4b7a-994c-7a63b631ae8e@oss.qualcomm.com/
updating with this should be fine?

correct link: 81decc8

fixed.

[qlijarvis]

🔨 Build Failure Analysis — PR #1856

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml	No	Pre-existing merge conflict between baseline (qcom-next) and topic branch (tech/all/shikra) unrelated to PR changes

Verdict

This is NOT a compilation error. The build failed during the automerge step due to a pre-existing merge conflict in a file not touched by this PR.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1856

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml	No	Pre-existing conflict between baseline (qcom-next) and topic branch (tech/all/shikra)
2	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom.yaml	No	Pre-existing conflict between baseline and topic branch
3	Merge conflict during automerge	Documentation/devicetree/bindings/clock/qcom,glymur-evacc.yaml	No	Pre-existing add/add conflict between baseline and topic branch
4	Merge conflict during automerge	Documentation/devicetree/bindings/clock/qcom,qcm2290-dispcc.yaml	No	Pre-existing conflict between baseline and topic branch
5	Merge conflict during automerge	Documentation/devicetree/bindings/clock/qcom,shikra-audiocorecc.yaml	No	Pre-existing add/add conflict between baseline and topic branch
6	Merge conflict during automerge	Documentation/devicetree/bindings/clock/qcom,sm8550-tcsr.yaml	No	Pre-existing conflict between baseline and topic branch
7	Merge conflict during automerge	Documentation/devicetree/bindings/media/qcom,qcm2290-camss.yaml	No	Pre-existing conflict between baseline and topic branch

Verdict

All 7+ merge conflicts are pre-existing issues in the topic branch (tech/all/shikra), not introduced by this PR. The PR modifies only USB-related files (dt-bindings, typec driver, PHY driver, and Shikra DTS files) and does not touch any of the conflicting files. The build never reached the compilation stage.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1856 — validate-patch

PR: #1856

Verdict	Issues	Detailed Report
✅	0	Full report

Final Summary

1. Lore link present: Yes — all 4 commits have valid lore.kernel.org links in Link: trailers
2. Lore link matches PR commits: Yes — all diffs match their lore sources exactly; commit messages preserve original content
3. Upstream patch status: ⏳ Decision Pending (ACKed/Reviewed) — all patches have positive review signals from subsystem maintainers (Conor Dooley for DT, Dmitry Baryshkov/Krzysztof Kozlowski for drivers); awaiting merge into maintainer trees
4. PR present in qcom-next/topics: Yes - all 4 commit(s) are present in qcom-next or topics

Verdict: ✅ — click to expand

🔍 Patch Validation Report

PR: #1856 - "Add usb-role-switch support for USB Type-C ports on Shikra"
Commits: 4 FROMLIST patches
Verdict: ✅ PASS

---

Commit 1/4: dt-bindings: usb: Add Cypress cypd6129/cypd6229 Type-C controller

Upstream: https://lore.kernel.org/all/20260821-shikra-usb-dt-v7-apply-v2-1-030647f06285@oss.qualcomm.com/
Verdict: ✅ PASS

Commit Message

Check	Status	Note
Subject matches upstream	✅	Identical (FROMLIST prefix added)
Body preserves rationale	✅	Full description preserved
Fixes tag present/correct	N/A	No Fixes tag (new binding)
Authorship preserved	✅	FROMLIST: original author Signed-off-by present; submitter in From: (correct)
Backport note	N/A	Not a backport

Diff

File	Status	Notes
Documentation/devicetree/bindings/usb/cypress,cypd6129.yaml	✅	Content matches lore v2 patch exactly (107 lines added)

Upstream Status

⏳ Decision Pending (ACKed, awaiting merge) — Acked-by: Conor Dooley (DT maintainer), Reviewed-by: Abel Vesa; no merge confirmation yet

Integration Presence

✅ Present in topics — exact patch-id match at 7277ee5a2795

---

Commit 2/4: usb: typec: ucsi: ccg: Add support for cypd6129/cypd6229

Upstream: https://lore.kernel.org/all/20260820145036.2035641-3-akash.kumar@oss.qualcomm.com/
Verdict: ✅ PASS

Commit Message

Check	Status	Note
Subject matches upstream	✅	Identical (FROMLIST prefix added)
Body preserves rationale	✅	Full description preserved
Fixes tag present/correct	N/A	No Fixes tag (new device support)
Authorship preserved	✅	FROMLIST: original author Signed-off-by present; submitter in From: (correct)
Backport note	N/A	Not a backport

Diff

File	Status	Notes
drivers/usb/typec/ucsi/ucsi_ccg.c	✅	Content matches lore patch exactly (2 lines added to of_device_id table)

Upstream Status

⏳ Decision Pending (ACKed, awaiting merge) — Acked-by: Conor Dooley, Reviewed-by: Abel Vesa; no merge confirmation yet

Integration Presence

✅ Present in topics — exact patch-id match at 0bc0f637f573

---

Commit 3/4: phy: qcom: qmp-usbc: Add qmp configuration for Shikra

Upstream: https://lore.kernel.org/all/20260504170659.282532-5-krishna.kurapati@oss.qualcomm.com/
Verdict: ✅ PASS

Commit Message

Check	Status	Note
Subject matches upstream	✅	Identical (FROMLIST prefix added)
Body preserves rationale	✅	Full description preserved
Fixes tag present/correct	N/A	No Fixes tag (new platform support)
Authorship preserved	✅	FROMLIST: original author Krishna Kurapati in Signed-off-by; submitter Akash Kumar in From: (correct for FROMLIST); Reviewed-by from Dmitry Baryshkov preserved
Backport note	N/A	Not a backport

Diff

File	Status	Notes
drivers/phy/qualcomm/phy-qcom-qmp-usbc.c	✅	Content matches lore patch exactly (3 lines added to of_device_id table)

Upstream Status

⏳ Decision Pending (Reviewed, awaiting merge) — Reviewed-by: Dmitry Baryshkov (Qualcomm maintainer), Reviewed-by: Krzysztof Kozlowski (DT maintainer); no merge confirmation yet

Integration Presence

✅ Present in qcom-next — all added lines verified present

---

Commit 4/4: arm64: dts: qcom: shikra: Wire up usb-role-switch for USB Type-C ports

Upstream: https://lore.kernel.org/all/20260820145036.2035641-4-akash.kumar@oss.qualcomm.com/
Verdict: ✅ PASS

Commit Message

Check	Status	Note
Subject matches upstream	✅	Identical (FROMLIST prefix added)
Body preserves rationale	✅	Full description preserved
Fixes tag present/correct	N/A	No Fixes tag (new feature enablement)
Authorship preserved	✅	FROMLIST: original author Signed-off-by present; submitter in From: (correct)
Backport note	N/A	Not a backport

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts	✅	58 lines added (typec node + connector)
arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts	✅	60 lines added (typec node + connector)
arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts	✅	95 lines added (typec nodes + connectors)

Upstream Status

⏳ Decision Pending (ACKed, awaiting merge) — Acked-by: Conor Dooley (DT maintainer), Reviewed-by: Abel Vesa; no merge confirmation yet

Integration Presence

✅ Present in topics — exact patch-id match at d8cf18ee57fa

---

Overall Assessment

No issues found. All four commits:

• Correctly use FROMLIST: prefix for patches posted to mailing lists but not yet merged upstream
• Preserve original authorship in Signed-off-by trailers (FROMLIST authorship rules followed correctly)
• Match their linked lore.kernel.org sources exactly
• Have received positive review signals (Acked-by/Reviewed-by from subsystem maintainers)
• Are present in qcom-next or kernel-topics integration branches

Verdict

✅ PASS — Merge as-is. All patches are faithful to their lore sources, follow correct FROMLIST authorship conventions, have maintainer approval, and are already integrated into the Qualcomm kernel tree.

---

Final Summary

1. Lore link present: Yes — all 4 commits have valid lore.kernel.org links in Link: trailers
2. Lore link matches PR commits: Yes — all diffs match their lore sources exactly; commit messages preserve original content
3. Upstream patch status: ⏳ Decision Pending (ACKed/Reviewed) — all patches have positive review signals from subsystem maintainers (Conor Dooley for DT, Dmitry Baryshkov/Krzysztof Kozlowski for drivers); awaiting merge into maintainer trees
4. PR present in qcom-next/topics: Yes — all 4 commits present (3 in topics via exact patch-id match, 1 in qcom-next via content match)

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: d49c33864d06e9672dce57738be8851384578fcf
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit	Subject	qcom-next	topics	Final
1/4	[PATCH 1/4] FROMLIST: dt-bindings: usb: Add Cypress cypd6129/cypd6229	missing - no subject, patch-id, or full tree-content match found	present - exact patch-id match at 7277ee5	present
2/4	[PATCH 2/4] FROMLIST: usb: typec: ucsi: ccg: Add support for	missing - no subject, patch-id, or full tree-content match found	present - exact patch-id match at 0bc0f63	present
3/4	[PATCH 3/4] FROMLIST: phy: qcom: qmp-usbc: Add qmp configuration for	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present
4/4	[PATCH 4/4] FROMLIST: arm64: dts: qcom: shikra: Wire up	partial - subject or partial tree evidence found, but full change was not verified	present - exact patch-id match at d8cf18e	present

Final Status

overall_status: PASS
present_commits: 4/4
partial_commits: 0/4
missing_commits: 0/4
topics_checked_for_commits: 3/4
final_summary: PR present in qcom-next/topics: Yes - all 4 commit(s) are present in qcom-next or topics

[qlijarvis]

PR #1856 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Skipped - merge conflict prevented execution
dt-binding-check	⏭️	Skipped - merge conflict prevented execution
dtb-check	⏭️	Skipped - merge conflict prevented execution
sparse-check	⏭️	Skipped - merge conflict prevented execution
check-uapi-headers	⏭️	Skipped - merge conflict prevented execution
check-patch-compliance	⏭️	Skipped - merge conflict prevented execution
tag-check	✅	All commits have valid FROMLIST: prefix
qcom-next-check	N/A	Cannot determine - merge failed

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1856 - Add Cypress cypd6129/cypd6229 Type-C controller support for Shikra
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/35325515132

Checker	Result	Summary
checkpatch	⏭️	Skipped - merge conflict prevented execution
dt-binding-check	⏭️	Skipped - merge conflict prevented execution
dtb-check	⏭️	Skipped - merge conflict prevented execution
sparse-check	⏭️	Skipped - merge conflict prevented execution
check-uapi-headers	⏭️	Skipped - merge conflict prevented execution
check-patch-compliance	⏭️	Skipped - merge conflict prevented execution
tag-check	✅	All commits have valid FROMLIST: prefix
qcom-next-check	N/A	Cannot determine - merge failed

---

⚠️ Baseline Merge Conflict (CI Infrastructure Issue)

Root cause: The CI workflow failed to merge the PR branch with the qcom-next baseline due to a merge conflict in a file not touched by this PR.

Failure details:

Normal merge conflict for 'Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml':
  {local}: modified file
  {remote}: modified file
automerge returned non-zero; check logs for conflicts
##[error]Process completed with exit code 1.

Analysis:

• The merge conflict occurred in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml
• This file is not modified by PR FROMLIST: arm64: dts: qcom: shikra: Add Support for usb0 and usb1 on … #1856
• PR FROMLIST: arm64: dts: qcom: shikra: Add Support for usb0 and usb1 on … #1856 only touches:
  • Documentation/devicetree/bindings/usb/cypress,cypd6129.yaml (new file)
  • drivers/usb/typec/ucsi/ucsi_ccg.c
  • drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
  • arch/arm64/boot/dts/qcom/shikra-*.dts (3 files)
• The conflict is between the PR's base branch and the qcom-next integration baseline
• This is a baseline integration issue, not a defect in the PR itself

Fix:
This requires one of the following actions:

1. Rebase the PR onto the latest qcom-next baseline:

   git fetch origin qcom-next
   git rebase origin/qcom-next
   git push --force-with-lease

2. Wait for the baseline conflict to be resolved — if another PR recently merged changes to qcom,coresight-tnoc.yaml that conflict with the baseline, the maintainers need to resolve the baseline integration first.

3. Re-trigger CI after the baseline is updated — the conflict may already be resolved in the latest qcom-next.

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel-topics.git
cd kernel-topics
git fetch origin pull/1856/head:pr-1856
git checkout pr-1856
git fetch https://github.com/qualcomm-linux/kernel.git qcom-next
git merge FETCH_HEAD
# Conflict will appear in qcom,coresight-tnoc.yaml

---

✅ tag-check — PASS

All 4 commits in the PR have the required FROMLIST: prefix:

1. FROMLIST: dt-bindings: usb: Add Cypress cypd6129/cypd6229 Type-C controller
2. FROMLIST: usb: typec: ucsi: ccg: Add support for cypd6129/cypd6229
3. FROMLIST: phy: qcom: qmp-usbc: Add qmp configuration for Shikra
4. FROMLIST: arm64: dts: qcom: shikra: Wire up usb-role-switch for USB Type-C ports

Each commit includes a Link: tag pointing to the upstream lore.kernel.org submission.

---

Verdict

Cannot assess PR quality — all checker jobs failed at the baseline merge stage before any checks could run.

Recommended action:

1. Rebase PR FROMLIST: arm64: dts: qcom: shikra: Add Support for usb0 and usb1 on … #1856 onto the latest qcom-next baseline to resolve the merge conflict in qcom,coresight-tnoc.yaml
2. Re-trigger the kernel-checker CI workflow
3. Once the merge succeeds, the checkers will run and provide actionable feedback

Note: The merge conflict is not caused by this PR — it is a baseline integration issue between the PR's base branch and qcom-next. The PR commits themselves appear well-formed (all have FROMLIST: prefixes and upstream links).