media: qcom: camss: enable vfe 690 for qcs8300

The vfe in qcs8300 is version 690, it is same as vfe used in
lemans(sa8775p). vfe gen3 have support for vfe 690.

Signed-off-by: Vikram Sharma <quic_vikramsa@quicinc.com>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-gen3.c b/drivers/media/platform/qcom/camss/camss-vfe-gen3.c
index f2001140ead12e21789db362e783331509d9b8ab..22579617def78457d057e5ba413ae481843a18ad 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-gen3.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-gen3.c
@@ -13,7 +13,8 @@
 #include "camss-vfe.h"
 
 #define IS_VFE_690(vfe) \
-           (vfe->camss->res->version == CAMSS_8775P)
+           ((vfe->camss->res->version == CAMSS_8775P) \
+           || (vfe->camss->res->version == CAMSS_8300))
 
 #define BUS_REG_BASE_690 \
            (vfe_is_lite(vfe) ? 0x480 : 0x400)

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index 3db183191b363726c37819ad491d4bef30defcd6..ee08dbbddf8897faaa9b96768ff13d3c3aed780f 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -345,6 +345,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
        case CAMSS_8x96:
        case CAMSS_8250:
        case CAMSS_8280XP:
+       case CAMSS_8300:
        case CAMSS_845:
        case CAMSS_8550:
        case CAMSS_8775P:
@@ -1992,6 +1993,7 @@ static int vfe_bpl_align(struct vfe_device *vfe)
        case CAMSS_7280:
        case CAMSS_8250:
        case CAMSS_8280XP:
+       case CAMSS_8300:
        case CAMSS_845:
        case CAMSS_8550:
        case CAMSS_8775P: