Add in functional logic throughout the code to support the SM8550.
Signed-off-by: Depeng Shao <quic_depengs@xxxxxxxxxxx>
---
.../media/platform/qcom/camss/camss-csid.c | 21 +++++++++++++++++++
.../qcom/camss/camss-csiphy-3ph-1-0.c | 6 ++++++
drivers/media/platform/qcom/camss/camss-vfe.c | 6 ++++++
drivers/media/platform/qcom/camss/camss.h | 1 +
4 files changed, 34 insertions(+)
diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index 858db5d4ca75..90fba25db4c6 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -1013,6 +1013,7 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
{
struct device *dev = camss->dev;
struct platform_device *pdev = to_platform_device(dev);
+ struct resource *top_res;
int i, j;
int ret;
@@ -1040,6 +1041,26 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid,
else
csid->base = csid->res->parent_dev_ops->get_base_address(camss, id)
+ VFE_480_CSID_OFFSET;
+ } else if (camss->res->version == CAMSS_8550) {
+ /* for titan 780, CSID lite registers are inside the VFE lite region,
+ * between the VFE "top" and "bus" registers. this requires
+ * VFE to be initialized before CSID
+ */
+ if (csid_is_lite(csid))
+ csid->base = csid->res->parent_dev_ops->get_base_address(camss, id);
+ else {
+ csid->base = devm_platform_ioremap_resource_byname(pdev, res->reg[0]);
+ /* CSID "top" is a new function in Titan780.
+ * CSID can connect to VFE & SFE(Sensor Front End).
+ * This connection is ontrolled by CSID "top" registers.
+ * CSID "top" registers at only one region.
+ */
+ top_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res->reg[1]);
+ csid->top_base = ioremap(top_res->start, resource_size(top_res));
+ }
+
+ if (IS_ERR(csid->base))
+ return PTR_ERR(csid->base);
} else {
csid->base = devm_platform_ioremap_resource_byname(pdev, res->reg[0]);
if (IS_ERR(csid->base))
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
index b6d5a27b94a6..53c46c2e5896 100644
--- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
@@ -631,6 +631,7 @@ static bool csiphy_is_gen2(u32 version)
case CAMSS_845:
case CAMSS_8250:
case CAMSS_8280XP:
+ case CAMSS_8550:
ret = true;
break;
}
@@ -718,6 +719,11 @@ static int csiphy_init(struct csiphy_device *csiphy)
regs->lane_regs = &lane_regs_sc8280xp[0];
regs->lane_array_size = ARRAY_SIZE(lane_regs_sc8280xp);
break;
+ case CAMSS_8550:
+ regs->lane_regs = &lane_regs_sm8550[0];
+ regs->lane_array_size = ARRAY_SIZE(lane_regs_sm8550);
+ regs->offset = 0x1000;
+ break;
default:
WARN(1, "unknown csiphy version\n");
return -ENODEV;
diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index 83c5a36d071f..479474c1cd95 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -338,6 +338,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
case CAMSS_845:
case CAMSS_8250:
case CAMSS_8280XP:
+ case CAMSS_8550:
switch (sink_code) {
case MEDIA_BUS_FMT_YUYV8_1X16:
{
@@ -408,6 +409,10 @@ int vfe_reset(struct vfe_device *vfe)
reinit_completion(&vfe->reset_complete);
+ /* The reset has been moved to csid in 8550 */
+ if (vfe->camss->res->version == CAMSS_8550)
+ return 0;
+
vfe->res->hw_ops->global_reset(vfe);
time = wait_for_completion_timeout(&vfe->reset_complete,
@@ -1695,6 +1700,7 @@ static int vfe_bpl_align(struct vfe_device *vfe)
case CAMSS_845:
case CAMSS_8250:
case CAMSS_8280XP:
+ case CAMSS_8550:
ret = 16;
break;
default:
diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
index 65fcebd42c4b..feac83510a17 100644
--- a/drivers/media/platform/qcom/camss/camss.h
+++ b/drivers/media/platform/qcom/camss/camss.h
@@ -79,6 +79,7 @@ enum camss_version {
CAMSS_845,
CAMSS_8250,
CAMSS_8280XP,
+ CAMSS_8550,
};
enum icc_count {
--
2.34.1
