From patchwork Thu Jun 23 21:53:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 914092 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5NLrOfo016112 for ; Thu, 23 Jun 2011 21:53:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933693Ab1FWVxW (ORCPT ); Thu, 23 Jun 2011 17:53:22 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:63693 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933553Ab1FWVxV (ORCPT ); Thu, 23 Jun 2011 17:53:21 -0400 Received: from axis700.grange (dslb-088-076-029-108.pools.arcor-ip.net [88.76.29.108]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MXEu5-1R5VBa2suT-00Wubs; Thu, 23 Jun 2011 23:53:12 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 2C031189B95; Thu, 23 Jun 2011 23:53:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 22904189B89; Thu, 23 Jun 2011 23:53:11 +0200 (CEST) Date: Thu, 23 Jun 2011 23:53:11 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List cc: Laurent Pinchart , sakari.ailus@maxwell.research.nokia.com, Sylwester Nawrocki , Stan , Hans Verkuil , saaguirre@ti.com, Mauro Carvalho Chehab Subject: [PATCH v3] V4L: add media bus configuration subdev operations Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:yk4uL+bujJOAw0jgVwe+xs2721rwMB++0qgZTEuBOdb mPHFjlMdHwIm86VeoQjxjmJ9cVBCgLrasPN/wzSDG3M5gqu36y U9kLBofj2QF1+rcZQl4qUmiAuddpGjAqXZJt4/FkpND/4AamA1 LdiREn2t+1yPypoAe64D3J6Pka07NCbUb8bi+/VvX8hHOpTwCM R7p4etXouEnWEOpapART6IjTb4ordSjaJ+dS3aOpNM= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 23 Jun 2011 21:53:25 +0000 (UTC) Add media bus configuration types and two subdev operations to get supported mediabus configurations and to set a specific configuration. Subdevs can support several configurations, e.g., they can send video data on 1 or several lanes, can be configured to use a specific CSI-2 channel, in such cases subdevice drivers return bitmasks with all respective bits set. When a set-configuration operation is called, it has to specify a non-ambiguous configuration. Signed-off-by: Stanimir Varbanov Signed-off-by: Guennadi Liakhovetski --- v3: addressed comments by Hans - thanks! 1. moved too big inline function into a new .c file 2. changed flags types to int, local variables to bool, added "const" 3. accepting BT.656 now too v2: 1. Removed parallel bus width flags. As Laurent correctly pointed out, bus width can be configured based on the mediabus format. 2. Removed the clock parameter for now. Passing timing information between the subdevices and the host / bridge driver is indeed necessary, but it is not yet quite clear, what is the best way to do this. This requires more thinking and can be added as an extra field to struct v4l2_mbus_config later. The argument, that "struct clk" is still platform specific is correct, but I am too tempted by the possibilities, the clkdev offers us to give up this idea immediatrely. Maybe drivers, that need such a clock, could use a platform callback to create a clock instance for them, or get a clock object from the platform with platform data. However, there are also opinions, that the clkdev API is completely unsuitable for this purpose. I'd commit this without any timing first, and consider possibilities as a second step. drivers/media/video/Makefile | 2 +- drivers/media/video/v4l2-mediabus.c | 45 ++++++++++++++++++++++++++ include/media/v4l2-mediabus.h | 59 +++++++++++++++++++++++++++++++++++ include/media/v4l2-subdev.h | 8 +++++ 4 files changed, 113 insertions(+), 1 deletions(-) create mode 100644 drivers/media/video/v4l2-mediabus.c diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index d9833f4..7adb683 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -11,7 +11,7 @@ stkwebcam-objs := stk-webcam.o stk-sensor.o omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \ - v4l2-event.o v4l2-ctrls.o v4l2-subdev.o + v4l2-event.o v4l2-ctrls.o v4l2-subdev.o v4l2-mediabus.o # V4L2 core modules diff --git a/drivers/media/video/v4l2-mediabus.c b/drivers/media/video/v4l2-mediabus.c new file mode 100644 index 0000000..c181e02 --- /dev/null +++ b/drivers/media/video/v4l2-mediabus.c @@ -0,0 +1,45 @@ +/* + * V4L2 mediabus + * + * Copyright (C) 2011, Guennadi Liakhovetski + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include + +unsigned int v4l2_mbus_config_compatible(const struct v4l2_mbus_config *cfg, + unsigned int flags) +{ + unsigned long common_flags; + bool hsync = true, vsync = true, pclk, data, mode; + bool mipi_lanes, mipi_clock; + + common_flags = cfg->flags & flags; + + switch (cfg->type) { + case V4L2_MBUS_PARALLEL: + hsync = common_flags & (V4L2_MBUS_HSYNC_ACTIVE_HIGH | + V4L2_MBUS_HSYNC_ACTIVE_LOW); + vsync = common_flags & (V4L2_MBUS_VSYNC_ACTIVE_HIGH | + V4L2_MBUS_VSYNC_ACTIVE_LOW); + case V4L2_MBUS_BT656: + pclk = common_flags & (V4L2_MBUS_PCLK_SAMPLE_RISING | + V4L2_MBUS_PCLK_SAMPLE_FALLING); + data = common_flags & (V4L2_MBUS_DATA_ACTIVE_HIGH | + V4L2_MBUS_DATA_ACTIVE_LOW); + mode = common_flags & (V4L2_MBUS_MASTER | V4L2_MBUS_SLAVE); + return (!hsync || !vsync || !pclk || !data || !mode) ? + 0 : common_flags; + case V4L2_MBUS_CSI2: + mipi_lanes = common_flags & V4L2_MBUS_CSI2_LANES; + mipi_clock = common_flags & (V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK | + V4L2_MBUS_CSI2_CONTINUOUS_CLOCK); + return (!mipi_lanes || !mipi_clock) ? 0 : common_flags; + } + return 0; +} +EXPORT_SYMBOL(v4l2_mbus_config_compatible); diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h index 971c7fa..5fb5022 100644 --- a/include/media/v4l2-mediabus.h +++ b/include/media/v4l2-mediabus.h @@ -13,6 +13,65 @@ #include +/* Parallel flags */ +/* Can the client run in master or in slave mode */ +#define V4L2_MBUS_MASTER (1 << 0) +#define V4L2_MBUS_SLAVE (1 << 1) +/* Which signal polarities it supports */ +#define V4L2_MBUS_HSYNC_ACTIVE_HIGH (1 << 2) +#define V4L2_MBUS_HSYNC_ACTIVE_LOW (1 << 3) +#define V4L2_MBUS_VSYNC_ACTIVE_HIGH (1 << 4) +#define V4L2_MBUS_VSYNC_ACTIVE_LOW (1 << 5) +#define V4L2_MBUS_PCLK_SAMPLE_RISING (1 << 6) +#define V4L2_MBUS_PCLK_SAMPLE_FALLING (1 << 7) +#define V4L2_MBUS_DATA_ACTIVE_HIGH (1 << 8) +#define V4L2_MBUS_DATA_ACTIVE_LOW (1 << 9) + +/* Serial flags */ +/* How many lanes the client can use */ +#define V4L2_MBUS_CSI2_1_LANE (1 << 0) +#define V4L2_MBUS_CSI2_2_LANE (1 << 1) +#define V4L2_MBUS_CSI2_3_LANE (1 << 2) +#define V4L2_MBUS_CSI2_4_LANE (1 << 3) +/* On which channels it can send video data */ +#define V4L2_MBUS_CSI2_CHANNEL_0 (1 << 4) +#define V4L2_MBUS_CSI2_CHANNEL_1 (1 << 5) +#define V4L2_MBUS_CSI2_CHANNEL_2 (1 << 6) +#define V4L2_MBUS_CSI2_CHANNEL_3 (1 << 7) +/* Does it support only continuous or also non-continuous clock mode */ +#define V4L2_MBUS_CSI2_CONTINUOUS_CLOCK (1 << 8) +#define V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK (1 << 9) + +#define V4L2_MBUS_CSI2_LANES (V4L2_MBUS_CSI2_1_LANE | V4L2_MBUS_CSI2_2_LANE | \ + V4L2_MBUS_CSI2_3_LANE | V4L2_MBUS_CSI2_4_LANE) +#define V4L2_MBUS_CSI2_CHANNELS (V4L2_MBUS_CSI2_CHANNEL_0 | V4L2_MBUS_CSI2_CHANNEL_1 | \ + V4L2_MBUS_CSI2_CHANNEL_2 | V4L2_MBUS_CSI2_CHANNEL_3) + +/** + * v4l2_mbus_type - media bus type + * @V4L2_MBUS_PARALLEL: parallel interface with hsync and vsync + * @V4L2_MBUS_BT656: parallel interface with embedded synchronisation + * @V4L2_MBUS_CSI2: MIPI CSI-2 serial interface + */ +enum v4l2_mbus_type { + V4L2_MBUS_PARALLEL, + V4L2_MBUS_BT656, + V4L2_MBUS_CSI2, +}; + +/** + * v4l2_mbus_config - media bus configuration + * @type: in: interface type + * @flags: in / out: configuration flags, depending on @type + */ +struct v4l2_mbus_config { + enum v4l2_mbus_type type; + unsigned int flags; +}; + +unsigned int v4l2_mbus_config_compatible(const struct v4l2_mbus_config *cfg, + unsigned int flags); + static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt, const struct v4l2_mbus_framefmt *mbus_fmt) { diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 1562c4f..aa17713 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -255,6 +255,10 @@ struct v4l2_subdev_audio_ops { try_mbus_fmt: try to set a pixel format on a video data source s_mbus_fmt: set a pixel format on a video data source + + g_mbus_config: get supported mediabus configurations + + s_mbus_config: set a certain mediabus configuration */ struct v4l2_subdev_video_ops { int (*s_routing)(struct v4l2_subdev *sd, u32 input, u32 output, u32 config); @@ -294,6 +298,10 @@ struct v4l2_subdev_video_ops { struct v4l2_mbus_framefmt *fmt); int (*s_mbus_fmt)(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt); + int (*g_mbus_config)(struct v4l2_subdev *sd, + struct v4l2_mbus_config *cfg); + int (*s_mbus_config)(struct v4l2_subdev *sd, + const struct v4l2_mbus_config *cfg); }; /*