Skip to content

Revert "media: qcom: camss: add support for QCM2390 camss" #1341

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 1 commit into from
Jun 23, 2026
+0 −17
Merged

Revert "media: qcom: camss: add support for QCM2390 camss" #1341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 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,7 +1010,6 @@ 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 @@ -1102,7 +1101,6 @@ 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: 0 additions & 1 deletion 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,7 +342,6 @@ 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: 0 additions & 13 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,18 +5160,6 @@ static const struct camss_resources qcm2290_resources = {
.vfe_num = ARRAY_SIZE(vfe_res_2290),
};

static const struct camss_resources qcm2390_resources = {
.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 @@ -5340,7 +5328,6 @@ 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 },
{ .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: 0 additions & 1 deletion 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,7 +80,6 @@ enum pm_domain {
enum camss_version {
CAMSS_660,
CAMSS_2290,
CAMSS_2390,
CAMSS_6150,
CAMSS_7280,
CAMSS_8x16,
Expand Down