From patchwork Thu Oct 15 14:43:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: santiago.nunez@ridgerun.com X-Patchwork-Id: 54024 Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9FEkA4x001781 for ; Thu, 15 Oct 2009 14:46:10 GMT Received: from dlep36.itg.ti.com ([157.170.170.91]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id n9FEhkSO021537 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 15 Oct 2009 09:43:46 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id n9FEhk2D017842; Thu, 15 Oct 2009 09:43:46 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 68C8C80628; Thu, 15 Oct 2009 09:43:46 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 4D59080626 for ; Thu, 15 Oct 2009 09:43:43 -0500 (CDT) Received: from medina.ext.ti.com (localhost [127.0.0.1]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id n9FEhgvB001391 for ; Thu, 15 Oct 2009 09:43:42 -0500 (CDT) Received: from mail178-tx2-R.bigfish.com (mail-tx2.bigfish.com [65.55.88.114]) by medina.ext.ti.com (8.13.7/8.13.7) with ESMTP id n9FEhguG017329 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 15 Oct 2009 09:43:42 -0500 Received: from mail178-tx2 (localhost.localdomain [127.0.0.1]) by mail178-tx2-R.bigfish.com (Postfix) with ESMTP id A7008F0015B for ; Thu, 15 Oct 2009 14:43:40 +0000 (UTC) X-SpamScore: 7 X-BigFish: vps7(zza4b1ozz1202hzzz2fh6bh63h) X-Spam-TCS-SCL: 2:0 X-FB-SS: 5, X-MS-Exchange-Organization-Antispam-Report: OrigIP: 74.208.67.6; Service: EHS Received: by mail178-tx2 (MessageSwitch) id 1255617810790865_27337; Thu, 15 Oct 2009 14:43:30 +0000 (UCT) Received: from TX2EHSMHS020.bigfish.com (unknown [10.9.14.248]) by mail178-tx2.bigfish.com (Postfix) with ESMTP id EC54013E807A; Thu, 15 Oct 2009 14:43:28 +0000 (UTC) Received: from mail.navvo.net (74.208.67.6) by TX2EHSMHS020.bigfish.com (10.9.99.120) with Microsoft SMTP Server (TLS) id 14.0.482.32; Thu, 15 Oct 2009 14:43:23 +0000 Received: from [200.122.155.113] (helo=localhost.localdomain) by mail.navvo.net with esmtpa (Exim 4.63) (envelope-from ) id 1MyRY1-0001iP-Gh; Thu, 15 Oct 2009 09:43:23 -0500 From: To: davinci-linux-open-source@linux.davincidsp.com Date: Thu, 15 Oct 2009 08:43:28 -0600 Message-ID: <1255617808-1429-1-git-send-email-santiago.nunez@ridgerun.com> X-Mailer: git-send-email 1.6.0.4 X-SA-Exim-Connect-IP: 200.122.155.113 X-SA-Exim-Mail-From: santiago.nunez@ridgerun.com X-Spam-Checker-Version: SpamAssassin 3.1.7-deb (2006-10-05) on mail.navvo.net X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, NO_REAL_NAME autolearn=ham version=3.1.7-deb X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000) X-SA-Exim-Scanned: Yes (on mail.navvo.net) MIME-Version: 1.0 X-Reverse-DNS: mail.navvo.net Cc: Santiago Nunez-Corrales , todd.fischer@ridgerun.com, linux-media@vger.kernel.org Subject: [PATCH 3/6 v5] Support for TVP7002 in VPFE X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.4 Precedence: list List-Id: davinci-linux-open-source.linux.davincidsp.com List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index 402ce43..4820091 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/video/davinci/vpfe_capture.c @@ -73,6 +73,7 @@ #include #include #include +#include #include #include "ccdc_hw_device.h" @@ -131,6 +132,14 @@ static struct ccdc_config *ccdc_cfg; const struct vpfe_standard vpfe_standards[] = { {V4L2_STD_525_60, 720, 480, {11, 10}, 1}, {V4L2_STD_625_50, 720, 576, {54, 59}, 1}, + {V4L2_STD_525P_60, 720, 480, {11, 10}, 0}, + {V4L2_STD_625P_50, 720, 576, {54, 59}, 0}, + {V4L2_STD_720P_50, 1280, 720, {1, 1}, 0}, + {V4L2_STD_720P_60, 1280, 720, {1, 1}, 0}, + {V4L2_STD_1080I_50, 1920, 1080, {1, 1}, 1}, + {V4L2_STD_1080I_60, 1920, 1080, {1, 1}, 1}, + {V4L2_STD_1080P_50, 1920, 1080, {1, 1}, 0}, + {V4L2_STD_1080P_60, 1920, 1080, {1, 1}, 0}, }; /* Used when raw Bayer image from ccdc is directly captured to SDRAM */