From patchwork Fri Apr 26 11:23:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2492931 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D3755DF230 for ; Fri, 26 Apr 2013 11:27:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754178Ab3DZL1W (ORCPT ); Fri, 26 Apr 2013 07:27:22 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:57158 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752141Ab3DZL1U (ORCPT ); Fri, 26 Apr 2013 07:27:20 -0400 Received: by mail-pb0-f48.google.com with SMTP id wy7so80139pbc.21 for ; Fri, 26 Apr 2013 04:27:20 -0700 (PDT) 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=TdBFDa9r8mkcYiFovqWlrEbZQpZqeiOSAz3xXCYEblw=; b=KKLaBhmXI5wP5cXPla2yHUI3POw7cPXabXqmwk0qmGPyTb9k51u2TBEHAFiowKUHkY qUdaI+wYyyMI7iKberruMykdRsPUDX5aQ/j1C56TA4y9NwnK/nfFTxC73wlUidvOvxlV 40s45xpmaIu5nVzUwMN4J1TjI17C3g2PJWr35l3ZLvV5ZzlYX+6s1DLZhrMRyWOuKisP Ah5etgSkgUHIGpHCiyWvqayRY6anYcirdPwy67yZyMisVJzC6wBsqGPqdao4OdHwC+Dj cRMbwq89C24ITnfZRSb/5yhX7MDiBOC8YFdd5948mHA+kgI2Fcg6wzL9jj1qs4DD6PiL 4tIQ== X-Received: by 10.66.190.104 with SMTP id gp8mr31181831pac.84.1366975456885; Fri, 26 Apr 2013 04:24:16 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPSA id ag4sm11344071pbc.20.2013.04.26.04.24.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 26 Apr 2013 04:24:15 -0700 (PDT) From: Prabhakar Lad To: LMML Cc: "Lad, Prabhakar" , Hans Verkuil , Laurent Pinchart , Mauro Carvalho Chehab , Guennadi Liakhovetski , Sylwester Nawrocki , Sakari Ailus , Grant Likely , Rob Herring , Rob Landley , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH] media: i2c: tvp514x: add OF support Date: Fri, 26 Apr 2013 16:53:50 +0530 Message-Id: <1366975430-31806-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 Cc: davinci-linux-open-source@linux.davincidsp.com --- RFC v1: https://patchwork.kernel.org/patch/2030061/ RFC v2: https://patchwork.kernel.org/patch/2061811/ Changes for current version from RFC v2: 1: Fixed review comments pointed by Sylwester. .../devicetree/bindings/media/i2c/tvp514x.txt | 38 +++++++++++ drivers/media/i2c/tvp514x.c | 67 +++++++++++++++++-- 2 files changed, 98 insertions(+), 7 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..618640a --- /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. +- pclk-sample: 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) */ + vsync-active = <1>; + /* Active low (Defaults to 0) */ + pclk-sample = <0>; + }; + }; + }; + ... +}; diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c index 887bd93..d37b85e 100644 --- a/drivers/media/i2c/tvp514x.c +++ b/drivers/media/i2c/tvp514x.c @@ -35,7 +35,9 @@ #include #include #include +#include +#include #include #include #include @@ -1056,6 +1058,58 @@ static struct tvp514x_decoder tvp514x_dev = { }; +#if defined(CONFIG_OF) +static const struct of_device_id tvp514x_of_match[] = { + {.compatible = "ti,tvp5146-decoder", }, + {.compatible = "ti,tvp5146m2-decoder", }, + {.compatible = "ti,tvp5147-decoder", }, + {.compatible = "ti,tvp5147m1-decoder", }, + {}, +}; +MODULE_DEVICE_TABLE(of, tvp514x_of_match); + +static void tvp514x_get_pdata(struct i2c_client *client, + struct tvp514x_decoder *decoder) +{ + if (!client->dev.platform_data && client->dev.of_node) { + struct device_node *endpoint; + + endpoint = v4l2_of_get_next_endpoint(client->dev.of_node, NULL); + if (endpoint) { + struct tvp514x_platform_data *pdata; + struct v4l2_of_endpoint bus_cfg; + unsigned int flags; + + pdata = + devm_kzalloc(&client->dev, + sizeof(struct tvp514x_platform_data), + GFP_KERNEL); + if (!pdata) + return; + + v4l2_of_parse_endpoint(endpoint, &bus_cfg); + flags = bus_cfg.bus.parallel.flags; + + if (flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) + pdata->hs_polarity = 1; + if (flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) + pdata->vs_polarity = 1; + if (flags & V4L2_MBUS_PCLK_SAMPLE_RISING) + pdata->clk_polarity = 1; + decoder->pdata = pdata; + } + } +} +#else +#define tvp514x_of_match NULL + +static void tvp514x_get_pdata(struct i2c_client *client, + struct tvp514x_decoder *decoder) +{ + decoder->pdata = client->dev.platform_data; +} +#endif + /** * tvp514x_probe() - decoder driver i2c probe handler * @client: i2c driver client device structure @@ -1075,11 +1129,6 @@ 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; - if (!client->dev.platform_data) { - v4l2_err(client, "No platform data!!\n"); - return -ENODEV; - } - decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL); if (!decoder) return -ENOMEM; @@ -1090,8 +1139,11 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) memcpy(decoder->tvp514x_regs, tvp514x_reg_list_default, sizeof(tvp514x_reg_list_default)); - /* Copy board specific information here */ - decoder->pdata = client->dev.platform_data; + tvp514x_get_pdata(client, decoder); + if (!decoder->pdata) { + v4l2_err(client, "No platform data!!\n"); + return -EPROBE_DEFER; + } /** * Fetch platform specific data, and configure the @@ -1242,6 +1294,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, },