From patchwork Wed Oct 3 06:32:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 1540411 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id F1BD43FD9C for ; Wed, 3 Oct 2012 06:35:15 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TJIWC-0001T8-7e; Wed, 03 Oct 2012 06:33:16 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TJIW8-0001Su-Tl for linux-arm-kernel@lists.infradead.org; Wed, 03 Oct 2012 06:33:13 +0000 Received: by pbcxa7 with SMTP id xa7so8952313pbc.36 for ; Tue, 02 Oct 2012 23:33:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=olSsITAJkxB6PhLNvM3KJchYL27rWDxgKJPoyABg/9A=; b=E2WMszsrR2kvzRNTvqFkV7oN8UbMubA2XkC6L7c3DNyN4YdOSldMuf0FS/wcaZ9BJU D8upq37ck7Fey3Zsv7JGcbfpP8rtY2a5NfCtKNFHWkjoPQM3cMISgs2+OntvVEyocdoW ohsgmdcgrr3whQAQ6WcMMeEtwJ9QR3KcNYFPyJKii7DI6VYuI7e86UHGi5iXsEqI/fGW DEw3fTWjsN6ASHgo7MMpurifMUUzie3espEqSMgZ2wSHz65buKHp+jqafTu7e57buNdI mCZdb+CBnlLXSXxsYVx+sz4FBbdtIfzap8UMhuHjUOsuZisrIw40YKi1L9d467a0c9OG GeVg== Received: by 10.66.83.129 with SMTP id q1mr2892956pay.4.1349245989159; Tue, 02 Oct 2012 23:33:09 -0700 (PDT) Received: from localhost.localdomain ([117.221.43.179]) by mx.google.com with ESMTPS id w4sm1974889pav.27.2012.10.02.23.33.04 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Oct 2012 23:33:08 -0700 (PDT) From: Prabhakar To: LMML Subject: [PATCH] davinci: vpbe: replace V4L2_OUT_CAP_CUSTOM_TIMINGS with V4L2_OUT_CAP_DV_TIMINGS Date: Wed, 3 Oct 2012 12:02:53 +0530 Message-Id: <1349245973-7377-1-git-send-email-prabhakar.lad@ti.com> X-Mailer: git-send-email 1.7.4.1 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (prabhakar.csengg[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: DLOS , Mauro Carvalho Chehab , Sekhar Nori , VGER , "Lad, Prabhakar" , Hans Verkuil , Manjunath Hadli , LAK X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Lad, Prabhakar This patch replaces V4L2_OUT_CAP_CUSTOM_TIMINGS macro with V4L2_OUT_CAP_DV_TIMINGS. As V4L2_OUT_CAP_CUSTOM_TIMINGS is being phased out. Signed-off-by: Lad, Prabhakar Signed-off-by: Manjunath Hadli Cc: Sekhar Nori Cc: Hans Verkuil Cc: Mauro Carvalho Chehab Acked-by: Sekhar Nori --- arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- drivers/media/platform/davinci/vpbe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 3baf56d..a79dc1e 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -699,7 +699,7 @@ static struct vpbe_output dm644xevm_vpbe_outputs[] = { .index = 1, .name = "Component", .type = V4L2_OUTPUT_TYPE_ANALOG, - .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS, + .capabilities = V4L2_OUT_CAP_DV_TIMINGS, }, .subdev_name = VPBE_VENC_SUBDEV_NAME, .default_mode = "480p59_94", diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c index d03f452..9b623bc 100644 --- a/drivers/media/platform/davinci/vpbe.c +++ b/drivers/media/platform/davinci/vpbe.c @@ -340,7 +340,7 @@ static int vpbe_s_dv_timings(struct vpbe_device *vpbe_dev, if (!(cfg->outputs[out_index].output.capabilities & - V4L2_OUT_CAP_CUSTOM_TIMINGS)) + V4L2_OUT_CAP_DV_TIMINGS)) return -EINVAL; for (i = 0; i < output->num_modes; i++) { @@ -408,7 +408,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev, int j = 0; int i; - if (!(output->output.capabilities & V4L2_OUT_CAP_CUSTOM_TIMINGS)) + if (!(output->output.capabilities & V4L2_OUT_CAP_DV_TIMINGS)) return -EINVAL; for (i = 0; i < output->num_modes; i++) {