QCLINUX: arm64: dts: qcom: shikra: Install camx DTBO overlays

[ManibharQCOM]

Add Makefile entries to build and install camera (camx) DTBO overlays for Shikra CQS EVK and IQS EVK board variants.

Each composite DTB bundles the respective base platform DTB with the camx overlay, and registers both the merged .dtb and standalone .dtbo.

CRs-Fixed: 4663586

[qswat-orbit-external]

Dev Completion validation failed

CR: 4663586
Change Task: kernel.qli.0.0
Error: GenAI Assisted field must be set before moving change tasks to Development Complete. Please provide GenAI information.

The change task for this CR could not be moved to Dev Complete because of the error above. Please resolve the issue in Orbit and re-run the failed Orbit check.

[qswat-orbit-external]

Dev Completion validation failed

CR: 4663586
Change Task: kernel.qli.0.0
Error: GenAI Assisted field must be set before moving change tasks to Development Complete. Please provide GenAI information.

The change task for this CR could not be moved to Dev Complete because of the error above. Please resolve the issue in Orbit and re-run the failed Orbit check.

[qswat-orbit-external]

Dev Completion validation failed

CR: 4663586
Change Task: kernel.qli.0.0
Error: GenAI Assisted field must be set before moving change tasks to Development Complete. Please provide GenAI information.

The change task for this CR could not be moved to Dev Complete because of the error above. Please resolve the issue in Orbit and re-run the failed Orbit check.

[qswat-orbit-external]

Dev Completion validation failed

CR: 4663586
Change Task: kernel.qli.0.0
Error: GenAI Assisted field must be set before moving change tasks to Development Complete. Please provide GenAI information.

The change task for this CR could not be moved to Dev Complete because of the error above. Please resolve the issue in Orbit and re-run the failed Orbit check.

[qlijarvis]

🔨 Build Failure Analysis — PR #1811

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Automerge conflict	Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml	No	Pre-existing merge conflict with integration branch; file not touched by PR
2	Wrong DTBO filename in composite rule	arch/arm64/boot/dts/qcom/Makefile:348	Yes	shikra-cqm-evk-camx-dtbs references wrong overlay file shikra-cqs-evk-camx.dtbo instead of shikra-cqm-evk-camx.dtbo

Verdict

1 of 2 errors is introduced by this PR; 1 is a pre-existing integration conflict.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1811

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

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

Verdict

This is NOT a compilation error. The build failed during the automerge (integration) step with a merge conflict in a file that is not touched by this PR. The PR itself does not introduce any build errors.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1811

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml	No	Pre-existing merge conflict in the base integration branch. The PR does not touch this file.

Verdict

0 of 1 errors are introduced by this PR; 1 is pre-existing in the base branch.

The build failure is not caused by this PR. The PR only adds Shikra camera DTBO overlays and does not modify the conflicting file. The merge conflict exists in the base integration branch and must be resolved independently.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1811

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml	No	Pre-existing merge conflict in integration branch; unrelated to PR changes

Verdict

This is a pre-existing integration issue. The PR does not introduce any compilation errors or build failures.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1811 — validate-patch

PR: #1811

Verdict	Issues	Detailed Report
✅	0	Full report

Final Summary

1. Lore link present: No — QCLINUX: prefix; 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 change, not posted upstream
4. PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics

Verdict: ✅ — click to expand

🔍 Patch Validation

PR: #1811 — QCLINUX: arm64: dts: qcom: shikra: Install camx DTBO overlays
Upstream commit: N/A (vendor-only commit)
Verdict: ✅ PASS

Commit Message

Check	Status	Note
Subject matches upstream	N/A	Vendor-only commit; no upstream source
Body preserves rationale	✅	Clear description of Makefile entries for camx DTBO overlays
Fixes tag present/correct	N/A	Not a fix commit
Authorship preserved	✅	Original work by commit author
Backport note (if applicable)	N/A	Not a backport

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/Makefile	✅	Adds camx DTBO build entries for shikra variants
arch/arm64/boot/dts/qcom/shikra-camera-sensor.dtsi	✅	New camera sensor device tree include (457 lines)
arch/arm64/boot/dts/qcom/shikra-camera.dtsi	✅	New camera device tree include (1189 lines)
arch/arm64/boot/dts/qcom/shikra-cqm-evk-camx.dtso	✅	New DTBO overlay for CQM EVK variant
arch/arm64/boot/dts/qcom/shikra-cqs-evk-camx.dtso	✅	New DTBO overlay for CQS EVK variant
arch/arm64/boot/dts/qcom/shikra-iqs-evk-camx.dtso	✅	New DTBO overlay for IQS EVK variant

Verdict

Merge as-is. This is a well-formed vendor-only commit adding Shikra camera DTBO overlay support. The commit message is clear, authorship is correct, and the change is present in the kernel topics branch.

Final Summary

1. Lore link present: No — QCLINUX: prefix; 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 change, not posted upstream
4. PR present in qcom-next/topics: Yes — commit present in topics branch at 846683952cb59e4519d65a30f6451733c655d2cf

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] QCLINUX: arm64: dts: qcom: shikra: Install camx DTBO overlays	missing - no subject, patch-id, or full tree-content match found	present - exact patch-id match at 8466839	present

Final Status

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

[qlijarvis]

PR #1811 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Skipped - CI setup failed
dt-binding-check	⏭️	Skipped - CI setup failed
dtb-check	⏭️	Skipped - CI setup failed
sparse-check	⏭️	Skipped - CI setup failed
check-uapi-headers	⏭️	Skipped - CI setup failed
check-patch-compliance	⏭️	Skipped - CI setup failed
tag-check	✅	PASS - subject has valid QCLINUX: prefix
qcom-next-check	⚠️	N/A - PR targets tech/overlay/dt (topic branch)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1811 - QCLINUX: arm64: dts: qcom: shikra: Install camx DTBO overlays
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/34483950782

Checker	Result	Summary
checkpatch	⏭️	Skipped - CI setup failed
dt-binding-check	⏭️	Skipped - CI setup failed
dtb-check	⏭️	Skipped - CI setup failed
sparse-check	⏭️	Skipped - CI setup failed
check-uapi-headers	⏭️	Skipped - CI setup failed
check-patch-compliance	⏭️	Skipped - CI setup failed
tag-check	✅	PASS - subject has valid QCLINUX: prefix
qcom-next-check	⚠️	N/A - PR targets tech/overlay/dt (topic branch)

---

⚠️ CI Infrastructure Failure — Merge Conflicts During Setup

Root cause: The kernel-checker CI workflow failed during the pre-check setup phase when attempting to merge the PR with the automerged qcom-next baseline. The PR targets the tech/overlay/dt topic branch, but the CI workflow attempts to integrate all topic branches via automerge before applying the PR, resulting in extensive merge conflicts.

Failure details:

All six checker jobs (checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, check-patch-compliance) exited with code 3 during the "Sync and merge PR" step before any actual checker logic could run.

From checker__checkpatch____checker.txt:

2026-09-10T13:56:32.1900240Z Merge failed, manual merge
2026-09-10T13:56:59.1989494Z Automatic merge failed; fix conflicts and then commit the result.
2026-09-10T13:56:59.2264700Z Merge failed or conflicts detected. Aborting merge.
2026-09-10T13:57:02.6037265Z ##[error]Process completed with exit code 3.

Extensive conflicts detected in:

• 50+ DT binding YAML files (Documentation/devicetree/bindings/)
• 30+ DTS/DTSI files (arch/arm64/boot/dts/qcom/)
• Sound subsystem files (sound/soc/qcom/qdsp6/)
• MAINTAINERS
• arch/arm64/boot/dts/qcom/Makefile

Example conflicts:

CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/glymur.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/kaanapali.dtsi
CONFLICT (content): Merge conflict in sound/soc/qcom/qdsp6/audioreach.h
CONFLICT (modify/delete): arch/arm64/boot/dts/qcom/lemans-auto.dtsi deleted in pr-1811 and modified in HEAD

CI workflow context:

BASE="tech/overlay/dt"
TOPIC_REPO="qualcomm-linux/kernel-topics"

The CI workflow:

1. Checks out qcom-next baseline
2. Runs automerge to integrate all topic branches from kernel-config/merge.conf
3. Attempts to merge PR QCLINUX: arm64: dts: qcom: shikra: Install camx DTBO overlays #1811 on top of the automerged result
4. Step 3 fails with merge conflicts → all checkers abort

---

✅ tag-check — PASS

Analysis: The commit subject starts with QCLINUX:, which is a valid prefix for vendor-only changes.

Commit:

7e0a9f94dc7f78940a00ea794abd01db8ca366cb
QCLINUX: arm64: dts: qcom: shikra: Install camx DTBO overlays

Note: The QCLINUX: prefix is appropriate for vendor-specific DT overlay additions that have no upstream equivalent. However, check-patch-compliance (if it had run) would have flagged this prefix as invalid because it only accepts upstream-linkable prefixes (FROMLIST:, FROMGIT:, UPSTREAM:, BACKPORT:). This is a known limitation of the check-patch-compliance checker for vendor-only commits.

---

🔍 Patch Content Analysis

What the PR does:

• Adds camera (camx) DTBO overlay support for Shikra board variants (CQS EVK, CQM EVK, IQS EVK)
• Creates 3 new DTSI files: shikra-camera-sensor.dtsi, shikra-camera.dtsi
• Creates 3 new DTSO overlay files: shikra-cqs-evk-camx.dtso, shikra-cqm-evk-camx.dtso, shikra-iqs-evk-camx.dtso
• Updates arch/arm64/boot/dts/qcom/Makefile to build composite DTBs (base + overlay)

Files changed:

• arch/arm64/boot/dts/qcom/Makefile (+15 lines)
• arch/arm64/boot/dts/qcom/shikra-camera-sensor.dtsi (new, 457 lines)
• arch/arm64/boot/dts/qcom/shikra-camera.dtsi (new, 1189 lines)
• arch/arm64/boot/dts/qcom/shikra-cqm-evk-camx.dtso (new, 41 lines)
• arch/arm64/boot/dts/qcom/shikra-cqs-evk-camx.dtso (new, 41 lines)
• arch/arm64/boot/dts/qcom/shikra-iqs-evk-camx.dtso (new, 111 lines)

Total: 1854 insertions, 0 deletions

---

Verdict

CI Status: ❌ All checkers failed due to CI infrastructure merge conflicts — not a patch defect.

Patch Quality: Cannot be assessed because no checkers ran successfully.

Recommended Actions:

1. Immediate: This is a CI workflow issue, not a patch problem. The PR cannot be validated in its current form because the automerge step fails.

2. Root cause: The tech/overlay/dt topic branch has diverged significantly from the automerged qcom-next baseline, causing conflicts in 80+ files across DT bindings, DTS files, and sound subsystem code.

3. Resolution options:

   Option A (Recommended): Rebase the tech/overlay/dt branch onto the latest qcom-next tip and resolve all conflicts locally before re-triggering CI:

   git fetch origin qcom-next
   git rebase origin/qcom-next tech/overlay/dt
   # Resolve conflicts in 80+ files
   git push --force-with-lease origin tech/overlay/dt

   Option B: Adjust the CI workflow to skip automerge for topic-branch PRs and test them in isolation against their base branch (tech/overlay/dt), not against the automerged qcom-next.

   Option C: Merge the latest qcom-next into tech/overlay/dt (instead of rebasing) to bring the topic branch up to date:

   git fetch origin qcom-next
   git merge origin/qcom-next
   # Resolve conflicts
   git push origin tech/overlay/dt

4. After resolving conflicts: Re-trigger the CI run. The checkers should then be able to validate:

   • checkpatch — coding style and commit message format
   • dt-binding-check — DT binding schema validation (if any bindings are added/modified)
   • dtb-check — compiled DTB validation for new DTS/DTSI/DTSO files
   • sparse-check — static analysis (likely skipped for DTS-only changes)
   • check-uapi-headers — UAPI ABI validation (likely skipped for DTS-only changes)
   • check-patch-compliance — will fail due to QCLINUX: prefix (known limitation for vendor-only commits)

5. Expected checker results after rebase:

   • checkpatch: Likely ✅ PASS (DTS-only changes typically have no style issues)
   • dt-binding-check: ⏭️ SKIP (no binding YAML changes in this PR)
   • dtb-check: ✅ PASS or ❌ FAIL (depends on whether new DTS nodes validate against existing bindings)
   • sparse-check: ⏭️ SKIP (no C/H files changed)
   • check-uapi-headers: ⏭️ SKIP (no C/H files changed)
   • check-patch-compliance: ❌ FAIL (known limitation — QCLINUX: prefix not accepted)

---

Summary

This is not a patch quality issue. The PR itself appears well-formed (single commit, proper subject prefix, DTS-only changes). The CI failure is due to the tech/overlay/dt topic branch being out of sync with the automerged qcom-next baseline, causing 80+ merge conflicts during the CI setup phase.

Action required: Rebase or merge qcom-next into tech/overlay/dt to resolve conflicts, then re-trigger CI.