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: 1540381 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by patchwork2.kernel.org (Postfix) with ESMTP id A398ADF283 for ; Wed, 3 Oct 2012 06:33:19 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id q936XJHE031373 for ; Wed, 3 Oct 2012 01:33:19 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q936XJPQ021628 for ; Wed, 3 Oct 2012 01:33:19 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Wed, 3 Oct 2012 01:33:18 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id q936XINa002336 for ; Wed, 3 Oct 2012 01:33:18 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id DF1F38062C for ; Wed, 3 Oct 2012 01:33:18 -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 6267C80626 for ; Wed, 3 Oct 2012 01:33:11 -0500 (CDT) Received: from white.ext.ti.com (white.ext.ti.com [192.94.93.38]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id q936XBH4025528 for ; Wed, 3 Oct 2012 01:33:11 -0500 (CDT) Received: from psmtp.com (na3sys009amx161.postini.com [74.125.149.87]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id q936X9PL006180 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 3 Oct 2012 01:33:10 -0500 Received: from mail-da0-f45.google.com ([209.85.210.45]) (using TLSv1) by na3sys009amx161.postini.com ([74.125.148.10]) with SMTP; Tue, 02 Oct 2012 23:33:10 PDT Received: by dadn15 with SMTP id n15so2282653dad.4 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-pstn-levels: (S:56.62984/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-dkim: 1 skipped:not-enabled X-pstn-settings: 2 (0.5000:0.0050) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [82/3] CC: DLOS , Mauro Carvalho Chehab , VGER , Hans Verkuil , LAK X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com 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++) {