media: qcom: camss: switch CSID to defined MIPI CSI data type IDs

Remove redefined image data type IDs taken directly from the MIPI CSI-2
specification. Non-functional change.

Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
index e26a69a454a759a6b156b8c736348a0fa4a838b6..d08117f46f3b9be007ae4a7955c077330911396a 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -17,6 +17,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
 #include <media/media-entity.h>
+#include <media/mipi-csi2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-subdev.h>
@@ -53,119 +54,119 @@ const char * const csid_testgen_modes[] = {
 static const struct csid_format_info formats_4_1[] = {
        {
                MEDIA_BUS_FMT_UYVY8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_VYUY8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_YUYV8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_YVYU8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_SBGGR8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SBGGR10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SBGGR12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_Y10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
@@ -175,147 +176,147 @@ static const struct csid_format_info formats_4_1[] = {
 static const struct csid_format_info formats_4_7[] = {
        {
                MEDIA_BUS_FMT_UYVY8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_VYUY8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_YUYV8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_YVYU8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_SBGGR8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SBGGR10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SBGGR12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SBGGR14_1X14,
-               DATA_TYPE_RAW_14BIT,
+               MIPI_CSI2_DT_RAW14,
                DECODE_FORMAT_UNCOMPRESSED_14_BIT,
                14,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG14_1X14,
-               DATA_TYPE_RAW_14BIT,
+               MIPI_CSI2_DT_RAW14,
                DECODE_FORMAT_UNCOMPRESSED_14_BIT,
                14,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG14_1X14,
-               DATA_TYPE_RAW_14BIT,
+               MIPI_CSI2_DT_RAW14,
                DECODE_FORMAT_UNCOMPRESSED_14_BIT,
                14,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB14_1X14,
-               DATA_TYPE_RAW_14BIT,
+               MIPI_CSI2_DT_RAW14,
                DECODE_FORMAT_UNCOMPRESSED_14_BIT,
                14,
                1,
        },
        {
                MEDIA_BUS_FMT_Y10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
@@ -325,154 +326,154 @@ static const struct csid_format_info formats_4_7[] = {
 static const struct csid_format_info formats_gen2[] = {
        {
                MEDIA_BUS_FMT_UYVY8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_VYUY8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_YUYV8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_YVYU8_1X16,
-               DATA_TYPE_YUV422_8BIT,
+               MIPI_CSI2_DT_YUV422_8B,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                2,
        },
        {
                MEDIA_BUS_FMT_SBGGR8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_SBGGR10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_Y8_1X8,
-               DATA_TYPE_RAW_8BIT,
+               MIPI_CSI2_DT_RAW8,
                DECODE_FORMAT_UNCOMPRESSED_8_BIT,
                8,
                1,
        },
        {
                MEDIA_BUS_FMT_Y10_1X10,
-               DATA_TYPE_RAW_10BIT,
+               MIPI_CSI2_DT_RAW10,
                DECODE_FORMAT_UNCOMPRESSED_10_BIT,
                10,
                1,
        },
        {
                MEDIA_BUS_FMT_SBGGR12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB12_1X12,
-               DATA_TYPE_RAW_12BIT,
+               MIPI_CSI2_DT_RAW12,
                DECODE_FORMAT_UNCOMPRESSED_12_BIT,
                12,
                1,
        },
        {
                MEDIA_BUS_FMT_SBGGR14_1X14,
-               DATA_TYPE_RAW_14BIT,
+               MIPI_CSI2_DT_RAW14,
                DECODE_FORMAT_UNCOMPRESSED_14_BIT,
                14,
                1,
        },
        {
                MEDIA_BUS_FMT_SGBRG14_1X14,
-               DATA_TYPE_RAW_14BIT,
+               MIPI_CSI2_DT_RAW14,
                DECODE_FORMAT_UNCOMPRESSED_14_BIT,
                14,
                1,
        },
        {
                MEDIA_BUS_FMT_SGRBG14_1X14,
-               DATA_TYPE_RAW_14BIT,
+               MIPI_CSI2_DT_RAW14,
                DECODE_FORMAT_UNCOMPRESSED_14_BIT,
                14,
                1,
        },
        {
                MEDIA_BUS_FMT_SRGGB14_1X14,
-               DATA_TYPE_RAW_14BIT,
+               MIPI_CSI2_DT_RAW14,
                DECODE_FORMAT_UNCOMPRESSED_14_BIT,
                14,
                1,

diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
index 659ffb8bb7d58c108a4110bbea5b3a42f96d922e..90b8fc5852be32d5617e9bc64458f3484d21a6e2 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csid.h
+++ b/drivers/media/platform/qcom/camss/camss-csid.h
@@ -27,29 +27,6 @@
 /* CSID hardware can demultiplex up to 4 outputs */
 #define MSM_CSID_MAX_SRC_STREAMS       4
 
-#define DATA_TYPE_EMBEDDED_DATA_8BIT   0x12
-#define DATA_TYPE_YUV420_8BIT          0x18
-#define DATA_TYPE_YUV420_10BIT         0x19
-#define DATA_TYPE_YUV420_8BIT_LEGACY   0x1a
-#define DATA_TYPE_YUV420_8BIT_SHIFTED  0x1c /* Chroma Shifted Pixel Sampling */
-#define DATA_TYPE_YUV420_10BIT_SHIFTED 0x1d /* Chroma Shifted Pixel Sampling */
-#define DATA_TYPE_YUV422_8BIT          0x1e
-#define DATA_TYPE_YUV422_10BIT         0x1f
-#define DATA_TYPE_RGB444               0x20
-#define DATA_TYPE_RGB555               0x21
-#define DATA_TYPE_RGB565               0x22
-#define DATA_TYPE_RGB666               0x23
-#define DATA_TYPE_RGB888               0x24
-#define DATA_TYPE_RAW_24BIT            0x27
-#define DATA_TYPE_RAW_6BIT             0x28
-#define DATA_TYPE_RAW_7BIT             0x29
-#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 DATA_TYPE_RAW_16BIT            0x2e
-#define DATA_TYPE_RAW_20BIT            0x2f
-
 #define CSID_RESET_TIMEOUT_MS 500
 
 enum csid_testgen_mode {