[media] v4l2: blackfin: add EPPI3 support

Bf60x soc has a new PPI called Enhanced PPI version 3.
HD video is supported now. To achieve this, we redesign
ppi params and add dv timings feature.

Signed-off-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 30 insertions, 8 deletions

diff --git a/include/media/blackfin/bfin_capture.h b/include/media/blackfin/bfin_capture.h
index 2038a8a3f8aa..56b9ce4472fc 100644
--- a/include/media/blackfin/bfin_capture.h
+++ b/include/media/blackfin/bfin_capture.h
@@ -9,6 +9,7 @@ struct ppi_info;
 struct bcap_route {
         u32 input;
         u32 output;
+        u32 ppi_control;
 };
 
 struct bfin_capture_config {
@@ -30,8 +31,8 @@ struct bfin_capture_config {
         unsigned long ppi_control;
         /* ppi interrupt mask */
         u32 int_mask;
-        /* horizontal blanking clocks */
-        int blank_clocks;
+        /* horizontal blanking pixels */
+        int blank_pixels;
 };
 
 #endif
diff --git a/include/media/blackfin/ppi.h b/include/media/blackfin/ppi.h
index 8f72f8a0b3d0..65c467576b31 100644
--- a/include/media/blackfin/ppi.h
+++ b/include/media/blackfin/ppi.h
@@ -21,22 +21,42 @@
 #define _PPI_H_
 
 #include <linux/interrupt.h>
+#include <asm/blackfin.h>
+#include <asm/bfin_ppi.h>
 
+/* EPPI */
 #ifdef EPPI_EN
 #define PORT_EN EPPI_EN
+#define PORT_DIR EPPI_DIR
 #define DMA32 0
 #define PACK_EN PACKEN
 #endif
 
+/* EPPI3 */
+#ifdef EPPI0_CTL2
+#define PORT_EN EPPI_CTL_EN
+#define PORT_DIR EPPI_CTL_DIR
+#define PACK_EN EPPI_CTL_PACKEN
+#define DMA32 0
+#define DLEN_8 EPPI_CTL_DLEN08
+#define DLEN_16 EPPI_CTL_DLEN16
+#endif
+
 struct ppi_if;
 
 struct ppi_params {
-        int width;
-        int height;
-        int bpp;
-        unsigned long ppi_control;
-        u32 int_mask;
-        int blank_clocks;
+        u32 width;              /* width in pixels */
+        u32 height;             /* height in lines */
+        u32 hdelay;             /* delay after the HSYNC in pixels */
+        u32 vdelay;             /* delay after the VSYNC in lines */
+        u32 line;               /* total pixels per line */
+        u32 frame;              /* total lines per frame */
+        u32 hsync;              /* HSYNC length in pixels */
+        u32 vsync;              /* VSYNC length in lines */
+        int bpp;                /* bits per pixel */
+        int dlen;               /* data length for ppi in bits */
+        u32 ppi_control;        /* ppi configuration */
+        u32 int_mask;           /* interrupt mask */
 };
 
 struct ppi_ops {
@@ -51,6 +71,7 @@ struct ppi_ops {
 enum ppi_type {
         PPI_TYPE_PPI,
         PPI_TYPE_EPPI,
+        PPI_TYPE_EPPI3,
 };
 
 struct ppi_info {