Skip to content

Clk gp mnd dt#1297

Merged
Komal-Bajaj merged 2 commits into
qualcomm-linux:tech/all/dt/qcs8300from
taniyadas20:clk-gp-mnd-dt
Jun 4, 2026
Merged

Clk gp mnd dt#1297
Komal-Bajaj merged 2 commits into
qualcomm-linux:tech/all/dt/qcs8300from
taniyadas20:clk-gp-mnd-dt

Conversation

@taniyadas20

Copy link
Copy Markdown
Contributor

No description provided.

Add pinctrl states for the GP M/N divider clock output pin across
multiple Qualcomm SoCs:

  wire it to the GP M/N clock controller node via pinctrl-0.
- kodiak (sa8775p): Add gp_mn_active state on gpio35 (gp_mn function).
- lemans (sa8775p): Add gp_mn_active state on gpio35 (gp_mn function).
- monaco (qcs8300): Add gp_mn_active state on gpio32 (gp_mn function).

Link: https://lore.kernel.org/r/20260602-pdm_clk_gp_mnd_v1-v1-4-1522662b6c53@oss.qualcomm.com
Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
…75P and QCS8300

Add the GP M/N divider clock controller node at 0x088d3000 to the
SA8775P (kodiak, lemans) and QCS8300 (monaco) SoC device trees.

The node uses the qcom,clk-gp-mnd compatible, is clocked by the PDM
XO4 and AHB clocks from GCC, and exposes a single clock output
(gp_mn_clk) on the dedicated gp_mn pin mux function. The XO4 clock
is pre-assigned to 4.8 MHz (XO/4).

Link: https://lore.kernel.org/r/20260602-pdm_clk_gp_mnd_v1-v1-5-1522662b6c53@oss.qualcomm.com
Signed-off-by: Taniya Das <taniya.das@oss.qualcomm.com>
@qcomlnxci qcomlnxci requested review from a team, Komal-Bajaj, jingyiwang42 and mukeshojha-linux and removed request for a team June 2, 2026 18:32
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1297

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict arch/arm64/boot/dts/qcom/Makefile No Pre-existing conflict in Makefile during integration merge; PR does not modify this file

Verdict

This is a pre-existing merge conflict, not a compilation error. The PR does not introduce any build failures.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1297

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during integration arch/arm64/boot/dts/qcom/Makefile No The PR branch's version of the Makefile conflicts with changes in the baseline branch. The PR itself does not modify this file.

Verdict

This is not a compilation failure. The build failed during the pre-build integration phase due to a merge conflict in arch/arm64/boot/dts/qcom/Makefile. The PR does not introduce this conflict—it is a pre-existing integration issue between the PR branch and the baseline.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1297 — validate-patch

PR: #1297

Verdict Issues Detailed Report
⚠️ 10 Full report

Final Summary

  1. Lore link present: Yes — both commits have valid lore.kernel.org message-ID links in Link: tags
  2. Lore link matches PR commits: ⏭️ Cannot verify — network restrictions prevent fetching lore patches for comparison
  3. Upstream patch status: ⏭️ Cannot verify — network restrictions prevent checking lore thread for ACK/NAK/merge signals; message-IDs suggest these are from a v1 patch series posted on 2026-06-02
  4. PR present in qcom-next: No — searched origin/qcom-next by subject line and file paths; commits not found (expected for recent FROMLIST patches)
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1297
Upstream commits:


Commit 1: FROMLIST: arm64: dts: qcom: Add gp_mn pin state for GP M/N clock output

Commit Message

Check Status Note
Subject matches upstream ⏭️ Skipped Cannot fetch lore patch (network restricted)
Body preserves rationale ✅ Pass Clear description of pinctrl states for 3 SoCs
Fixes tag present/correct N/A New feature, no Fixes tag expected
Authorship preserved ✅ Pass From: and Signed-off-by: both Taniya Das (consistent for FROMLIST)
Backport note (if applicable) N/A FROMLIST prefix, not a backport
Co-developed-by usage ✅ Pass Not used

Diff

File Status Notes
arch/arm64/boot/dts/qcom/kodiak.dtsi ✅ Pass Adds gp_mn_active pinctrl state on gpio35
arch/arm64/boot/dts/qcom/lemans.dtsi ✅ Pass Adds gp_mn_active pinctrl state on gpio35
arch/arm64/boot/dts/qcom/monaco.dtsi ✅ Pass Adds gp_mn_active pinctrl state on gpio32

Commit 2: FROMLIST: arm64: dts: qcom: Add GP M/N clock controller node for SA8775P and QCS8300

Commit Message

Check Status Note
Subject matches upstream ⏭️ Skipped Cannot fetch lore patch (network restricted)
Body preserves rationale ✅ Pass Detailed description of clock controller node, address, compatible, clocks
Fixes tag present/correct N/A New feature, no Fixes tag expected
Authorship preserved ✅ Pass From: and Signed-off-by: both Taniya Das (consistent for FROMLIST)
Backport note (if applicable) N/A FROMLIST prefix, not a backport
Co-developed-by usage ✅ Pass Not used

Diff

File Status Notes
arch/arm64/boot/dts/qcom/kodiak.dtsi ✅ Pass Adds gp_mn clock-controller@88d3000 node, references gp_mn_active from commit 1
arch/arm64/boot/dts/qcom/lemans.dtsi ✅ Pass Adds gp_mn clock-controller@88d3000 node, references gp_mn_active from commit 1
arch/arm64/boot/dts/qcom/monaco.dtsi ✅ Pass Adds gp_mn clock-controller@88d3000 node, references gp_mn_active from commit 1

Dependency Check

Pass — Commit 2 correctly depends on commit 1:

  • Commit 1 defines gp_mn_active pinctrl states
  • Commit 2 references <&gp_mn_active> in the clock controller node's pinctrl-0 property
  • Proper ordering maintained in the PR

Issues

Network Restriction Limitation:

  • Cannot fetch lore patches from lore.kernel.org to perform byte-level diff comparison
  • Cannot verify upstream patch status (ACKed/NACKed/Pending) via lore thread analysis
  • Validation is based on PR patch structure, commit message format, and internal consistency only

Observations:

  • Both commits use FROMLIST: prefix correctly (patches posted to mailing list, not yet merged)
  • Lore links present and properly formatted in Link: tags
  • Message-IDs indicate these are patches 4 and 5 from a series (v1-4 and v1-5)
  • Commit messages are well-structured with clear descriptions
  • Authorship is consistent (Taniya Das as both author and sign-off)
  • No Co-developed-by misuse
  • Logical dependency between commits is correct

Verdict

⚠️ PARTIAL — Commits appear well-formed based on available information, but full validation requires lore patch comparison which is blocked by network restrictions. The PR demonstrates:

  • Proper commit message structure and authorship
  • Correct use of FROMLIST prefix
  • Valid lore.kernel.org links
  • Logical dependency ordering between commits
  • Clean device tree additions

Recommendation: The commits follow proper formatting conventions and have correct internal structure. However, to complete validation:

  1. Verify the lore patches match the PR diffs exactly (requires network access)
  2. Check upstream status on the mailing list (requires network access)
  3. Confirm no semantic changes were introduced during cherry-pick

Final Summary

  1. Lore link present: Yes — both commits have valid lore.kernel.org message-ID links in Link: tags
  2. Lore link matches PR commits: ⏭️ Cannot verify — network restrictions prevent fetching lore patches for comparison
  3. Upstream patch status: ⏭️ Cannot verify — network restrictions prevent checking lore thread for ACK/NAK/merge signals; message-IDs suggest these are from a v1 patch series posted on 2026-06-02
  4. PR present in qcom-next: No — searched origin/qcom-next by subject line and file paths; commits not found (expected for recent FROMLIST patches)

@qlijarvis

Copy link
Copy Markdown

PR #1297 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⚠️ CI merge conflict - checker did not run
dt-binding-check ⚠️ CI merge conflict - checker did not run
dtb-check ⚠️ CI merge conflict - checker did not run
sparse-check ⚠️ CI merge conflict - checker did not run
check-uapi-headers ⚠️ CI merge conflict - checker did not run
check-patch-compliance ⚠️ CI merge conflict - checker did not run
tag-check Both commits have valid FROMLIST: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1297 - Add GP M/N clock controller and pin states for SA8775P and QCS8300
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/26840104734

Checker Result Summary
checkpatch ⚠️ CI merge conflict - checker did not run
dt-binding-check ⚠️ CI merge conflict - checker did not run
dtb-check ⚠️ CI merge conflict - checker did not run
sparse-check ⚠️ CI merge conflict - checker did not run
check-uapi-headers ⚠️ CI merge conflict - checker did not run
check-patch-compliance ⚠️ CI merge conflict - checker did not run
tag-check Both commits have valid FROMLIST: prefix

⚠️ CI Infrastructure Issue — Merge Conflict

Root cause: All checker jobs failed during the CI integration merge step before any actual checker validation could run.

Failure details:

Auto-merging arch/arm64/boot/dts/qcom/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
Auto-merging arch/arm64/boot/dts/qcom/monaco.dtsi
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge
##[error]Process completed with exit code 1.

Analysis:

  • The CI workflow attempts to merge the PR branch (topic/tech/all/dt/qcs8300) with the baseline branch
  • A merge conflict occurs in arch/arm64/boot/dts/qcom/Makefile
  • This prevents all checker jobs from running
  • This is a CI infrastructure/workflow issue, not a patch defect

Fix:

Option 1 (Recommended): Rebase the PR branch on the latest baseline:

git fetch origin
git rebase origin/<base-branch>
# Resolve the Makefile conflict
git add arch/arm64/boot/dts/qcom/Makefile
git rebase --continue
git push --force-with-lease

Option 2: Re-trigger the CI workflow after the baseline has been updated to include the conflicting changes.

Option 3: If this is a known CI workflow limitation, the PR may need manual review and merge.

✅ Manual Patch Analysis

Since the checkers didn't run, I performed manual analysis of the patch content:

Commits:

  1. cc3d96636ad1 - "FROMLIST: arm64: dts: qcom: Add gp_mn pin state for GP M/N clock output"

  2. 5ac710185333 - "FROMLIST: arm64: dts: qcom: Add GP M/N clock controller node for SA8775P and QCS8300"

Files modified:

  • arch/arm64/boot/dts/qcom/kodiak.dtsi (SA8775P)
  • arch/arm64/boot/dts/qcom/lemans.dtsi (SA8775P)
  • arch/arm64/boot/dts/qcom/monaco.dtsi (QCS8300)

Changes: DTS-only additions for GP M/N clock controller and pinctrl states.

Verdict

CI infrastructure issue blocks validation. The patches themselves appear well-formed with proper prefixes and upstream links. Once the merge conflict in arch/arm64/boot/dts/qcom/Makefile is resolved, re-run the CI to get actual checker results.

Action required: Rebase the PR branch to resolve the Makefile conflict, then re-trigger CI.

@qlijarvis

Copy link
Copy Markdown

PR #1297 — validate-patch

PR: #1297

Verdict Issues Detailed Report
⚠️ 9 Full report

Final Summary

  1. Lore link present: Yes - both patches include Link: tags pointing to lore.kernel.org message IDs (patch 4/5 and 5/5 of the pdm_clk_gp_mnd_v1 series)

  2. Lore link matches PR commits: Cannot verify - network access is restricted; unable to fetch upstream patches from lore.kernel.org for byte-by-byte comparison. Based on internal consistency checks: commit messages reference the correct lore message IDs, authorship is consistent, and diff structure follows kernel conventions.

  3. Upstream patch status: In review - FROMLIST prefix indicates these patches have been posted to the mailing list but not yet accepted into mainline. The date (2026-06-02) suggests very recent submission.

  4. PR present in qcom-next: Not checked - no access to qcom-next branch for verification; FROMLIST status suggests these are pending upstream acceptance before integration into vendor trees.

Recommendation: Fix the orphaned line in patch 1/2 commit message (" wire it to..." should be removed or completed with proper context), then merge. Once network access is available, verify the diffs match the upstream lore patches byte-for-byte.

Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1297 - Add GP M/N clock controller and pinctrl support for SA8775P and QCS8300
Upstream commit: https://lore.kernel.org/r/20260602-pdm_clk_gp_mnd_v1-v1-4-1522662b6c53@oss.qualcomm.com (patch 1/2), https://lore.kernel.org/r/20260602-pdm_clk_gp_mnd_v1-v1-5-1522662b6c53@oss.qualcomm.com (patch 2/2)
Verdict: ⚠️ PARTIAL (cannot verify upstream diff match due to network restrictions)

Commit Message

Patch 1/2: FROMLIST: arm64: dts: qcom: Add gp_mn pin state for GP M/N clock output

Check Status Note
Subject matches upstream ⚠️ Cannot verify - network restricted; subject format is correct
Body preserves rationale Clear description of pinctrl additions for 3 SoCs with GPIO details
Fixes tag present/correct N/A New feature, no Fixes tag expected
Authorship preserved Taniya Das taniya.das@oss.qualcomm.com
Backport note (if applicable) N/A FROMLIST prefix indicates pending upstream submission

Patch 2/2: FROMLIST: arm64: dts: qcom: Add GP M/N clock controller node for SA8775P and QCS8300

Check Status Note
Subject matches upstream ⚠️ Cannot verify - network restricted; subject format is correct
Body preserves rationale Describes clock controller node, compatible, clocks, and XO4 pre-assignment
Fixes tag present/correct N/A New feature, no Fixes tag expected
Authorship preserved Taniya Das taniya.das@oss.qualcomm.com
Backport note (if applicable) N/A FROMLIST prefix indicates pending upstream submission

Diff

Patch 1/2:

File Status Notes
arch/arm64/boot/dts/qcom/kodiak.dtsi Adds gp_mn_active pinctrl state on gpio35
arch/arm64/boot/dts/qcom/lemans.dtsi Adds gp_mn_active pinctrl state on gpio35
arch/arm64/boot/dts/qcom/monaco.dtsi Adds gp_mn_active pinctrl state on gpio32

Patch 2/2:

File Status Notes
arch/arm64/boot/dts/qcom/kodiak.dtsi Adds gp_mn clock-controller@88d3000 node
arch/arm64/boot/dts/qcom/lemans.dtsi Adds gp_mn clock-controller@88d3000 node
arch/arm64/boot/dts/qcom/monaco.dtsi Adds gp_mn clock-controller@88d3000 node

Issues

Patch 1/2:

  • ⚠️ Commit message formatting: The commit body has a formatting issue on line 3 - it starts with " wire it to..." which appears to be a continuation of a previous bullet point that was cut off or missing. The line should either be removed or the preceding context should be included.

Patch 2/2:

  • No issues detected in commit message or diff structure

Both patches:

  • ✅ Link tags are present and follow the correct format
  • ✅ Signed-off-by tags are present with correct author email
  • ✅ FROMLIST prefix correctly indicates patches pending upstream review
  • ✅ Date format is correct (Tue, 2 Jun 2026)
  • ✅ Diff structure is clean with proper context lines
  • ✅ DTS node naming follows kernel conventions (node-name@address format)
  • ✅ Property ordering in DTS nodes follows standard conventions

Verdict

Patch 1/2: Needs minor fix - remove or complete the orphaned " wire it to..." line in the commit message body.

Patch 2/2: Merge as-is - commit message and diff are well-formed.

Final Summary

  1. Lore link present: Yes - both patches include Link: tags pointing to lore.kernel.org message IDs (patch 4/5 and 5/5 of the pdm_clk_gp_mnd_v1 series)

  2. Lore link matches PR commits: Cannot verify - network access is restricted; unable to fetch upstream patches from lore.kernel.org for byte-by-byte comparison. Based on internal consistency checks: commit messages reference the correct lore message IDs, authorship is consistent, and diff structure follows kernel conventions.

  3. Upstream patch status: In review - FROMLIST prefix indicates these patches have been posted to the mailing list but not yet accepted into mainline. The date (2026-06-02) suggests very recent submission.

  4. PR present in qcom-next: Not checked - no access to qcom-next branch for verification; FROMLIST status suggests these are pending upstream acceptance before integration into vendor trees.

Recommendation: Fix the orphaned line in patch 1/2 commit message (" wire it to..." should be removed or completed with proper context), then merge. Once network access is available, verify the diffs match the upstream lore patches byte-for-byte.

@qlijarvis

Copy link
Copy Markdown

PR #1297 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ Skipped - automerge conflict
dt-binding-check ⏭️ Skipped - automerge conflict
dtb-check ⏭️ Skipped - automerge conflict
sparse-check ⏭️ Skipped - automerge conflict
check-uapi-headers ⏭️ Skipped - automerge conflict
check-patch-compliance ⏭️ Skipped - automerge conflict
tag-check N/A Not applicable for this PR
qcom-next-check Both commits use FROMLIST: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1297 - Add GP M/N clock controller and pinctrl for SA8775P and QCS8300
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/26840104734

Checker Result Summary
checkpatch ⏭️ Skipped - automerge conflict
dt-binding-check ⏭️ Skipped - automerge conflict
dtb-check ⏭️ Skipped - automerge conflict
sparse-check ⏭️ Skipped - automerge conflict
check-uapi-headers ⏭️ Skipped - automerge conflict
check-patch-compliance ⏭️ Skipped - automerge conflict
tag-check N/A Not applicable for this PR
qcom-next-check Both commits use FROMLIST: prefix

❌ Automerge Conflict (Pre-Checker Failure)

Root cause: Merge conflict in arch/arm64/boot/dts/qcom/Makefile when integrating topic branch topic/tech/all/dt/qcs8300 with baseline df3ae9703774b70a7b7758b53498a25de9f87174.

Failure details:

2026-06-02T18:51:10.6385606Z Auto-merging arch/arm64/boot/dts/qcom/Makefile
2026-06-02T18:51:10.6386467Z CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
2026-06-02T18:51:10.6387072Z Auto-merging arch/arm64/boot/dts/qcom/monaco.dtsi
2026-06-02T18:51:10.7030588Z Automatic merge failed; fix conflicts and then commit the result.
2026-06-02T18:51:10.7142864Z Merge failed, manual merge
2026-06-02T18:51:10.8777941Z automerge returned non-zero; check logs for conflicts

Analysis:
This is not a code quality issue with the PR patches themselves. The PR adds:

  1. GP M/N pinctrl states to kodiak.dtsi, lemans.dtsi, and monaco.dtsi
  2. GP M/N clock controller nodes to the same three device trees

The patches are clean device tree additions that do not modify the Makefile. However, the CI workflow attempts to merge the PR's topic branch (topic/tech/all/dt/qcs8300) with other pending topic branches during integration testing, and this merge encounters a conflict in the Makefile - likely due to concurrent additions of new device tree files by other topic branches.

Fix:

Option 1 (Recommended): Rebase the topic branch on the latest baseline to resolve the Makefile conflict:

git fetch origin
git rebase origin/qcom-next  # or appropriate baseline branch
# Resolve any Makefile conflicts by keeping both additions
git push --force-with-lease

Option 2: Wait for conflicting topic branches to merge first, then re-trigger CI.

Option 3: Manually resolve the conflict in the integration branch if you have access to the automerge configuration.

Reproduce locally:

# Clone the kernel-config repo
git clone https://github.com/qualcomm-linux/kernel-config.git
cd kernel-config

# Run automerge with the same configuration used by CI
# This will attempt to merge topic/tech/all/dt/qcs8300 and show the conflict
./scripts/automerge.sh --config <path-to-conf-file>

Verdict

Integration conflict blocking CI - 1 blocker to fix before checkers can run.

The PR patches themselves appear well-formed (proper FROMLIST: prefix, clean device tree additions), but cannot be validated by the checker suite until the Makefile merge conflict is resolved. This is a common occurrence in active development branches where multiple teams are adding new device tree files concurrently.

Recommended action: Rebase the topic branch topic/tech/all/dt/qcs8300 on the latest baseline to incorporate recent Makefile changes, then re-trigger the CI workflow.

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1297

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during integration arch/arm64/boot/dts/qcom/Makefile No Pre-existing conflict between baseline and topic branch topic/tech/all/dt/qcs8300. The PR modifies only .dtsi files (kodiak.dtsi, lemans.dtsi, monaco.dtsi) and does not touch the Makefile.

Verdict

This is not a compilation failure. The build failed during the pre-merge integration phase due to a merge conflict in arch/arm64/boot/dts/qcom/Makefile. The conflict is pre-existing and not introduced by this PR, as the PR does not modify the Makefile at all.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1297

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during topic branch integration arch/arm64/boot/dts/qcom/Makefile No Pre-existing conflict between baseline and topic branch topic/tech/all/dt/qcs8300 - PR does not modify Makefile

Verdict

This is NOT a build failure caused by the PR. The failure is a pre-existing merge conflict in the integration workflow between the baseline and topic branch topic/tech/all/dt/qcs8300.

📎 Detailed analysis: Full report

@Komal-Bajaj Komal-Bajaj merged commit aa3790e into qualcomm-linux:tech/all/dt/qcs8300 Jun 4, 2026
2 of 4 checks passed
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.

3 participants