[media] v4l: omap4iss: isif: Define more VDINT registers

Use a macro to get the VDINT indexed registers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/staging/media/omap4iss/iss_ipipeif.c b/drivers/staging/media/omap4iss/iss_ipipeif.c
index e96040fe0b9533142222f88adbf9e325e739d17e..5464742e76ff2d1ebf445736a454e8ecfec0bcb9 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_ipipeif.c
+++ b/drivers/staging/media/omap4iss/iss_ipipeif.c
@@ -67,7 +67,7 @@ static void ipipeif_print_status(struct iss_ipipeif_device *ipipeif)
        ISIF_PRINT_REGISTER(iss, SPH);
        ISIF_PRINT_REGISTER(iss, LNH);
        ISIF_PRINT_REGISTER(iss, LNV);
-       ISIF_PRINT_REGISTER(iss, VDINT0);
+       ISIF_PRINT_REGISTER(iss, VDINT(0));
        ISIF_PRINT_REGISTER(iss, HSIZE);
 
        ISP5_PRINT_REGISTER(iss, SYSCONFIG);
@@ -213,7 +213,7 @@ cont_raw:
 
        /* Generate ISIF0 on the last line of the image */
        writel(format->height - 1,
-               iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_VDINT0);
+               iss->regs[OMAP4_ISS_MEM_ISP_ISIF] + ISIF_VDINT(0));
 
        /* IPIPEIF_PAD_SOURCE_ISIF_SF */
        format = &ipipeif->formats[IPIPEIF_PAD_SOURCE_ISIF_SF];

diff --git a/drivers/staging/media/omap4iss/iss_regs.h b/drivers/staging/media/omap4iss/iss_regs.h
index 16975ca44246a46ea18592dd9fbbc8db230552c3..d9693519b6255e4dc8c28ffe2a00ceb6370881b4 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_regs.h
+++ b/drivers/staging/media/omap4iss/iss_regs.h
@@ -363,8 +363,8 @@
 #define ISIF_CCOLP_CP3_F0_B                            (3 << 0)
 #define ISIF_CCOLP_CP3_F0_GB                           (2 << 0)
 
-#define ISIF_VDINT0                                    (0x0070)
-#define ISIF_VDINT0_MASK                               (0x7FFF)
+#define ISIF_VDINT(i)                                  (0x0070 + (i) * 4)
+#define ISIF_VDINT_MASK                                        (0x7fff)
 
 #define ISIF_CGAMMAWD                                  (0x0080)
 #define ISIF_CGAMMAWD_GWDI_MASK                                (0xF << 1)