Commit 70524567 authored by Robert Foss's avatar Robert Foss Committed by Mauro Carvalho Chehab
Browse files

media: camss: Enable SDM845 



Enable support for SDM845 based Titan 170 ISPs.

Signed-off-by: default avatarRobert Foss <robert.foss@linaro.org>
Reviewed-by: default avatarAndrey Konovalov <andrey.konovalov@linaro.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 2f6f8af6

drivers/media/platform/qcom/camss/camss.c

+17 −0
Original line number Diff line number Diff line
@@ -939,6 +939,12 @@ static int camss_init_subdevices(struct camss *camss) 
		csid_res = csid_res_660;

		ispif_res = &ispif_res_660;

		vfe_res = vfe_res_660;

	}  else if (camss->version == CAMSS_845) {

		csiphy_res = csiphy_res_845;

		csid_res = csid_res_845;

		/* Titan VFEs don't have an ISPIF  */

		ispif_res = NULL;

		vfe_res = vfe_res_845;

	} else {

		return -EINVAL;

	}
@@ -1244,6 +1250,8 @@ static int camss_configure_pd(struct camss *camss) 
	if (camss->version == CAMSS_8x96 ||

	    camss->version == CAMSS_660)

		nbr_pm_domains = PM_DOMAIN_GEN1_COUNT;

	else if (camss->version == CAMSS_845)

		nbr_pm_domains = PM_DOMAIN_GEN2_COUNT;



	for (i = 0; i < nbr_pm_domains; i++) {

		camss->genpd[i] = dev_pm_domain_attach_by_id(camss->dev, i);
@@ -1312,6 +1320,12 @@ static int camss_probe(struct platform_device *pdev) 
		camss->csiphy_num = 3;

		camss->csid_num = 4;

		camss->vfe_num = 2;

	} else if (of_device_is_compatible(dev->of_node,

					   "qcom,sdm845-camss")) {

		camss->version = CAMSS_845;

		camss->csiphy_num = 4;

		camss->csid_num = 3;

		camss->vfe_num = 3;

	} else {

		ret = -EINVAL;

		goto err_free;
@@ -1443,6 +1457,8 @@ void camss_delete(struct camss *camss) 
	if (camss->version == CAMSS_8x96 ||

	    camss->version == CAMSS_660)

		nbr_pm_domains = PM_DOMAIN_GEN1_COUNT;

	else if (camss->version == CAMSS_845)

		nbr_pm_domains = PM_DOMAIN_GEN2_COUNT;



	for (i = 0; i < nbr_pm_domains; i++) {

		device_link_del(camss->genpd_link[i]);
@@ -1476,6 +1492,7 @@ static const struct of_device_id camss_dt_match[] = { 
	{ .compatible = "qcom,msm8916-camss" },

	{ .compatible = "qcom,msm8996-camss" },

	{ .compatible = "qcom,sdm660-camss" },

	{ .compatible = "qcom,sdm845-camss" },

	{ }

};

drivers/media/platform/qcom/camss/camss.h

+4 −2
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ enum pm_domain { 
	PM_DOMAIN_VFE0 = 0,

	PM_DOMAIN_VFE1 = 1,

	PM_DOMAIN_GEN1_COUNT = 2,	/* CAMSS series of ISPs */

	PM_DOMAIN_VFELITE = 2,		/* VFELITE / TOP GDSC */

	PM_DOMAIN_GEN2_COUNT = 3,	/* Titan series of ISPs */

};



enum camss_version {
@@ -83,8 +85,8 @@ struct camss { 
	int vfe_num;

	struct vfe_device *vfe;

	atomic_t ref_count;

	struct device *genpd[PM_DOMAIN_GEN1_COUNT];

	struct device_link *genpd_link[PM_DOMAIN_GEN1_COUNT];

	struct device *genpd[PM_DOMAIN_GEN2_COUNT];

	struct device_link *genpd_link[PM_DOMAIN_GEN2_COUNT];

};



struct camss_camera_interface {