media: camss: Add support for RAW MIPI14 on 8x96

Add support for RAW MIPI14 format for RDI mode on 8x96.

Signed-off-by: Todor Tomov <todor.tomov@linaro.org>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index 0715a8e326b1ef39453664bb5b84e2ad3533753a..472884d1546e23294b65e1bd0886331e7ecb3b37 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -63,11 +63,13 @@
 #define DATA_TYPE_RAW_8BIT             0x2a
 #define DATA_TYPE_RAW_10BIT            0x2b
 #define DATA_TYPE_RAW_12BIT            0x2c
+#define DATA_TYPE_RAW_14BIT            0x2d
 
 #define DECODE_FORMAT_UNCOMPRESSED_6_BIT       0x0
 #define DECODE_FORMAT_UNCOMPRESSED_8_BIT       0x1
 #define DECODE_FORMAT_UNCOMPRESSED_10_BIT      0x2
 #define DECODE_FORMAT_UNCOMPRESSED_12_BIT      0x3
+#define DECODE_FORMAT_UNCOMPRESSED_14_BIT      0x8
 
 #define CSID_RESET_TIMEOUT_MS 500
 
@@ -306,6 +308,34 @@ static const struct csid_format csid_formats_8x96[] = {
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
+       },
+       {
+               MEDIA_BUS_FMT_SBGGR14_1X14,
+               DATA_TYPE_RAW_14BIT,
+               DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+               14,
+               1,
+       },
+       {
+               MEDIA_BUS_FMT_SGBRG14_1X14,
+               DATA_TYPE_RAW_14BIT,
+               DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+               14,
+               1,
+       },
+       {
+               MEDIA_BUS_FMT_SGRBG14_1X14,
+               DATA_TYPE_RAW_14BIT,
+               DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+               14,
+               1,
+       },
+       {
+               MEDIA_BUS_FMT_SRGGB14_1X14,
+               DATA_TYPE_RAW_14BIT,
+               DECODE_FORMAT_UNCOMPRESSED_14_BIT,
+               14,
+               1,
        }
 };
 

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index 3cdab59d24f9abf90787247c93edf4f125a993cb..cae3e8b9ab37d3a74126aa8fa934e15905d9254d 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -64,6 +64,10 @@ static const struct csiphy_format csiphy_formats_8x96[] = {
        { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
        { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
        { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
+       { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
+       { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
+       { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
+       { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
 };
 
 /*

diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c
index 81d6351c54c658c7b33b26fc79369f5cafbb3192..3e2f34148977794498d9698c7d26390992dd4ff8 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-ispif.c
+++ b/drivers/media/platform/qcom/camss/camss-ispif.c
@@ -140,6 +140,10 @@ static const u32 ispif_formats_8x96[] = {
        MEDIA_BUS_FMT_SGBRG12_1X12,
        MEDIA_BUS_FMT_SGRBG12_1X12,
        MEDIA_BUS_FMT_SRGGB12_1X12,
+       MEDIA_BUS_FMT_SBGGR14_1X14,
+       MEDIA_BUS_FMT_SGBRG14_1X14,
+       MEDIA_BUS_FMT_SGRBG14_1X14,
+       MEDIA_BUS_FMT_SRGGB14_1X14,
 };
 
 /*

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index 11d37b78c3cdcc2ea76764a253b34059d4c93fb0..96753090e07200073a6d08728bc8469de509bc7a 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -94,6 +94,10 @@ static const struct vfe_format formats_rdi_8x96[] = {
        { MEDIA_BUS_FMT_SGBRG12_1X12, 12 },
        { MEDIA_BUS_FMT_SGRBG12_1X12, 12 },
        { MEDIA_BUS_FMT_SRGGB12_1X12, 12 },
+       { MEDIA_BUS_FMT_SBGGR14_1X14, 14 },
+       { MEDIA_BUS_FMT_SGBRG14_1X14, 14 },
+       { MEDIA_BUS_FMT_SGRBG14_1X14, 14 },
+       { MEDIA_BUS_FMT_SRGGB14_1X14, 14 },
 };
 
 static const struct vfe_format formats_pix_8x96[] = {

diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
index 28d53bf4c7845bc16fff744f9271a1e1780a21e1..2e19bc8c4161bcccf7a37c990b53bba8b0cc200e 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-video.c
+++ b/drivers/media/platform/qcom/camss/camss-video.c
@@ -111,6 +111,14 @@ static const struct camss_format_info formats_rdi_8x96[] = {
          { { 1, 1 } }, { { 1, 1 } }, { 12 } },
        { MEDIA_BUS_FMT_SRGGB12_1X12, V4L2_PIX_FMT_SRGGB12P, 1,
          { { 1, 1 } }, { { 1, 1 } }, { 12 } },
+       { MEDIA_BUS_FMT_SBGGR14_1X14, V4L2_PIX_FMT_SBGGR14P, 1,
+         { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+       { MEDIA_BUS_FMT_SGBRG14_1X14, V4L2_PIX_FMT_SGBRG14P, 1,
+         { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+       { MEDIA_BUS_FMT_SGRBG14_1X14, V4L2_PIX_FMT_SGRBG14P, 1,
+         { { 1, 1 } }, { { 1, 1 } }, { 14 } },
+       { MEDIA_BUS_FMT_SRGGB14_1X14, V4L2_PIX_FMT_SRGGB14P, 1,
+         { { 1, 1 } }, { { 1, 1 } }, { 14 } },
 };
 
 static const struct camss_format_info formats_pix_8x16[] = {