Skip to content

QCLINUX: arm64: dts: qcom: Removed Imx577 sensor && Swap RESET and POWER down pins#1463

Open
mvadlama-lab wants to merge 2 commits into
qualcomm-linux:tech/overlay/dtfrom
mvadlama-lab:qli0.0_pwr_pin_swap
Open

QCLINUX: arm64: dts: qcom: Removed Imx577 sensor && Swap RESET and POWER down pins#1463
mvadlama-lab wants to merge 2 commits into
qualcomm-linux:tech/overlay/dtfrom
mvadlama-lab:qli0.0_pwr_pin_swap

Conversation

@mvadlama-lab

Copy link
Copy Markdown

Removing non-required imx577 sensor node definition for cci1 for monaco.
&&
Swap reset and power down pins for MIPI camera.

CRs-Fixed: 4429303
CRs-Fixed: 4593671

Removing non-required imx577 sensor node definition for cci1 for
monaco

Signed-off-by: Vadlamani Manjusha <mvadlama@qti.qualcomm.com>
Swap reset and power down pins for MIPI camera

Signed-off-by: Vadlamani Manjusha <mvadlama@qti.qualcomm.com>
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1463

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict (add/add) Documentation/devicetree/bindings/cpufreq/qcom,shikra-epss.yaml No Pre-existing conflict between baseline (qcom-next) and topic branch (tech/overlay/dt) during automerge integration
2 Merge conflict (content) Documentation/devicetree/bindings/crypto/qcom,prng.yaml No Pre-existing conflict between baseline and topic branch during automerge
3 Merge conflict (content) Documentation/devicetree/bindings/crypto/qcom-qce.yaml No Pre-existing conflict between baseline and topic branch during automerge
4 Merge conflict (content) Documentation/devicetree/bindings/display/msm/gpu.yaml No Pre-existing conflict between baseline and topic branch during automerge
5 Merge conflict (add/add) Documentation/devicetree/bindings/interconnect/qcom,shikra.yaml No Pre-existing conflict between baseline and topic branch during automerge
6 Merge conflict (content) Documentation/devicetree/bindings/iommu/arm,smmu.yaml No Pre-existing conflict between baseline and topic branch during automerge
7 Merge conflict (content) Documentation/devicetree/bindings/media/qcom,qcm2290-venus.yaml No Pre-existing conflict between baseline and topic branch during automerge
8 Merge conflict (content) Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml No Pre-existing conflict between baseline and topic branch during automerge
9 Merge conflict (content) Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.yaml No Pre-existing conflict between baseline and topic branch during automerge
10 Merge conflict (content) Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml No Pre-existing conflict between baseline and topic branch during automerge
... 99 additional merge conflicts Various files No Pre-existing conflicts (109 total conflicts)

Verdict

All 109 merge conflicts are pre-existing issues with the topic branch (tech/overlay/dt), not introduced by this PR. The PR only modifies arch/arm64/boot/dts/qcom/monaco-evk-camera-sensor.dtsi, which is not involved in any conflicts. The build failed during the automerge integration step before compilation could begin.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1463

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

# Error File:Line PR-introduced? Root Cause
N/A Merge conflict during automerge Multiple files No Pre-existing integration conflicts unrelated to PR changes

Verdict

This PR did not introduce any build errors. The build failed during the automerge (topic branch integration) phase due to pre-existing merge conflicts in files completely unrelated to the PR's changes to monaco-evk-camera-sensor.dtsi.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1463 — validate-patch

PR: #1463

Verdict Issues Detailed Report
N/A 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 changes, not posted upstream
  4. PR present in qcom-next: Not checked — QCLINUX: vendor-only commits
Verdict: N/A — click to expand

🔍 Patch Validation

PR: #1463 - QCLINUX: arm64: dts: qcom camera sensor changes for monaco
Upstream commit: N/A (vendor-only commits)
Verdict: ⏭️ SKIPPED (vendor-only)


Commit 1: QCLINUX: arm64: dts: qcom: Removes imx577 sensor dts node QCS8275

Prefix: QCLINUX:
Status: Vendor-only commit — validation not applicable

Commit Message

Check Status Note
Subject matches upstream N/A Vendor-only commit
Body preserves rationale Brief but clear: "Removing non-required imx577 sensor node definition for cci1 for monaco"
Fixes tag present/correct N/A Not a fix
Authorship preserved Signed-off-by present
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
arch/arm64/boot/dts/qcom/monaco-evk-camera-sensor.dtsi Removes 75 lines: qcom,cam-sensor19 and eeprom_cam19 nodes

Commit 2: QCLINUX: arm64: dts: qcom: Swap RESET and POWER down pins

Prefix: QCLINUX:
Status: Vendor-only commit — validation not applicable

Commit Message

Check Status Note
Subject matches upstream N/A Vendor-only commit
Body preserves rationale Clear: "Swap reset and power down pins for MIPI camera"
Fixes tag present/correct N/A Not a fix
Authorship preserved Signed-off-by present
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
arch/arm64/boot/dts/qcom/monaco-evk-camera-sensor.dtsi Swaps gpio pin order in 9 sensor/eeprom nodes (expander2 and tlmm pins)

Issues

None — both commits are properly formatted vendor-only changes with clear commit messages and appropriate QCLINUX: prefix.


Verdict

Skip validation — Both commits use the QCLINUX: prefix, indicating vendor-only changes with no upstream equivalent. These commits are not intended for upstream submission and therefore cannot be validated against lore.kernel.org sources. The commits are properly formatted with clear rationale and correct authorship.


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 changes, not posted upstream
  4. PR present in qcom-next: Not checked — QCLINUX: vendor-only commits

@qlijarvis

Copy link
Copy Markdown

PR #1463 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch CI infrastructure failure - merge failed
dt-binding-check CI infrastructure failure - merge failed
dtb-check CI infrastructure failure - merge failed
sparse-check CI infrastructure failure - merge failed
check-uapi-headers CI infrastructure failure - merge failed
check-patch-compliance CI infrastructure failure - merge failed
tag-check N/A Cannot evaluate - no jobs completed

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1463 - QCLINUX: arm64: dts: qcom: Camera sensor DTS updates
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/28641062559

Checker Result Summary
checkpatch CI infrastructure failure - merge failed
dt-binding-check CI infrastructure failure - merge failed
dtb-check CI infrastructure failure - merge failed
sparse-check CI infrastructure failure - merge failed
check-uapi-headers CI infrastructure failure - merge failed
check-patch-compliance CI infrastructure failure - merge failed
tag-check N/A Cannot evaluate - no jobs completed

❌ CI Infrastructure Failure (All Checkers)

Root cause: Git merge failure - "refusing to merge unrelated histories" during PR integration step.

Failure details:
All checker jobs failed at the same point during the setup phase when attempting to merge the PR branch into the baseline:

Fetching PR #1463 from https://github.com/qualcomm-linux/kernel-topics.git...
From https://github.com/qualcomm-linux/kernel-topics
 * [new ref]                   refs/pull/1463/head -> pr-1463
Merging pr-1463 (no-commit)...
fatal: refusing to merge unrelated histories
Merge failed or conflicts detected. Aborting merge.
##[error]Process completed with exit code 3.

Analysis:

This is a CI workflow configuration issue, not a code quality problem. The error occurs because:

  1. Target branch: PR QCLINUX: arm64: dts: qcom: Removed Imx577 sensor && Swap RESET and POWER down pins #1463 targets tech/overlay/dt in the qualcomm-linux/kernel-topics repository
  2. CI baseline: The checker workflow attempts to merge this into qcom-next from qualcomm-linux/kernel
  3. Git history mismatch: These two branches have completely unrelated git histories (no common ancestor)

The tech/overlay/dt branch appears to be a topic branch with an independent history, likely containing only device tree overlay files. When the CI tries to merge it into the main kernel tree's qcom-next branch, git refuses because there's no shared commit history.

PR Content (from patch file):

  • Commit 1: QCLINUX: arm64: dts: qcom: Removes imx577 sensor dts node QCS8275
  • Commit 2: QCLINUX: arm64: dts: qcom: Swap RESET and POWER down pins

Both commits modify arch/arm64/boot/dts/qcom/monaco-evk-camera-sensor.dtsi:

  • Removes unused imx577 sensor node definitions (75 lines deleted)
  • Swaps gpio ordering for reset and power-down pins across multiple camera sensor nodes

Fix Options:

Option 1: Rebase PR onto correct base (Recommended if this is a topic branch PR)

# If the PR should be based on qcom-next:
git fetch origin qcom-next
git rebase origin/qcom-next
git push --force-with-lease

Option 2: Fix CI workflow configuration
If tech/overlay/dt is intentionally a separate history (e.g., for overlay-only changes), the CI workflow needs to be updated to handle topic branches differently. The workflow should either:

  • Skip automerge for topic branches with independent histories
  • Use --allow-unrelated-histories flag (not recommended for production)
  • Apply the PR patches directly to qcom-next instead of merging

Option 3: Recreate PR with proper base
If the changes should apply to the main kernel tree:

# Create new branch from qcom-next
git checkout -b camera-sensor-fixes origin/qcom-next
# Cherry-pick or apply the changes
git cherry-pick <commit-sha-1> <commit-sha-2>
# Create new PR

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel.git
cd kernel
git checkout qcom-next
git fetch https://github.com/qualcomm-linux/kernel-topics.git refs/pull/1463/head:pr-1463
git merge pr-1463
# Will fail with: fatal: refusing to merge unrelated histories

⚠️ Code Quality Notes (from patch inspection)

While the checkers couldn't run, manual inspection of the patch reveals:

Positive:

  • Both commits use QCLINUX: prefix (appropriate for vendor-specific DTS changes)
  • Both commits have Signed-off-by: trailers
  • Changes are focused and surgical (DTS-only)

Potential concerns:

  • Commit 1 subject line: "Removes imx577 sensor dts node QCS8275" - slightly unclear (missing "for" or "from")
  • Commit 2 subject line: "Swap RESET and POWER down pins" - could be more specific about which sensors/nodes
  • No explanation in commit messages about why these changes are needed (hardware revision? bug fix? cleanup?)

Verdict

Cannot merge - CI infrastructure issue blocks all checker validation.

Required action: Fix the git history mismatch by choosing one of the three options above. Once the PR can be successfully merged into the baseline, re-trigger the checker workflow to validate code quality.

Recommendation: If this is a topic branch that should integrate with qcom-next, Option 1 (rebase onto qcom-next) is the cleanest solution. If tech/overlay/dt is intentionally separate, the CI workflow configuration needs to be updated (Option 2).

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants