Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / include / media / davinci / vpbe_venc.h

diff --git a/include/media/davinci/vpbe_venc.h b/include/media/davinci/vpbe_venc.h
index cc78c2eb16da25a689ece25ad1dfc931c6dcf211..476fafc2f522997a0cf81d5d75aca11edb6d3701 100644 (file)
--- a/include/media/davinci/vpbe_venc.h
+++ b/include/media/davinci/vpbe_venc.h
@@ -20,7 +20,9 @@
 #include <media/v4l2-subdev.h>
 #include <media/davinci/vpbe_types.h>
 
-#define VPBE_VENC_SUBDEV_NAME "vpbe-venc"
+#define DM644X_VPBE_VENC_SUBDEV_NAME   "dm644x,vpbe-venc"
+#define DM365_VPBE_VENC_SUBDEV_NAME    "dm365,vpbe-venc"
+#define DM355_VPBE_VENC_SUBDEV_NAME    "dm355,vpbe-venc"
 
 /* venc events */
 #define VENC_END_OF_FRAME      BIT(0)
@@ -28,7 +30,6 @@
 #define VENC_SECOND_FIELD      BIT(2)
 
 struct venc_platform_data {
-       enum vpbe_version venc_type;
        int (*setup_pinmux)(enum v4l2_mbus_pixelcode if_type,
                            int field);
        int (*setup_clock)(enum vpbe_enc_timings_type type,