From patchwork Fri Oct 8 21:04:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 242551 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o98L4Kq2006633 for ; Fri, 8 Oct 2010 21:04:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759682Ab0JHVER (ORCPT ); Fri, 8 Oct 2010 17:04:17 -0400 Received: from mtaout02-winn.ispmail.ntl.com ([81.103.221.48]:11373 "EHLO mtaout02-winn.ispmail.ntl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759677Ab0JHVEQ (ORCPT ); Fri, 8 Oct 2010 17:04:16 -0400 Received: from aamtaout03-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout02-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20101008210415.BEFU7723.mtaout02-winn.ispmail.ntl.com@aamtaout03-winn.ispmail.ntl.com>; Fri, 8 Oct 2010 22:04:15 +0100 Received: from zog.reactivated.net ([86.14.215.141]) by aamtaout03-winn.ispmail.ntl.com (InterMail vG.2.02.00.01 201-2161-120-102-20060912) with ESMTP id <20101008210415.SEJG1807.aamtaout03-winn.ispmail.ntl.com@zog.reactivated.net>; Fri, 8 Oct 2010 22:04:15 +0100 Received: by zog.reactivated.net (Postfix, from userid 1000) id E85769D401B; Fri, 8 Oct 2010 22:04:12 +0100 (BST) From: Daniel Drake To: corbet@lwn.net To: mchehab@infradead.org Cc: linux-media@vger.kernel.org Subject: [PATCH 1/3] ov7670: remove QCIF mode Message-Id: <20101008210412.E85769D401B@zog.reactivated.net> Date: Fri, 8 Oct 2010 22:04:12 +0100 (BST) X-Cloudmark-Analysis: v=1.1 cv=DhNl2YeytwJssBBGe49HJX82LNDFEEVkpVB34RXKaPo= c=1 sm=0 a=e2oMtOekBKYA:10 a=Op-mwl0xAAAA:8 a=KHg6nAnxh5N69VOybbgA:9 a=Na5J6YsvIR_oHlHF23UA:7 a=HrhMLjR9wff-2J_Qg7RqP-MbJhsA:4 a=d4CUUju0HPYA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 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.3 (demeter1.kernel.org [140.211.167.41]); Fri, 08 Oct 2010 21:04:20 +0000 (UTC) diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c index a18dcd0..7017e5c 100644 --- a/drivers/media/video/ov7670.c +++ b/drivers/media/video/ov7670.c @@ -618,6 +618,7 @@ static struct ov7670_format_struct { * which is allegedly provided by the sensor. So here's the weird register * settings. */ +#if 0 static struct regval_list ov7670_qcif_regs[] = { { REG_COM3, COM3_SCALEEN|COM3_DCWEN }, { REG_COM3, COM3_DCWEN }, @@ -636,6 +637,7 @@ static struct regval_list ov7670_qcif_regs[] = { { REG_COM13, 0xc0 }, { 0xff, 0xff }, }; +#endif static struct ov7670_win_size { int width; @@ -681,7 +683,8 @@ static struct ov7670_win_size { .vstop = 494, .regs = NULL, }, - /* QCIF */ +#if 0 + /* QCIF - disabled because it only shows a small portion of sensor FOV */ { .width = QCIF_WIDTH, .height = QCIF_HEIGHT, @@ -692,6 +695,7 @@ static struct ov7670_win_size { .vstop = 494, .regs = ov7670_qcif_regs, }, +#endif }; #define N_WIN_SIZES (ARRAY_SIZE(ov7670_win_sizes))