From b8e276877a7dfdf2514913c6c1336643bd62169f Mon Sep 17 00:00:00 2001 From: "mason.huo" Date: Tue, 7 Jun 2022 11:05:52 +0800 Subject: [PATCH] media: starfive: Change the default format of scd_y pad --- drivers/media/platform/starfive/v4l2_driver/stf_isp.c | 2 +- drivers/media/platform/starfive/v4l2_driver/stf_video.c | 4 ++-- drivers/media/platform/starfive/v4l2_driver/stf_vin.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_isp.c b/drivers/media/platform/starfive/v4l2_driver/stf_isp.c index b3de7c2..ff54ab6 100644 --- a/drivers/media/platform/starfive/v4l2_driver/stf_isp.c +++ b/drivers/media/platform/starfive/v4l2_driver/stf_isp.c @@ -47,10 +47,10 @@ static const struct isp_format isp_formats_st7110_sink[] = { }; static const struct isp_format isp_formats_st7110_raw[] = { + { MEDIA_BUS_FMT_SBGGR12_1X12, 12}, { MEDIA_BUS_FMT_SRGGB12_1X12, 12}, { MEDIA_BUS_FMT_SGRBG12_1X12, 12}, { MEDIA_BUS_FMT_SGBRG12_1X12, 12}, - { MEDIA_BUS_FMT_SBGGR12_1X12, 12}, }; static const struct isp_format isp_formats_st7110_uo[] = { diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_video.c b/drivers/media/platform/starfive/v4l2_driver/stf_video.c index 117c06c..888e822 100644 --- a/drivers/media/platform/starfive/v4l2_driver/stf_video.c +++ b/drivers/media/platform/starfive/v4l2_driver/stf_video.c @@ -36,14 +36,14 @@ static const struct stfcamss_format_info formats_pix_st7110_wr[] = { }; static const struct stfcamss_format_info formats_raw_st7110_isp[] = { + { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12, 1, + { { 1, 1 } }, { { 1, 1 } }, { 12 } }, { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12, 1, { { 1, 1 } }, { { 1, 1 } }, { 12 } }, { MEDIA_BUS_FMT_SGRBG12_1X12, V4L2_PIX_FMT_SGRBG12, 1, { { 1, 1 } }, { { 1, 1 } }, { 12 } }, { MEDIA_BUS_FMT_SGBRG12_1X12, V4L2_PIX_FMT_SGBRG12, 1, { { 1, 1 } }, { { 1, 1 } }, { 12 } }, - { MEDIA_BUS_FMT_SBGGR12_1X12, V4L2_PIX_FMT_SBGGR12, 1, - { { 1, 1 } }, { { 1, 1 } }, { 12 } }, }; static const struct stfcamss_format_info formats_pix_st7110_isp[] = { diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_vin.c b/drivers/media/platform/starfive/v4l2_driver/stf_vin.c index fd09c30..d88e577 100644 --- a/drivers/media/platform/starfive/v4l2_driver/stf_vin.c +++ b/drivers/media/platform/starfive/v4l2_driver/stf_vin.c @@ -40,10 +40,10 @@ static const struct vin2_format vin2_formats_st7110[] = { }; static const struct vin2_format isp_formats_st7110_raw[] = { + { MEDIA_BUS_FMT_SBGGR12_1X12, 12}, { MEDIA_BUS_FMT_SRGGB12_1X12, 12}, { MEDIA_BUS_FMT_SGRBG12_1X12, 12}, { MEDIA_BUS_FMT_SGBRG12_1X12, 12}, - { MEDIA_BUS_FMT_SBGGR12_1X12, 12}, }; static const struct vin2_format isp_formats_st7110_uo[] = { -- 2.7.4