Message ID | 20220522162802.208275-4-luca@z3ntu.xyz |
---|---|
State | New |
Headers | show |
Series | CAMSS support for MSM8974 | expand |
On Sun, 22 May 2022 at 18:28, Luca Weiss <luca@z3ntu.xyz> wrote: > > From: Matti Lehtimäki <matti.lehtimaki@gmail.com> > > VFE hardware modules on 8x74 and 8x16 are similar. > > Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com> > Signed-off-by: Luca Weiss <luca@z3ntu.xyz> > --- > drivers/media/platform/qcom/camss/camss-vfe.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c > index 5b148e9f8134..ace53ed24884 100644 > --- a/drivers/media/platform/qcom/camss/camss-vfe.c > +++ b/drivers/media/platform/qcom/camss/camss-vfe.c > @@ -170,7 +170,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code, > { > struct vfe_device *vfe = to_vfe(line); > > - if (vfe->camss->version == CAMSS_8x16) > + if (vfe->camss->version == CAMSS_8x16 || > + vfe->camss->version == CAMSS_8x74) Match indentation of previous line. CHECK: Alignment should match open parenthesis #27: FILE: drivers/media/platform/qcom/camss/camss-vfe.c:174: + if (vfe->camss->version == CAMSS_8x16 || + vfe->camss->version == CAMSS_8x74) > switch (sink_code) { > case MEDIA_BUS_FMT_YUYV8_2X8: > { > @@ -1286,6 +1287,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, > > switch (camss->version) { > case CAMSS_8x16: > + case CAMSS_8x74: > vfe->ops = &vfe_ops_4_1; > break; > case CAMSS_8x96: > @@ -1390,7 +1392,8 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, > init_completion(&l->output.sof); > init_completion(&l->output.reg_update); > > - if (camss->version == CAMSS_8x16) { > + if (camss->version == CAMSS_8x16 || > + camss->version == CAMSS_8x74) { Same > if (i == VFE_LINE_PIX) { > l->formats = formats_pix_8x16; > l->nformats = ARRAY_SIZE(formats_pix_8x16); > -- > 2.36.0 > With that fixed: Reviewed-by: Robert Foss <robert.foss@linaro.org>
diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c index 5b148e9f8134..ace53ed24884 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -170,7 +170,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code, { struct vfe_device *vfe = to_vfe(line); - if (vfe->camss->version == CAMSS_8x16) + if (vfe->camss->version == CAMSS_8x16 || + vfe->camss->version == CAMSS_8x74) switch (sink_code) { case MEDIA_BUS_FMT_YUYV8_2X8: { @@ -1286,6 +1287,7 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, switch (camss->version) { case CAMSS_8x16: + case CAMSS_8x74: vfe->ops = &vfe_ops_4_1; break; case CAMSS_8x96: @@ -1390,7 +1392,8 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, init_completion(&l->output.sof); init_completion(&l->output.reg_update); - if (camss->version == CAMSS_8x16) { + if (camss->version == CAMSS_8x16 || + camss->version == CAMSS_8x74) { if (i == VFE_LINE_PIX) { l->formats = formats_pix_8x16; l->nformats = ARRAY_SIZE(formats_pix_8x16);