From patchwork Sun May 26 13:08:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2615501 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by patchwork1.kernel.org (Postfix) with ESMTP id 89ED23FD2B for ; Sun, 26 May 2013 13:11:28 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r4QD9W3G000836; Sun, 26 May 2013 08:09:32 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r4QD9WNf008591; Sun, 26 May 2013 08:09:32 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Sun, 26 May 2013 08:09:32 -0500 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 r4QD9WcJ027521; Sun, 26 May 2013 08:09:32 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 0B21080627; Sun, 26 May 2013 08:09:32 -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 3489980626 for ; Sun, 26 May 2013 08:09:31 -0500 (CDT) 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 r4QD9UfM029653 for ; Sun, 26 May 2013 08:09:30 -0500 (CDT) Received: from mail6.bemta8.messagelabs.com (mail6.bemta8.messagelabs.com [216.82.243.55]) by red.ext.ti.com (8.13.7/8.13.7) with ESMTP id r4QD9Uit027024 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 26 May 2013 08:09:30 -0500 Received: from [216.82.242.131:44801] by server-14.bemta-8.messagelabs.com id B6/B3-19972-A8902A15; Sun, 26 May 2013 13:09:30 +0000 X-Env-Sender: prabhakar.csengg@gmail.com X-Msg-Ref: server-8.tower-76.messagelabs.com!1369573767!28510811!1 X-Originating-IP: [209.85.160.54] 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.8.6.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3731 invoked from network); 26 May 2013 13:09:28 -0000 Received: from mail-pb0-f54.google.com (HELO mail-pb0-f54.google.com) (209.85.160.54) by server-8.tower-76.messagelabs.com with RC4-SHA encrypted SMTP; 26 May 2013 13:09:28 -0000 Received: by mail-pb0-f54.google.com with SMTP id ro12so5880042pbb.13 for ; Sun, 26 May 2013 06:09:27 -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=L1QA3p9+Judbs6wIjYTlBLa6iogfWPvN3y0UqvSB9rk=; b=uvXBmY0TD3dKAIomLGXr96yJ795OOJgVbbATlVa027WL6afmCbbKa7kSwUyqA2bSRr BzuEIk/D9S0msxLiYlgGWREythL5m9+TXNGHKjk71ar0MEIwfSjW2DZTvFlsqNaWOQfZ sjBGW5R+kTs7t0rE/fsPdJ4+Sv3/KGmu+9/d50fTm0BCYS98hzFySJLtB1qoGkug1h+s mtILuQE//ure4OfMJSebgGNte+A7piEJBzg4Kn6+rCzVVhUaAxDWiTKIuJ5HAtccTymD A+SUxmgvYH2OuDdkpcQDkioewTVMvpIPRciTs+iPMAwZ0waKZc62+UO2JYpwVkMQCROk QIJw== X-Received: by 10.68.171.226 with SMTP id ax2mr25698864pbc.201.1369573767536; Sun, 26 May 2013 06:09:27 -0700 (PDT) Received: from localhost.localdomain ([112.79.42.34]) by mx.google.com with ESMTPSA id 10sm24419872pbm.0.2013.05.26.06.09.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 26 May 2013 06:09:26 -0700 (PDT) From: Prabhakar Lad To: Hans Verkuil , Mauro Carvalho Chehab , LMML , Laurent Pinchart Subject: [PATCH] media: i2c: mt9p031: add OF support Date: Sun, 26 May 2013 18:38:54 +0530 Message-ID: <1369573734-19272-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.0.4 CC: Rob Landley , DLOS , Mauro Carvalho Chehab , Arnd Bergmann , , , Sascha Hauer , LKML , Rob Herring , Grant Likely , Hans Verkuil , Laurent Pinchart , 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 mt9p031 sensor driver. Alongside this patch sorts the header inclusion alphabetically. 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: Sascha Hauer Cc: Rob Herring Cc: Rob Landley Cc: Arnd Bergmann Cc: devicetree-discuss@lists.ozlabs.org Cc: davinci-linux-open-source@linux.davincidsp.com Cc: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Sascha Hauer Acked-by: Laurent Pinchart --- Changes for NON RFC v1: 1: added missing call for of_node_put(). Changes for RFC v4 (https://patchwork.kernel.org/patch/2556251/): 1: Renamed "gpio-reset" property to "reset-gpios". 2: Dropped assigning the driver data from the of node. Changes for RFC v3(https://patchwork.kernel.org/patch/2515921/): 1: Dropped check if gpio-reset is valid. 2: Fixed some code nits. 3: Included a reference to the V4L2 DT bindings documentation. Changes for RFC v2 (https://patchwork.kernel.org/patch/2510201/): 1: Used '-' instead of '_' for device properties. 2: Specified gpio reset pin as phandle in device node. 3: Handle platform data properly even if kernel is compiled with devicetree support. 4: Used dev_* for messages in drivers instead of pr_*. 5: Changed compatible property to "aptina,mt9p031" and "aptina,mt9p031m". 6: Sorted the header inclusion alphabetically and fixed some minor code nits. RFC v1: https://patchwork.kernel.org/patch/2498791/ .../devicetree/bindings/media/i2c/mt9p031.txt | 40 ++++++++++++++++++ drivers/media/i2c/mt9p031.c | 43 +++++++++++++++++++- 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/media/i2c/mt9p031.txt diff --git a/Documentation/devicetree/bindings/media/i2c/mt9p031.txt b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt new file mode 100644 index 0000000..59d613c --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt @@ -0,0 +1,40 @@ +* Aptina 1/2.5-Inch 5Mp CMOS Digital Image Sensor + +The Aptina MT9P031 is a 1/2.5-inch CMOS active pixel digital image sensor with +an active array size of 2592H x 1944V. It is programmable through a simple +two-wire serial interface. + +Required Properties : +- compatible : value should be either one among the following + (a) "aptina,mt9p031" for mt9p031 sensor + (b) "aptina,mt9p031m" for mt9p031m sensor + +- input-clock-frequency : Input clock frequency. + +- pixel-clock-frequency : Pixel clock frequency. + +Optional Properties : +- reset-gpios: Chip reset GPIO + +For further reading of port node refer Documentation/devicetree/bindings/media/ +video-interfaces.txt. + +Example: + + i2c0@1c22000 { + ... + ... + mt9p031@5d { + compatible = "aptina,mt9p031"; + reg = <0x5d>; + reset-gpios = <&gpio3 30 0>; + + port { + mt9p031_1: endpoint { + input-clock-frequency = <6000000>; + pixel-clock-frequency = <96000000>; + }; + }; + }; + ... + }; diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index bf49899..bb1f993 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -16,9 +16,10 @@ #include #include #include -#include #include #include +#include +#include #include #include #include @@ -28,6 +29,7 @@ #include #include #include +#include #include #include "aptina-pll.h" @@ -928,10 +930,37 @@ static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { * Driver initialization and probing */ +static struct mt9p031_platform_data * +mt9p031_get_pdata(struct i2c_client *client) +{ + struct mt9p031_platform_data *pdata = NULL; + struct device_node *np; + + if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node) + return client->dev.platform_data; + + np = v4l2_of_get_next_endpoint(client->dev.of_node, NULL); + if (!np) + return NULL; + + pdata = devm_kzalloc(&client->dev, sizeof(struct mt9p031_platform_data), + GFP_KERNEL); + if (!pdata) + goto done; + + pdata->reset = of_get_named_gpio(client->dev.of_node, "reset-gpios", 0); + of_property_read_u32(np, "input-clock-frequency", &pdata->ext_freq); + of_property_read_u32(np, "pixel-clock-frequency", &pdata->target_freq); + +done: + of_node_put(np); + return pdata; +} + static int mt9p031_probe(struct i2c_client *client, const struct i2c_device_id *did) { - struct mt9p031_platform_data *pdata = client->dev.platform_data; + struct mt9p031_platform_data *pdata = mt9p031_get_pdata(client); struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct mt9p031 *mt9p031; unsigned int i; @@ -1070,8 +1099,18 @@ static const struct i2c_device_id mt9p031_id[] = { }; MODULE_DEVICE_TABLE(i2c, mt9p031_id); +#if IS_ENABLED(CONFIG_OF) +static const struct of_device_id mt9p031_of_match[] = { + { .compatible = "aptina,mt9p031", }, + { .compatible = "aptina,mt9p031m", }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, mt9p031_of_match); +#endif + static struct i2c_driver mt9p031_i2c_driver = { .driver = { + .of_match_table = of_match_ptr(mt9p031_of_match), .name = "mt9p031", }, .probe = mt9p031_probe,