On Sun, Jun 02, 2013 at 10:56:22PM +0400, Sergei Shtylyov wrote: > Hello. > > On 05/24/2013 02:11 AM, Sergei Shtylyov wrote: > > >From: Vladimir Barinov <vladimir.barinov@xxxxxxxxxxxxxxxxxx> > > > >Add Renesas R-Car VIN (Video In) V4L2 driver. > > > >Based on the patch by Phil Edworthy <phil.edworthy@xxxxxxxxxxx>. > > > >Signed-off-by: Vladimir Barinov <vladimir.barinov@xxxxxxxxxxxxxxxxxx> > >[Sergei: removed deprecated IRQF_DISABLED flag, reordered/renamed 'enum chip_id' > >values, reordered rcar_vin_id_table[] entries, removed senseless parens from > >to_buf_list() macro, used ALIGN() macro in rcar_vin_setup(), added {} to the > >*if* statement and used 'bool' values instead of 0/1 where necessary, removed > >unused macros, done some reformatting and clarified some comments.] > >Signed-off-by: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx> > > > >--- > >This patch is against the 'media_tree.git' repo. > >It requires two following patches from Guennadi Liakhovetski: > > > >https://patchwork.linuxtv.org/patch/18209/ > >https://patchwork.linuxtv.org/patch/18210/ > > > > [...] > >Index: media_tree/include/linux/platform_data/camera-rcar.h > >=================================================================== > >--- /dev/null > >+++ media_tree/include/linux/platform_data/camera-rcar.h > >@@ -0,0 +1,25 @@ > >+/* > >+ * Platform data for Renesas R-Car VIN soc-camera driver > >+ * > >+ * Copyright (C) 2011-2013 Renesas Solutions Corp. > >+ * Copyright (C) 2013 Cogent Embedded, Inc., <source@xxxxxxxxxxxxxxxxxx> > >+ * > >+ * This program is free software; you can redistribute it and/or modify it > >+ * under the terms of the GNU General Public License as published by the > >+ * Free Software Foundation; either version 2 of the License, or (at your > >+ * option) any later version. > >+ */ > >+ > >+#ifndef __CAMERA_RCAR_H_ > >+#define __CAMERA_RCAR_H_ > >+ > >+#define RCAR_VIN_HSYNC_ACTIVE_LOW (1 << 0) > >+#define RCAR_VIN_VSYNC_ACTIVE_LOW (1 << 1) > >+#define RCAR_VIN_BT601 (1 << 2) > >+#define RCAR_VIN_BT656 (1 << 3) > >+ > >+struct rcar_vin_platform_data { > >+ unsigned int flags; > >+}; > >+ > >+#endif /* __CAMERA_RCAR_H_ */ > > I wonder how to deal with a cross tree dependency caused by this file. > Perhaps the VIN platform code could be merged thru the media tree (or > maybe vice versa, all patches merged thru the Renesas tree)? I am comfortable with either option with a slight preference for taking the changes through the media tree. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html