arm64: dts: qcom: shikra: Porting missing pmic changes from qcom-next

[raryan-qcom]

Porting missing pmic changes from qcom-next.
CRs-Fixed: 4562473

[qswat-orbit-external]

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

[qlijarvis]

PR #666 — validate-patch

PR: #666

Verdict	Issues	Detailed Report
❌	10	Full report

Final Summary

1. Lore link present: No — no lore.kernel.org links in any commit message
2. Lore link matches PR commits: N/A — no lore link to compare against
3. Upstream patch status: Not upstream — appears to be vendor-specific Shikra board enablement
4. PR present in qcom-next: Not checked — no upstream reference to verify

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #666 - Shikra device tree updates (PMIC, thermal, USB-C support)
Upstream commit: N/A
Verdict: ❌ FAIL

Commit Message

Check	Status	Note
Subject matches upstream	N/A	No upstream reference provided
Body preserves rationale	⚠️	Patch 2 commit message contradicts actual changes
Fixes tag present/correct	N/A	No Fixes tags; not fixing upstream bugs
Authorship preserved	✅	Consistent author across all patches
Backport note (if applicable)	N/A	Not a backport

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi:1	✅	Adds pm4125_s1 regulator correctly
arch/arm64/boot/dts/qcom/pm4125.dtsi:2	✅	Removes fallback compatible correctly
arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi:2	❌	Adds microvolt properties that are removed in patch 4
arch/arm64/boot/dts/qcom/pm4125.dtsi:3	✅	Adds temp-alarm and ADC nodes correctly
arch/arm64/boot/dts/qcom/pm8005.dtsi:3	✅	Adds temp-alarm node correctly
arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi:3	✅	Adds thermal zones and ADC channels correctly
arch/arm64/boot/dts/qcom/shikra-iqs-som.dtsi:3	✅	Adds ADC and thermal support correctly
arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi:4	❌	Replaces microvolt with microamp (contradicts patch 2)
arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts:4	✅	Enables USB-C port handling correctly
arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts:4	✅	Enables USB-C port handling correctly

Issues

Critical: Patch 2 commit message is incorrect

• Patch 2 subject: "Fix pm4125 vbus regulator compatible and constraints"
• Patch 2 body states: "fix regulator constraints in shikra SOM DTS files to use microvolt instead of microamp"
• Patch 2 adds: regulator-min-microvolt = <4250000>; regulator-max-microvolt = <5000000>;
• Patch 4 removes those lines and adds: regulator-min-microamp = <500000>; regulator-max-microamp = <500000>;
• Result: The final code uses microamp, NOT microvolt as claimed in patch 2's commit message

Logical issue: Patch series introduces then removes code

• Patch 2 adds pm4125_vbus voltage constraints that are completely replaced in patch 4
• This suggests the patches were not properly rebased or squashed before submission
• The intermediate state (after patch 2, before patch 4) would have incorrect regulator properties

Minor: Patch 3 commit message could be more precise

• States "Switch SPMI interrupt to MPM edge-triggered" but the diff shows these are new nodes being added, not existing interrupts being switched
• More accurate would be: "Add SPMI temp-alarm and ADC nodes with edge-triggered interrupts"

Verdict

Reject and request rebase. Patch 2's commit message is factually incorrect (claims to use microvolt but final result uses microamp). The patch series should be rebased to either: (1) remove the voltage properties from patch 2 entirely, or (2) update patch 2's commit message to accurately describe what it does, and explain why patch 4 changes the approach.

Final Summary

1. Lore link present: No — no lore.kernel.org links in any commit message
2. Lore link matches PR commits: N/A — no lore link to compare against
3. Upstream patch status: Not upstream — appears to be vendor-specific Shikra board enablement
4. PR present in qcom-next: Not checked — no upstream reference to verify

[qlijarvis]

PR #666 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	1 CHECK warning: missing blank line after closing brace
dt-binding-check	⏭️	Skipped (no binding changes)
dtb-check	❌	Missing USB device tree labels (usb_1, usb_1_dwc3_hs, usb_1_hsphy, usb_qmpphy_out)
sparse-check	⏭️	Skipped (no C code changes)
check-uapi-headers	⏭️	Skipped (no UAPI changes)
check-patch-compliance	❌	All 4 commits missing required FROMLIST:/UPSTREAM:/BACKPORT: prefix
tag-check	N/A	Not applicable for this branch
qcom-next-check	N/A	Not applicable for this branch

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #666 - Shikra device tree updates (pm4125 regulators, PMIC thermal/ADC, USB-C)
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/27029919535

Checker	Result	Summary
checkpatch	❌	1 CHECK warning: missing blank line after closing brace
dt-binding-check	⏭️	Skipped (no binding changes)
dtb-check	❌	Missing USB device tree labels (usb_1, usb_1_dwc3_hs, usb_1_hsphy, usb_qmpphy_out)
sparse-check	⏭️	Skipped (no C code changes)
check-uapi-headers	⏭️	Skipped (no UAPI changes)
check-patch-compliance	❌	All 4 commits missing required FROMLIST:/UPSTREAM:/BACKPORT: prefix
tag-check	N/A	Not applicable for this branch
qcom-next-check	N/A	Not applicable for this branch

---

❌ checkpatch

Root cause: Missing blank line between closing brace and next device tree node reference in arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts:54

Failure details:

CHECK: Please use a blank line after function/struct/union/enum declarations
#161: FILE: arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts:54:
+};
+&remoteproc_lpaicp {

Fix: Add a blank line between the closing brace of the &sdhc_2 node and the &remoteproc_lpaicp node reference in commit 4/4.

Reproduce locally:

./scripts/checkpatch.pl --strict --summary-file --ignore FILE_PATH_CHANGES --git 997c1ece634c8c755c970af6895dba3a6c5e204a..ab509b86be6cc388c0977f3a38ccd85277a6cc76

---

❌ dtb-check

Root cause: Patch 4/4 references USB device tree labels that don't exist in the base tree, causing DTC compilation failures for both shikra-cqm-evk.dtb and shikra-cqs-evk.dtb.

Failure details:

Error: ../arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts:68.1-7 Label or path usb_1 not found
Error: ../arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts:73.1-15 Label or path usb_1_dwc3_hs not found
Error: ../arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts:77.1-13 Label or path usb_1_hsphy not found
Error: ../arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts:106.1-16 Label or path usb_qmpphy_out not found
FATAL ERROR: Syntax error parsing input tree

Error: ../arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts:66.1-7 Label or path usb_1 not found
Error: ../arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts:71.1-15 Label or path usb_1_dwc3_hs not found
Error: ../arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts:75.1-13 Label or path usb_1_hsphy not found
Error: ../arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts:104.1-16 Label or path usb_qmpphy_out not found
FATAL ERROR: Syntax error parsing input tree

Fix: This PR depends on USB controller device tree nodes that haven't been merged yet. You need to either:

1. Merge the prerequisite USB controller patches first (that define usb_1, usb_1_dwc3_hs, usb_1_hsphy, usb_qmpphy_out labels), OR
2. Include those USB controller definitions in this PR series before patch 4/4, OR
3. Remove patch 4/4 from this series and submit it separately after the USB controller support is merged

Reproduce locally:

make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- qcom/shikra-cqm-evk.dtb
make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- qcom/shikra-cqs-evk.dtb

---

❌ check-patch-compliance

Root cause: All 4 commits in the series lack the required subject prefix (FROMLIST:, UPSTREAM:, or BACKPORT:) that indicates their upstream status.

Failure details:

Checking commit: arm64: dts: qcom: shikra: Add pm4125 s1 regulator
Commit summary does not start with a required prefix

Checking commit: arm64: dts: qcom: Fix pm4125 vbus regulator compatible and constraints
Commit summary does not start with a required prefix

Checking commit: arm64: dts: qcom: shikra: Add PMIC thermal and ADC support
Commit summary does not start with a required prefix

Checking commit: arm64: dts: qcom: shikra: enable USB-C port handling
Commit summary does not start with a required prefix

Fix: Add the appropriate prefix to each commit subject:

• If these patches are posted to upstream mailing lists but not yet merged: use FROMLIST:
• If these patches are already merged in mainline/stable: use UPSTREAM: or BACKPORT:
• If these are Qualcomm-internal patches: this checker may not apply to your target branch

Example:

FROMLIST: arm64: dts: qcom: shikra: Add pm4125 s1 regulator

Reproduce locally:

# Check if your branch requires these prefixes
git log --oneline --grep="FROMLIST\|UPSTREAM\|BACKPORT" | head -20

---

Verdict

3 blockers must be fixed before merge:

1. dtb-check (CRITICAL): Missing USB controller dependencies - DTBs fail to compile. This is a hard blocker that prevents the kernel from building.
2. check-patch-compliance: Missing commit subject prefixes - may be required depending on target branch policy.
3. checkpatch: Minor style issue - missing blank line between DT nodes.

Recommended action: Fix the USB dependency issue first (either by adding prerequisite patches or removing patch 4/4), then address the style and compliance issues.

[qswat-orbit-external]

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

[qswat-orbit-external]

Merge Check Failed: CR Not Eligible for Merge

CR 4562473 is not eligible for merge.

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

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

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

[raryan-qcom]

I took usb changes from Krishna as our changes were dependent on that.
commit-ID- 8d3c2c7
Subject: arm64: dts: qcom: Add USB changes for Shikra

[raryan-qcom]

I have created the CR and have set the devComplete and also set complete in release notes. but it still giving error. Requesting for clarification/ override.
CRs-Fixed: 4562473

[qswat-orbit-external]

Merge Check Failed: CR Not Eligible for Merge

CR 4562473 is not eligible for merge.

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

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

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