media: staging: rkisp1: rename macros 'RKISP1_DIR_*' to 'RKISP1_ISP_SD_*'

The macros 'RKISP1_DIR_*' are flags that indicate on which
pads of the isp subdevice the media bus code is supported. So the
prefix RKISP1_ISP_SD_ is better.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c
index 8ea82ed1e6448953552660211a1334f93f0da1a0..1d0b35133f65a86615c6b3ad23f256fb15e2b8eb 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-isp.c
+++ b/drivers/staging/media/rkisp1/rkisp1-isp.c
@@ -23,8 +23,8 @@
 
 #define RKISP1_ISP_DEV_NAME    RKISP1_DRIVER_NAME "_isp"
 
-#define RKISP1_DIR_SRC BIT(0)
-#define RKISP1_DIR_SINK BIT(1)
+#define RKISP1_ISP_SD_SRC BIT(0)
+#define RKISP1_ISP_SD_SINK BIT(1)
 
 /*
  * NOTE: MIPI controller and input MUX are also configured in this file.
@@ -61,119 +61,119 @@ static const struct rkisp1_isp_mbus_info rkisp1_isp_formats[] = {
        {
                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                .pixel_enc      = V4L2_PIXEL_ENC_YUV,
-               .direction      = RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SRGGB10_1X10,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW10,
                .bayer_pat      = RKISP1_RAW_RGGB,
                .bus_width      = 10,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SBGGR10_1X10,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW10,
                .bayer_pat      = RKISP1_RAW_BGGR,
                .bus_width      = 10,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SGBRG10_1X10,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW10,
                .bayer_pat      = RKISP1_RAW_GBRG,
                .bus_width      = 10,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SGRBG10_1X10,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW10,
                .bayer_pat      = RKISP1_RAW_GRBG,
                .bus_width      = 10,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SRGGB12_1X12,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW12,
                .bayer_pat      = RKISP1_RAW_RGGB,
                .bus_width      = 12,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SBGGR12_1X12,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW12,
                .bayer_pat      = RKISP1_RAW_BGGR,
                .bus_width      = 12,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SGBRG12_1X12,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW12,
                .bayer_pat      = RKISP1_RAW_GBRG,
                .bus_width      = 12,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SGRBG12_1X12,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW12,
                .bayer_pat      = RKISP1_RAW_GRBG,
                .bus_width      = 12,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SRGGB8_1X8,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW8,
                .bayer_pat      = RKISP1_RAW_RGGB,
                .bus_width      = 8,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SBGGR8_1X8,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW8,
                .bayer_pat      = RKISP1_RAW_BGGR,
                .bus_width      = 8,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SGBRG8_1X8,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW8,
                .bayer_pat      = RKISP1_RAW_GBRG,
                .bus_width      = 8,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_SGRBG8_1X8,
                .pixel_enc      = V4L2_PIXEL_ENC_BAYER,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_RAW8,
                .bayer_pat      = RKISP1_RAW_GRBG,
                .bus_width      = 8,
-               .direction      = RKISP1_DIR_SINK | RKISP1_DIR_SRC,
+               .direction      = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_YUYV8_1X16,
                .pixel_enc      = V4L2_PIXEL_ENC_YUV,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_YUV422_8b,
                .yuv_seq        = RKISP1_CIF_ISP_ACQ_PROP_YCBYCR,
                .bus_width      = 16,
-               .direction      = RKISP1_DIR_SINK,
+               .direction      = RKISP1_ISP_SD_SINK,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_YVYU8_1X16,
                .pixel_enc      = V4L2_PIXEL_ENC_YUV,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_YUV422_8b,
                .yuv_seq        = RKISP1_CIF_ISP_ACQ_PROP_YCRYCB,
                .bus_width      = 16,
-               .direction      = RKISP1_DIR_SINK,
+               .direction      = RKISP1_ISP_SD_SINK,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_UYVY8_1X16,
                .pixel_enc      = V4L2_PIXEL_ENC_YUV,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_YUV422_8b,
                .yuv_seq        = RKISP1_CIF_ISP_ACQ_PROP_CBYCRY,
                .bus_width      = 16,
-               .direction      = RKISP1_DIR_SINK,
+               .direction      = RKISP1_ISP_SD_SINK,
        }, {
                .mbus_code      = MEDIA_BUS_FMT_VYUY8_1X16,
                .pixel_enc      = V4L2_PIXEL_ENC_YUV,
                .mipi_dt        = RKISP1_CIF_CSI2_DT_YUV422_8b,
                .yuv_seq        = RKISP1_CIF_ISP_ACQ_PROP_CRYCBY,
                .bus_width      = 16,
-               .direction      = RKISP1_DIR_SINK,
+               .direction      = RKISP1_ISP_SD_SINK,
        },
 };
 
@@ -571,9 +571,9 @@ static int rkisp1_isp_enum_mbus_code(struct v4l2_subdev *sd,
        int pos = 0;
 
        if (code->pad == RKISP1_ISP_PAD_SINK_VIDEO) {
-               dir = RKISP1_DIR_SINK;
+               dir = RKISP1_ISP_SD_SINK;
        } else if (code->pad == RKISP1_ISP_PAD_SOURCE_VIDEO) {
-               dir = RKISP1_DIR_SRC;
+               dir = RKISP1_ISP_SD_SRC;
        } else {
                if (code->index > 0)
                        return -EINVAL;
@@ -658,7 +658,7 @@ static void rkisp1_isp_set_src_fmt(struct rkisp1_isp *isp,
 
        src_fmt->code = format->code;
        mbus_info = rkisp1_isp_mbus_info_get(src_fmt->code);
-       if (!mbus_info || !(mbus_info->direction & RKISP1_DIR_SRC)) {
+       if (!mbus_info || !(mbus_info->direction & RKISP1_ISP_SD_SRC)) {
                src_fmt->code = RKISP1_DEF_SRC_PAD_FMT;
                mbus_info = rkisp1_isp_mbus_info_get(src_fmt->code);
        }
@@ -742,7 +742,7 @@ static void rkisp1_isp_set_sink_fmt(struct rkisp1_isp *isp,
                                          which);
        sink_fmt->code = format->code;
        mbus_info = rkisp1_isp_mbus_info_get(sink_fmt->code);
-       if (!mbus_info || !(mbus_info->direction & RKISP1_DIR_SINK)) {
+       if (!mbus_info || !(mbus_info->direction & RKISP1_ISP_SD_SINK)) {
                sink_fmt->code = RKISP1_DEF_SINK_PAD_FMT;
                mbus_info = rkisp1_isp_mbus_info_get(sink_fmt->code);
        }