clk: qcom: gcc-shikra: Add additional frequencies for EMAC RGMII clocks

[imrashai]

Add support for 2.5MHz and 25MHz GCC EMAC RGMII clock frequencies required for EMAC 10M and 100M speeds respectively on Qualcomm Shikra SoC.

Alos, add the test_ctl_hi field fix-up for DEFAULT_EVO PLLs.

CRs-Fixed: 4635794

[qswat-orbit-external]

Merge Check Failed: CR Not Eligible for Merge

CR 4635794 is not eligible for merge.

The parent software image for kernel.qli.2.0 is not development complete.

Entity: kernel.qli.2.0
CR: 4635794
Reason: CR_CANNOT_MERGE

Please ensure the CR passes both CCT (ComponentChangeTasks) and ICT (Integration Change Tasks) validations.

[qlijarvis]

PR #911 — validate-patch

PR: #911

Verdict	Issues	Detailed Report
✅	0	Full report

Final Summary

1. Lore link present: Yes — both commits have correct Link: tags pointing to lore.kernel.org
2. Lore link matches PR commits: Yes — diff content is faithful to lore for both patches; commit messages identical except for expected UPSTREAM: prefix and maintainer Signed-off-by:
3. Upstream patch status: ✅ Upstreamed — both patches applied by maintainer Bjorn Andersson to the Qualcomm clock tree (commits 60276a9469a1 and 830ead322c39)
4. PR present in qcom-next/topics: Yes - all 2 commit(s) are present in qcom-next or topics

Verdict: ✅ — click to expand

🔍 Patch Validation Report

PR: #911
Commits: 2 patches
Verdict: ✅ PASS

---

Commit 1/2: UPSTREAM: clk: qcom: gcc-shikra: Add additional frequencies for EMAC RGMII clocks

Upstream: https://lore.kernel.org/r/20260722-b4-shikra-gcc-emac-freqs-v2-1-2e480e2de8de@oss.qualcomm.com

Commit Message

Check	Status	Note
Subject matches upstream	✅	Subject identical except for UPSTREAM: prefix
Body preserves rationale	✅	Body text matches lore patch exactly
Fixes tag present/correct	N/A	Not a fix; no Fixes tag required
Authorship preserved	✅	From: matches lore author (Imran Shaik)
Backport note	N/A	Not a backport; patch applied directly from maintainer tree
Co-developed-by usage	✅	Not used
Tested-by/Reviewed-by tags	✅	All tags preserved from lore
Link tag	✅	Correct lore link present
Signed-off-by chain	✅	Author SoB + maintainer SoB (Bjorn Andersson) present

Diff Comparison

File	Hunks	Status	Notes
drivers/clk/qcom/gcc-shikra.c	1	✅	Diff matches lore patch exactly — adds 2 frequency entries at correct location

Diff fingerprint: Identical to lore patch. Both add:

+	F(2500000, P_GPLL0_OUT_AUX2, 10, 1, 12),
+	F(25000000, P_GPLL0_OUT_AUX2, 12, 0, 0),

Upstream Patch Status

Commit	Community Verdict
clk: qcom: gcc-shikra: Add additional frequencies for EMAC RGMII clocks	✅ ACKed — Applied by Bjorn Andersson (maintainer) on 30 Jul 2026 as commit 60276a9469a1

Evidence:

• Reviewed-by: Konrad Dybcio
• Reviewed-by: Taniya Das
• Tested-by: Mohd Ayaan Anwar
• Maintainer reply: "Applied, thanks!" from Bjorn Andersson on 30 Jul 2026
• Commit SHA in maintainer tree: 60276a9469a1df6c86666ecc21fa8ad10d90e809

Integration Presence

Commit	Status
UPSTREAM: clk: qcom: gcc-shikra: Add additional frequencies for EMAC RGMII clocks	✅ Present in qcom-next — all added lines verified present

---

Commit 2/2: UPSTREAM: clk: qcom: Fix test_ctl_hi field for DEFAULT_EVO PLLs

Upstream: https://lore.kernel.org/r/20260729-pll-test-ctrl-fixup-v1-1-246d79589380@oss.qualcomm.com

Commit Message

Check	Status	Note
Subject matches upstream	✅	Subject identical except for UPSTREAM: prefix
Body preserves rationale	✅	Body text matches lore patch exactly
Fixes tag present/correct	✅	Three Fixes tags present, correctly formatted
Authorship preserved	✅	From: matches lore author (Imran Shaik)
Backport note	N/A	Not a backport; patch applied directly from maintainer tree
Co-developed-by usage	✅	Not used
Cc: stable tag	✅	Cc: stable@vger.kernel.org present as in lore
Reviewed-by tags	✅	Reviewed-by: Konrad Dybcio preserved
Link tag	✅	Correct lore link present
Signed-off-by chain	✅	Author SoB + maintainer SoB (Bjorn Andersson) present

Diff Comparison

File	Hunks	Status	Notes
drivers/clk/qcom/gcc-qcm2290.c	3	✅	All hunks match lore — replaces test_ctl_hi1_val → test_ctl_hi_val
drivers/clk/qcom/gcc-shikra.c	3	✅	All hunks match lore — replaces test_ctl_hi1_val → test_ctl_hi_val
drivers/clk/qcom/gcc-sm6115.c	3	✅	All hunks match lore — replaces test_ctl_hi1_val → test_ctl_hi_val

Diff fingerprint: Identical to lore patch. All 9 substitutions (3 per file) match exactly.

Note: PR patch applies cleanly on top of commit 1/2, so the base index for gcc-shikra.c differs from lore (which was based on an earlier tree state). This is expected and correct for a sequential PR.

Upstream Patch Status

Commit	Community Verdict
clk: qcom: Fix test_ctl_hi field for DEFAULT_EVO PLLs	✅ ACKed — Applied by Bjorn Andersson (maintainer) on 2 Aug 2026 as commit 830ead322c39

Evidence:

• Reviewed-by: Konrad Dybcio
• Maintainer reply: "Applied, thanks!" from Bjorn Andersson on 2 Aug 2026
• Commit SHA in maintainer tree: 830ead322c39c99bf972425b3c35323ec56c29de

Integration Presence

Commit	Status
UPSTREAM: clk: qcom: Fix test_ctl_hi field for DEFAULT_EVO PLLs	✅ Present in topics — exact patch-id match at 830ead322c39c99bf972425b3c35323ec56c29de

---

Overall Assessment

Issues Found

None. Both commits are faithful representations of their upstream lore sources.

Recommendation

✅ Merge as-is. Both patches:

• Match their lore sources exactly (commit message + diff)
• Have been accepted by the subsystem maintainer (Bjorn Andersson)
• Are already present in qcom-next or kernel topic branches
• Follow correct UPSTREAM: prefix conventions
• Preserve all upstream tags and authorship correctly

Final Summary

1. Lore link present: Yes — both commits have correct Link: tags pointing to lore.kernel.org
2. Lore link matches PR commits: Yes — diff content is faithful to lore for both patches; commit messages identical except for expected UPSTREAM: prefix and maintainer Signed-off-by:
3. Upstream patch status: ✅ Upstreamed — both patches applied by maintainer Bjorn Andersson to the Qualcomm clock tree (commits 60276a9469a1 and 830ead322c39)
4. PR present in qcom-next/topics: Yes — commit 1/2 present in qcom-next; commit 2/2 present in topics with exact patch-id 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: 8d5dbc1b17adf8fe86a41adcda686785e73f5414
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit	Subject	qcom-next	topics	Final
1/2	[PATCH 1/2] UPSTREAM: clk: qcom: gcc-shikra: Add additional	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present
2/2	[PATCH 2/2] UPSTREAM: clk: qcom: Fix test_ctl_hi field for	partial - subject or partial tree evidence found, but full change was not verified	present - exact patch-id match at 830ead322c39c99bf972425b3c35323ec56c29de	present

Final Status

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

[qlijarvis]

PR #911 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⚠️	1 warning (Unknown commit id in Fixes tag)
dt-binding-check	⏭️	Skipped - no binding changes
dtb-check	⏭️	Skipped - no DTS changes
sparse-check	✅	Passed
check-uapi-headers	⏭️	Skipped - no UAPI changes
check-patch-compliance	✅	Passed
tag-check	✅	Both commits have valid UPSTREAM: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #911 - UPSTREAM: clk: qcom: gcc-shikra: Add additional frequencies for EMAC RGMII clocks + Fix test_ctl_hi field for DEFAULT_EVO PLLs
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/31086872682
Target branch: qcom-6.18.y

Checker	Result	Summary
checkpatch	⚠️	1 warning (Unknown commit id in Fixes tag)
dt-binding-check	⏭️	Skipped - no binding changes
dtb-check	⏭️	Skipped - no DTS changes
sparse-check	✅	Passed
check-uapi-headers	⏭️	Skipped - no UAPI changes
check-patch-compliance	✅	Passed
tag-check	✅	Both commits have valid UPSTREAM: prefix

---

⚠️ checkpatch

Root cause: The Fixes: tag references commit 01cf3e27824d which is not present in the base branch (qcom-6.18.y) at the time of checking.

Failure details:

WARNING: Unknown commit id '01cf3e27824d', maybe rebased or not pulled?
#16: 
Fixes: 01cf3e27824d ("clk: qcom: Add Global clock controller support on Qualcomm Shikra SoC")

f143ebde68eded22c32f12b8a42972dbcb901661 total: 0 errors, 1 warnings, 0 checks, 72 lines checked

Analysis:
This is a false positive warning. The commit being fixed (01cf3e27824d) exists in the upstream kernel tree but may not yet be present in the qcom-6.18.y branch at the base SHA 8635749eab9a. This is expected behavior when backporting upstream fixes that reference commits not yet in the target branch.

The Fixes: tag is correct and should be preserved as-is because:

1. The commit 01cf3e27824d exists in the upstream kernel
2. The patch has already been merged upstream (see Link: tag pointing to lore.kernel.org)
3. The Fixes: tag is required for stable backport tracking
4. Checkpatch's "Unknown commit id" warning is informational only when the commit exists upstream

Fix: No action required. This is an informational warning, not a blocker.

Reproduce locally:

./scripts/checkpatch.pl --strict --ignore FILE_PATH_CHANGES --git 8635749eab9a..f143ebde68eded22c32f12b8a42972dbcb901661

---

✅ All other checkers

• dt-binding-check: Skipped (no Documentation/devicetree/bindings changes)
• dtb-check: Skipped (no devicetree changes)
• sparse-check: Passed (no sparse warnings introduced)
• check-uapi-headers: Skipped (no UAPI header changes)
• check-patch-compliance: Passed (both commits have valid UPSTREAM: prefix and proper Link: tags)
• tag-check: Passed (both commits start with UPSTREAM: prefix as required for non-qcom-next branches)

---

Verdict

Ready to merge. The single checkpatch warning is a false positive caused by the Fixes: tag referencing an upstream commit not yet present in the target branch. This is expected and acceptable for upstream backports. All substantive checks passed.