From patchwork Tue Jan 29 13:07:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prabhakar X-Patchwork-Id: 2061821 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by patchwork1.kernel.org (Postfix) with ESMTP id 8447B3FDD1 for ; Tue, 29 Jan 2013 13:13:53 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0TD7shU029558; Tue, 29 Jan 2013 07:07:54 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0TD7sHQ023558; Tue, 29 Jan 2013 07:07:54 -0600 Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.1.323.3; Tue, 29 Jan 2013 07:07:54 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0TD7rMH026533; Tue, 29 Jan 2013 07:07:53 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 27FC880627; Tue, 29 Jan 2013 07:07:53 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 2F6CB80626 for ; Tue, 29 Jan 2013 07:07:51 -0600 (CST) Received: from red.ext.ti.com (red.ext.ti.com [192.94.93.37]) by dflp52.itg.ti.com (8.13.7/8.13.8) with ESMTP id r0TD7ocA027933 for ; Tue, 29 Jan 2013 07:07:50 -0600 (CST) Received: from mail6.bemta7.messagelabs.com (mail6.bemta7.messagelabs.com [216.82.255.55]) by red.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0TD7oTi021173 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 29 Jan 2013 07:07:50 -0600 Received: from [216.82.253.147:12584] by server-4.bemta-7.messagelabs.com id AF/3A-19569-6A9C7015; Tue, 29 Jan 2013 13:07:50 +0000 X-Env-Sender: prabhakar.csengg@gmail.com X-Msg-Ref: server-6.tower-165.messagelabs.com!1359464867!11562902!1 X-Originating-IP: [209.85.220.53] 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 12268 invoked from network); 29 Jan 2013 13:07:48 -0000 Received: from mail-pa0-f53.google.com (HELO mail-pa0-f53.google.com) (209.85.220.53) by server-6.tower-165.messagelabs.com with RC4-SHA encrypted SMTP; 29 Jan 2013 13:07:48 -0000 Received: by mail-pa0-f53.google.com with SMTP id bg4so386433pad.12 for ; Tue, 29 Jan 2013 05:07:47 -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=HFWWYcdTFFP2RPPDi3T56lm7LSqM+30iW1VXsIBWhKo=; b=e/hp9tl+CeFCxx+ies3egvLXOvYIk2eWA2f2WJ5PPrRlbw5yiJ0uQwnWSfAjMijd1c kDMlSH4XvV0QdZ36CvBZDquDNsyFlfktB7BvoNUeiVefgBc1ajfiimGv1Ot3elgRq9ls suO8a4uviQZ2cqSCjGk4mQjdHsMriRi6kxNnZJyJOUzg7Gg+aNPymMsh0Hp747I6i7TN Jpwdts3jutkpM/8/X32kuQ2+UXemG+q1httcQW7HmMWgOXcO4WQ2dEi8Mwq24/Xf9rOq ZtwL7lvSyWr99kjY2wiNZr/lE8AFpb5OnWyRLcFKBV2vktJCwJ1kdbFJ8Lvm50lDlCfa /spw== X-Received: by 10.66.78.100 with SMTP id a4mr2693641pax.4.1359464866889; Tue, 29 Jan 2013 05:07:46 -0800 (PST) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id ba3sm7362093pbd.29.2013.01.29.05.07.40 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 29 Jan 2013 05:07:45 -0800 (PST) From: Prabhakar Lad To: LMML Subject: [PATCH RFC v2] media: tvp514x: add OF support Date: Tue, 29 Jan 2013 18:37:11 +0530 Message-ID: <1359464832-8875-1-git-send-email-prabhakar.lad@ti.com> X-Mailer: git-send-email 1.7.4.1 CC: Rob Landley , DLOS , Mauro Carvalho Chehab , , , , Rob Herring , Grant Likely , Hans Verkuil , Sylwester Nawrocki , Sakari Ailus , 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 Cc: Sylwester Nawrocki Cc: Sakari Ailus Cc: Grant Likely Cc: Rob Herring Cc: Rob Landley Cc: devicetree-discuss@lists.ozlabs.org Cc: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- Changes for v2: 1: Fixed review comment pointed by Heiko. 2: Fixed review comment pointed by Laurent. 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 | 38 +++++++++++ drivers/media/i2c/tvp514x.c | 70 ++++++++++++++++++-- 2 files changed, 103 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..55d3ffd --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/tvp514x.txt @@ -0,0 +1,38 @@ +* 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>; + + port { + tvp514x_1: endpoint { + /* Active high (Defaults to 0) */ + hsync-active = <1>; + /* Active high (Defaults to 0) */ + hsync-active = <1>; + /* Active low (Defaults to 0) */ + data-active = <0>; + }; + }; + }; + ... +}; diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c index a4f0a70..24ce759 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 @@ -33,7 +34,9 @@ #include #include #include +#include +#include #include #include #include @@ -930,6 +933,58 @@ 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; + struct v4l2_of_endpoint bus_cfg; + struct device_node *endpoint; + + pdata = devm_kzalloc(&client->dev, + sizeof(struct tvp514x_platform_data), + GFP_KERNEL); + client->dev.platform_data = pdata; + if (!pdata) + return NULL; + + endpoint = of_get_child_by_name(client->dev.of_node, "port"); + if (endpoint) + endpoint = of_get_child_by_name(endpoint, "endpoint"); + + if (!endpoint) { + v4l2_info(client, "Using default data!!\n"); + } else { + v4l2_of_parse_parallel_bus(endpoint, &bus_cfg); + + if (bus_cfg.mbus_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) + pdata->hs_polarity = 1; + if (bus_cfg.mbus_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) + pdata->vs_polarity = 1; + if (bus_cfg.mbus_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) + pdata->clk_polarity = 1; + } + } + + 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 +996,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 +1005,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 +1155,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, },