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: 54035 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9FEnoEX002568 for ; Thu, 15 Oct 2009 14:49:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757951AbZJOOn7 (ORCPT ); Thu, 15 Oct 2009 10:43:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757601AbZJOOn7 (ORCPT ); Thu, 15 Oct 2009 10:43:59 -0400 Received: from mail.navvo.net ([74.208.67.6]:52806 "EHLO mail.navvo.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757524AbZJOOn7 (ORCPT ); Thu, 15 Oct 2009 10:43:59 -0400 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: santiago.nunez@ridgerun.com To: davinci-linux-open-source@linux.davincidsp.com Cc: linux-media@vger.kernel.org, nsnehaprabha@ti.com, m-karicheri2@ti.com, diego.dompe@ridgerun.com, todd.fischer@ridgerun.com, mgrosen@ti.com, Santiago Nunez-Corrales 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 Subject: [PATCH 3/6 v5] Support for TVP7002 in VPFE 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) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 */