From patchwork Mon Jun 6 17:17:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 852842 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p56HHvrr015353 for ; Mon, 6 Jun 2011 17:17:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756148Ab1FFRRz (ORCPT ); Mon, 6 Jun 2011 13:17:55 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:64952 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753601Ab1FFRRz (ORCPT ); Mon, 6 Jun 2011 13:17:55 -0400 Received: from axis700.grange (dslb-178-006-245-001.pools.arcor-ip.net [178.6.245.1]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0M40UE-1PdakN3UtG-00rVte; Mon, 06 Jun 2011 19:17:54 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 5BE9A189B78; Mon, 6 Jun 2011 19:17:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 599DE189B77 for ; Mon, 6 Jun 2011 19:17:53 +0200 (CEST) Date: Mon, 6 Jun 2011 19:17:53 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List Subject: [PATCH] V4L: soc-camera: MIPI flags are not sensor flags Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:d8dTJh+syOzkYNpw6rHJKdG11MCtt6OZvuvu+68Fw9R Wh0KHkTzvxaOevpuFGCP4fpJ0y8PByiJTSYH8dt55cm7J8tjX+ LGvDeXtxbK6eN+iKkDVHRWrlqH8CJbECaw8Gmx4yDLDx+4jkLx 91EYqfG19N8vFLyxlVfq/7Xqi7AL7BujbRRbukaNPl4mcB2xyP qnU8BH12XeYSl95xXvG2IIACWs1e4GI8Lj7CC/crJw= 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]); Mon, 06 Jun 2011 17:17:57 +0000 (UTC) SOCAM_MIPI_[1234]LANE flags are not board-specific sensor flags, they are bus configuration flags. Signed-off-by: Guennadi Liakhovetski --- include/media/soc_camera.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 238bd33..e34b5e6 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h @@ -109,12 +109,6 @@ struct soc_camera_host_ops { #define SOCAM_SENSOR_INVERT_HSYNC (1 << 2) #define SOCAM_SENSOR_INVERT_VSYNC (1 << 3) #define SOCAM_SENSOR_INVERT_DATA (1 << 4) -#define SOCAM_MIPI_1LANE (1 << 5) -#define SOCAM_MIPI_2LANE (1 << 6) -#define SOCAM_MIPI_3LANE (1 << 7) -#define SOCAM_MIPI_4LANE (1 << 8) -#define SOCAM_MIPI (SOCAM_MIPI_1LANE | SOCAM_MIPI_2LANE | \ - SOCAM_MIPI_3LANE | SOCAM_MIPI_4LANE) struct i2c_board_info; struct regulator_bulk_data; @@ -270,6 +264,12 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl( #define SOCAM_PCLK_SAMPLE_FALLING (1 << 13) #define SOCAM_DATA_ACTIVE_HIGH (1 << 14) #define SOCAM_DATA_ACTIVE_LOW (1 << 15) +#define SOCAM_MIPI_1LANE (1 << 16) +#define SOCAM_MIPI_2LANE (1 << 17) +#define SOCAM_MIPI_3LANE (1 << 18) +#define SOCAM_MIPI_4LANE (1 << 19) +#define SOCAM_MIPI (SOCAM_MIPI_1LANE | SOCAM_MIPI_2LANE | \ + SOCAM_MIPI_3LANE | SOCAM_MIPI_4LANE) #define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \ SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \