Skip to content

FROMLIST: media: qcom: camss: add support for QCM2390 camss#1363

Merged
quic-vikramsa merged 1 commit into
qualcomm-linux:tech/mm/camssfrom
nihal231998:shikra_change
Jun 23, 2026
Merged

FROMLIST: media: qcom: camss: add support for QCM2390 camss#1363
quic-vikramsa merged 1 commit into
qualcomm-linux:tech/mm/camssfrom
nihal231998:shikra_change

Conversation

@nihal231998

Copy link
Copy Markdown

Add CAMSS driver support for Shikra SoC.
Add high level resource definitions for 2 CSIPHY, 2 CSID and
2 VFE instances along with the interconnect bandwidth votes
for AHB, HF and SF MNOC paths.

Link: https://lore.kernel.org/all/20260526-shikra-camss-review-v1-3-645d2c8c75a7@qti.qualcomm.com/

Add CAMSS driver support for Shikra SoC. Add high level
resource definitions for 2 CSIPHY, 2 CSID and 2 VFE instances along
with the interconnect bandwidth votes for AHB, HF and SF MNOC paths.

Signed-off-by: Prashant Shrotriya <pshrotri@qti.qualcomm.com>
Signed-off-by: Nihal Kumar Gupta <nihal.gupta@oss.qualcomm.com>
Link: https://lore.kernel.org/all/20260526-shikra-camss-review-v1-3-645d2c8c75a7@qti.qualcomm.com/
@qcomlnxci qcomlnxci requested review from a team, quic-vikramsa, svankada and wenmliu and removed request for a team June 15, 2026 11:05
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1363

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during integration drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c Yes PR adds CAMSS_2390 case statements that conflict with other changes in the integration branch
2 Merge conflict during integration drivers/media/platform/qcom/camss/camss-vfe.c Yes PR adds CAMSS_2390 case statement that conflicts with other changes in the integration branch
3 Merge conflict during integration drivers/media/platform/qcom/camss/camss.c Yes PR adds qcm2390_resources structure and device tree match entry that conflicts with other changes in the integration branch
4 Merge conflict during integration drivers/media/platform/qcom/camss/camss.h Yes PR adds CAMSS_2390 enum value that conflicts with other changes in the integration branch
5 Merge conflict during integration Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml No Pre-existing conflict in unrelated file (crypto bindings)
6 Merge conflict during integration arch/arm64/configs/defconfig No Pre-existing conflict in unrelated file (kernel config)
7 Merge conflict during integration drivers/soc/qcom/ice.c No Pre-existing conflict in unrelated file (ICE driver)

Verdict

4 of 7 merge conflicts are directly caused by this PR's changes to CAMSS driver files; 3 are pre-existing conflicts in unrelated subsystems.

Note: This is not a compilation failure. The build failed during the merge/integration phase before compilation could begin. The PR introduces changes that conflict with other modifications already present in the integration branch.

📎 Detailed analysis: Full report

@quic-vikramsa quic-vikramsa merged commit eb5d4eb into qualcomm-linux:tech/mm/camss Jun 23, 2026
3 of 5 checks passed
@nihal231998 nihal231998 deleted the shikra_change branch June 23, 2026 12:54
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.

4 participants