Skip to content

Add Shikra CAMSS driver and binding support #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Komal-Bajaj merged 3 commits into from
May 22, 2026
Merged

Add Shikra CAMSS driver and binding support #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ff346f
dt-bindings: media: qcom: Add Shikra CAMSS compatible
May 12, 2026
8943bc3
dt-bindings: i2c: qcom-cci: Document Shikra compatible
May 12, 2026
c491966
media: qcom: camss: add support for QCM2390 camss
pshrotri May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ properties:
- qcom,sc8280xp-cci
- qcom,sdm670-cci
- qcom,sdm845-cci
- qcom,shikra-cci
- qcom,sm6150-cci
- qcom,sm6350-cci
- qcom,sm8250-cci
Expand Down Expand Up @@ -137,6 +138,7 @@ allOf:
- qcom,kaanapali-cci
- qcom,qcm2290-cci
- qcom,qcs8300-cci
- qcom,shikra-cci
- qcom,sm8750-cci
then:
properties:
Expand Down
6 changes: 5 additions & 1 deletion Documentation/devicetree/bindings/media/qcom,qcm2290-camss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ title: Qualcomm QCM2290 Camera Subsystem (CAMSS)

maintainers:
- Loic Poulain <loic.poulain@oss.qualcomm.com>
- Nihal Kumar Gupta <nihal.gupta@oss.qualcomm.com>

description:
The CAMSS IP is a CSI decoder and ISP present on Qualcomm platforms.

properties:
compatible:
const: qcom,qcm2290-camss
enum:
- qcom,qcm2290-camss
- qcom,shikra-camss

reg:
maxItems: 9
Expand Down Expand Up @@ -76,6 +79,7 @@ properties:
- const: sf_mnoc

iommus:
minItems: 1
maxItems: 4

power-domains:
Expand Down
2 changes: 2 additions & 0 deletions drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,7 @@ static bool csiphy_is_gen2(u32 version)

switch (version) {
case CAMSS_2290:
case CAMSS_2390:
case CAMSS_6150:
case CAMSS_7280:
case CAMSS_8250:
Expand Down Expand Up @@ -1101,6 +1102,7 @@ static int csiphy_init(struct csiphy_device *csiphy)
regs->lane_array_size = ARRAY_SIZE(lane_regs_sdm845);
break;
case CAMSS_2290:
case CAMSS_2390:
case CAMSS_6150:
regs->lane_regs = &lane_regs_qcm2290[0];
regs->lane_array_size = ARRAY_SIZE(lane_regs_qcm2290);
Expand Down
1 change: 1 addition & 0 deletions drivers/media/platform/qcom/camss/camss-vfe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
break;
case CAMSS_660:
case CAMSS_2290:
case CAMSS_2390:
case CAMSS_6150:
case CAMSS_7280:
case CAMSS_8x96:
Expand Down
13 changes: 13 additions & 0 deletions drivers/media/platform/qcom/camss/camss.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5160,6 +5160,18 @@ static const struct camss_resources qcm2290_resources = {
.vfe_num = ARRAY_SIZE(vfe_res_2290),
};

static const struct camss_resources qcm2390_resources = {
Copy link
Copy Markdown

@Komal-Bajaj Komal-Bajaj May 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cannot we use same resource as qcm2290?

.version = CAMSS_2390,
.csiphy_res = csiphy_res_2290,
.csid_res = csid_res_2290,
.vfe_res = vfe_res_2290,
.icc_res = icc_res_2290,
.icc_path_num = ARRAY_SIZE(icc_res_2290),
.csiphy_num = ARRAY_SIZE(csiphy_res_2290),
.csid_num = ARRAY_SIZE(csid_res_2290),
.vfe_num = ARRAY_SIZE(vfe_res_2290),
};

static const struct camss_resources qcs8300_resources = {
.version = CAMSS_8300,
.pd_name = "top",
Expand Down Expand Up @@ -5328,6 +5340,7 @@ static const struct of_device_id camss_dt_match[] = {
{ .compatible = "qcom,sdm660-camss", .data = &sdm660_resources },
{ .compatible = "qcom,sdm670-camss", .data = &sdm670_resources },
{ .compatible = "qcom,sdm845-camss", .data = &sdm845_resources },
{ .compatible = "qcom,shikra-camss", .data = &qcm2390_resources },
Copy link
Copy Markdown

@Komal-Bajaj Komal-Bajaj May 22, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{ .compatible = "qcom,shikra-camss", .data = &qcm2290_resources },
can this be possible?

{ .compatible = "qcom,sm6150-camss", .data = &sm6150_resources },
{ .compatible = "qcom,sm8250-camss", .data = &sm8250_resources },
{ .compatible = "qcom,sm8550-camss", .data = &sm8550_resources },
Expand Down
1 change: 1 addition & 0 deletions drivers/media/platform/qcom/camss/camss.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ enum pm_domain {
enum camss_version {
CAMSS_660,
CAMSS_2290,
CAMSS_2390,
CAMSS_6150,
CAMSS_7280,
CAMSS_8x16,
Expand Down