From patchwork Fri May 3 06:51:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2515951 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 090EC3FD1A for ; Fri, 3 May 2013 06:54:12 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r436qbSd023328; Fri, 3 May 2013 01:52:37 -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 r436qbiM030680; Fri, 3 May 2013 01:52:37 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.2.342.3; Fri, 3 May 2013 01:52:36 -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 r436qapT003354; Fri, 3 May 2013 01:52:36 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id CC88080627; Fri, 3 May 2013 01:52:35 -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 B84ED80626 for ; Fri, 3 May 2013 01:52:28 -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 r436qRxT022011 for ; Fri, 3 May 2013 01:52:27 -0500 (CDT) 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 r436qRRp019193 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 3 May 2013 01:52:27 -0500 Received: from [216.82.250.99:11955] by server-1.bemta-12.messagelabs.com id 7D/6C-10868-BAE53815; Fri, 03 May 2013 06:52:27 +0000 X-Env-Sender: prabhakar.csengg@gmail.com X-Msg-Ref: server-6.tower-126.messagelabs.com!1367563944!4533797!1 X-Originating-IP: [209.85.192.171] 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 16119 invoked from network); 3 May 2013 06:52:25 -0000 Received: from mail-pd0-f171.google.com (HELO mail-pd0-f171.google.com) (209.85.192.171) by server-6.tower-126.messagelabs.com with RC4-SHA encrypted SMTP; 3 May 2013 06:52:25 -0000 Received: by mail-pd0-f171.google.com with SMTP id r11so772583pdi.16 for ; Thu, 02 May 2013 23:52:24 -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=yYPRzy1cic1QgUKWyCOrlz7MpzguFj3TrWYAx6KMQXw=; b=0RPivm3nJuVQb+Efoqb5wvw/oMPLitejFzdqWwZHjmO7f4rZRab9FpgjTfMW6j9bGv orPMF4YkbuXJpbU7dQXqnV+82cNtT9tmGNU+nmNzRMpn961lsNuAx10BLNOauYTdGe7t 747WD3zNqgOvZgI4yiXonrvr6K8tuEqCDGmKR/NUmTWrYHwOnywRTZWo0G9c+guYxcL4 gKc6n3DZSZBMm+F76kGmYWkNqVrEHOnCB+FUvVgSL6MZ/XQusFcuBKrFoDdMP0hhOh+p 3OAMKqPWtg9Lcz1+j2cEDq6j5wjQ2VcRWNCVYdU5NakcMDLEbWE+YE8uLGXiZIOHwAHr +VtA== X-Received: by 10.66.7.202 with SMTP id l10mr13202865paa.176.1367563944029; Thu, 02 May 2013 23:52:24 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPSA id qi1sm11554949pac.21.2013.05.02.23.52.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 02 May 2013 23:52:23 -0700 (PDT) From: Prabhakar Lad To: LMML , Mauro Carvalho Chehab , Laurent Pinchart Subject: [PATCH RFC v3] media: i2c: mt9p031: add OF support Date: Fri, 3 May 2013 12:21:59 +0530 Message-ID: <1367563919-2880-1-git-send-email-prabhakar.csengg@gmail.com> X-Mailer: git-send-email 1.7.4.1 CC: DLOS , Rob Landley , Arnd Bergmann , , , Sascha Hauer , LKML , Rob Herring , Grant Likely , Sakari Ailus , Sylwester Nawrocki , 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 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 --- Changes for v2: 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. Changes for v3: 1: Dropped check if gpio-reset is valid. 2: Fixed some code nits. 3: Included a reference to the V4L2 DT bindings documentation. .../devicetree/bindings/media/i2c/mt9p031.txt | 40 +++++++++++++ drivers/media/i2c/mt9p031.c | 60 +++++++++++++++++++- 2 files changed, 97 insertions(+), 3 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..e740541 --- /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 : +-gpio-reset: 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>; + gpio-reset = <&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 28cf95b..4514f8f 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -16,9 +16,11 @@ #include #include #include -#include #include #include +#include +#include +#include #include #include #include @@ -28,6 +30,7 @@ #include #include #include +#include #include #include "aptina-pll.h" @@ -928,10 +931,50 @@ 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 device_node *np; + struct mt9p031_platform_data *pdata; + + 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) + return NULL; + + pdata->reset = of_get_named_gpio(client->dev.of_node, "gpio-reset", 0); + of_property_read_u32(np, "input-clock-frequency", &pdata->ext_freq); + of_property_read_u32(np, "pixel-clock-frequency", &pdata->target_freq); + + return pdata; +} + +#if IS_ENABLED(CONFIG_OF) +static const struct of_device_id mt9p031_of_match[] = { + { + .compatible = "aptina,mt9p031", + .data = (void *)MT9P031_MODEL_COLOR, + }, { + .compatible = "aptina,mt9p031m", + .data = (void *)MT9P031_MODEL_MONOCHROME, + }, { + /* sentinel */ + }, +}; +MODULE_DEVICE_TABLE(of, mt9p031_of_match); +#endif + 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; @@ -955,7 +998,17 @@ static int mt9p031_probe(struct i2c_client *client, mt9p031->pdata = pdata; mt9p031->output_control = MT9P031_OUTPUT_CONTROL_DEF; mt9p031->mode2 = MT9P031_READ_MODE_2_ROW_BLC; - mt9p031->model = did->driver_data; + + if (!client->dev.of_node) { + mt9p031->model = (enum mt9p031_model)did->driver_data; + } else { + const struct of_device_id *of_id; + + of_id = of_match_device(of_match_ptr(mt9p031_of_match), + &client->dev); + if (of_id) + mt9p031->model = (enum mt9p031_model)of_id->data; + } mt9p031->reset = -1; mt9p031->vaa = devm_regulator_get(&client->dev, "vaa"); @@ -1072,6 +1125,7 @@ MODULE_DEVICE_TABLE(i2c, mt9p031_id); static struct i2c_driver mt9p031_i2c_driver = { .driver = { + .of_match_table = of_match_ptr(mt9p031_of_match), .name = "mt9p031", }, .probe = mt9p031_probe,