From patchwork Thu Jan 24 09:12:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2030081 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by patchwork1.kernel.org (Postfix) with ESMTP id CCBC33FDBC for ; Thu, 24 Jan 2013 09:16:44 +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 r0O9CfCf021753; Thu, 24 Jan 2013 03:12:41 -0600 Received: from DLEE74.ent.ti.com (dlee74.ent.ti.com [157.170.170.8]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0O9Cfb1004514; Thu, 24 Jan 2013 03:12:41 -0600 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DLEE74.ent.ti.com (157.170.170.8) with Microsoft SMTP Server id 14.1.323.3; Thu, 24 Jan 2013 03:12:40 -0600 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 r0O9Cefe004885; Thu, 24 Jan 2013 03:12:40 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id E5B6680627; Thu, 24 Jan 2013 03:12:39 -0600 (CST) 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 3872180626 for ; Thu, 24 Jan 2013 03:12:38 -0600 (CST) Received: from red.ext.ti.com (red.ext.ti.com [192.94.93.37]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0O9CcWU005037 for ; Thu, 24 Jan 2013 03:12:38 -0600 (CST) Received: from mail6.bemta12.messagelabs.com (mail6.bemta12.messagelabs.com [216.82.250.247]) by red.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0O9Cbn9022374 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Jan 2013 03:12:37 -0600 Received: from [216.82.250.51:37656] by server-9.bemta-12.messagelabs.com id B4/4F-26026-50BF0015; Thu, 24 Jan 2013 09:12:37 +0000 X-Env-Sender: prabhakar.csengg@gmail.com X-Msg-Ref: server-16.tower-108.messagelabs.com!1359018755!7869940!1 X-Originating-IP: [209.85.160.41] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, ML_RADAR_SPEW_LINKS_14,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26148 invoked from network); 24 Jan 2013 09:12:36 -0000 Received: from mail-pb0-f41.google.com (HELO mail-pb0-f41.google.com) (209.85.160.41) by server-16.tower-108.messagelabs.com with RC4-SHA encrypted SMTP; 24 Jan 2013 09:12:36 -0000 Received: by mail-pb0-f41.google.com with SMTP id xa7so5313004pbc.0 for ; Thu, 24 Jan 2013 01:12:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=aaGpT7Caa7khoTM7BWrUpLnMkGiTvP6VvlsZoh0He0w=; b=ezdWqL1R4eHl4ZtlaZEZSth5wr0exTZMJBtLYZqKJdIsPkB2MI7Rsr9Rg8b/K+LyhD KwNjlFQfdBdvxajx2v8a5+nkaLb7tiyutn0GJgFKUjW9qCOdJMVBUEpQOsrj1Epgp/aC MGZT7UYVUzn86jHzqsunmTKZiC/KCs2hlSyz+hbDmYWPfT1JYdBMeh8SfxZSPQ6sW7u7 ONwGSIB7RncwRIH62LVLWobvOMOEkiiMAq4ECCxiAet0T5y+kUfPosBcW2YiQ0cu1MwG koQD9XFsmcyjJTqRl95/4IO6dGNceRpoY68xBqSaxqRcU5iyOCVgiteYH02Lz/6y5mvi htQw== X-Received: by 10.68.135.133 with SMTP id ps5mr2888045pbb.132.1359018755215; Thu, 24 Jan 2013 01:12:35 -0800 (PST) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id qb3sm14532526pbb.35.2013.01.24.01.12.28 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 24 Jan 2013 01:12:34 -0800 (PST) From: Prabhakar Lad To: LMML Subject: [PATCH RFC] media: tvp514x: add OF support Date: Thu, 24 Jan 2013 14:42:20 +0530 Message-ID: <1359018740-6399-1-git-send-email-prabhakar.lad@ti.com> X-Mailer: git-send-email 1.7.4.1 CC: DLOS , Mauro Carvalho Chehab , LDOC , , LKML , Rob Herring , Grant Likely , Hans Verkuil , Guennadi Liakhovetski 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@linux.davincidsp.com From: Lad, Prabhakar add OF support for the tvp514x driver. Signed-off-by: Lad, Prabhakar Cc: Hans Verkuil Cc: Laurent Pinchart Cc: Mauro Carvalho Chehab Cc: Guennadi Liakhovetski --- This patch is on top of following patches: 1: https://patchwork.kernel.org/patch/1930941/ 2: http://patchwork.linuxtv.org/patch/16193/ 3: https://patchwork.kernel.org/patch/1944901/ .../devicetree/bindings/media/i2c/tvp514x.txt | 30 ++++++++++ drivers/media/i2c/tvp514x.c | 60 ++++++++++++++++++-- 2 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/i2c/tvp514x.txt diff --git a/Documentation/devicetree/bindings/media/i2c/tvp514x.txt b/Documentation/devicetree/bindings/media/i2c/tvp514x.txt new file mode 100644 index 0000000..3cce323 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/tvp514x.txt @@ -0,0 +1,30 @@ +* Texas Instruments TVP514x video decoder + +The TVP5146/TVP5146m2/TVP5147/TVP5147m1 device is high quality, single-chip +digital video decoder that digitizes and decodes all popular baseband analog +video formats into digital video component. The tvp514x decoder supports analog- +to-digital (A/D) conversion of component RGB and YPbPr signals as well as A/D +conversion and decoding of NTSC, PAL and SECAM composite and S-video into +component YCbCr. + +Required Properties : +- compatible: Must be "ti,tvp514x-decoder" +- hsync-active: HSYNC Polarity configuration for current interface. +- vsync-active: VSYNC Polarity configuration for current interface. +- data-active: Clock polarity of the current interface. + +Example: + +i2c0@1c22000 { + ... + ... + + tvp514x@5c { + compatible = "ti,tvp514x-decoder"; + reg = <0x5c>; + hsync-active = <1>; /* Active low (Defaults to 0) */ + hsync-active = <1>; /* Active low (Defaults to 0) */ + data-active = <0>; /* Active low (Defaults to 0) */ + }; + ... +}; diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c index a4f0a70..0e2b15c 100644 --- a/drivers/media/i2c/tvp514x.c +++ b/drivers/media/i2c/tvp514x.c @@ -12,6 +12,7 @@ * Hardik Shah * Manjunath Hadli * Karicheri Muralidharan + * Prabhakar Lad * * This package is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -930,6 +931,50 @@ static struct tvp514x_decoder tvp514x_dev = { }; +#if defined(CONFIG_OF) +static const struct of_device_id tvp514x_of_match[] = { + {.compatible = "ti,tvp514x-decoder", }, + {}, +} +MODULE_DEVICE_TABLE(of, tvp514x_of_match); + +static struct tvp514x_platform_data + *tvp514x_get_pdata(struct i2c_client *client) +{ + if (!client->dev.platform_data && client->dev.of_node) { + struct tvp514x_platform_data *pdata; + u32 prop; + + pdata = devm_kzalloc(&client->dev, + sizeof(struct tvp514x_platform_data), + GFP_KERNEL); + client->dev.platform_data = pdata; + if (!pdata) + return NULL; + if (!of_property_read_u32(client->dev.of_node, + "data-active", &prop)) + pdata->clk_polarity = prop; + if (!of_property_read_u32(client->dev.of_node, + "hsync-active", &prop)) + pdata->hs_polarity = prop; + if (!of_property_read_u32(client->dev.of_node, + "vsync-active", &prop)) + pdata->vs_polarity = prop; + + } + + return client->dev.platform_data; +} +#else +#define tvp514x_of_match NULL + +static struct tvp514x_platform_data + *tvp514x_get_pdata(struct i2c_client *client) +{ + return client->dev.platform_data; +} +#endif + /** * tvp514x_probe() - decoder driver i2c probe handler * @client: i2c driver client device structure @@ -941,6 +986,7 @@ static struct tvp514x_decoder tvp514x_dev = { static int tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) { + struct tvp514x_platform_data *pdata; struct tvp514x_decoder *decoder; struct v4l2_subdev *sd; int ret; @@ -949,22 +995,25 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) return -EIO; + pdata = tvp514x_get_pdata(client); + if (!pdata) { + v4l2_err(client, "No platform data!!\n"); + return -EPROBE_DEFER; + } + decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL); if (!decoder) return -ENOMEM; /* Initialize the tvp514x_decoder with default configuration */ *decoder = tvp514x_dev; - if (!client->dev.platform_data) { - v4l2_err(client, "No platform data!!\n"); - return -EPROBE_DEFER; - } + /* Copy default register configuration */ memcpy(decoder->tvp514x_regs, tvp514x_reg_list_default, sizeof(tvp514x_reg_list_default)); /* Copy board specific information here */ - decoder->pdata = client->dev.platform_data; + decoder->pdata = pdata; /** * Fetch platform specific data, and configure the @@ -1096,6 +1145,7 @@ MODULE_DEVICE_TABLE(i2c, tvp514x_id); static struct i2c_driver tvp514x_driver = { .driver = { + .of_match_table = tvp514x_of_match, .owner = THIS_MODULE, .name = TVP514X_MODULE_NAME, },