From patchwork Mon Apr 29 08:00:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2498791 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 586113FD85 for ; Mon, 29 Apr 2013 08:00:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753523Ab3D2IAO (ORCPT ); Mon, 29 Apr 2013 04:00:14 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:56946 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750950Ab3D2IAN (ORCPT ); Mon, 29 Apr 2013 04:00:13 -0400 Received: by mail-pd0-f170.google.com with SMTP id 15so471997pdi.1 for ; Mon, 29 Apr 2013 01:00:12 -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=0PwIJhJvswhETME5zKEag4HfjaMHMwvoemM2IB9PlMI=; b=xbeWsfXjkQpGxip7VQdsCO3uBiqtk90PKBOlVnZi2HZunvatmLw8VsUv0XbeX9BjwU lT3gWOdFcVBFltC3/Cj+rjLHpzmfukS7CkCpfy224us1K335+eiSei7TdjXckSJ2l5Ji 5VG4wYWmchGkcwk6mZqdu35l41q8EPGHJtc3MyKrBtSq1abeQIH1M8w7jeAQxE26nG1C CGM75h5pFBcoEuRigq+0w6OU0zcCaK55arpTda5GA0elD//a/SEUHdsQE4PfkL/pO1m1 xxiLSMSEGIGOCvOkYlYTJmVf9O5GC1/WMJULLxs25Px03LuiQ+42Bt/88wZFroahdpzO Lt8g== X-Received: by 10.66.181.208 with SMTP id dy16mr57667241pac.5.1367222412590; Mon, 29 Apr 2013 01:00:12 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPSA id nt2sm16502650pbc.17.2013.04.29.01.00.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 29 Apr 2013 01:00:11 -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 Subject: [PATCH RFC] media: i2c: mt9p031: add OF support Date: Mon, 29 Apr 2013 13:30:01 +0530 Message-Id: <1367222401-26649-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 mt9p031 sensor 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 --- .../devicetree/bindings/media/i2c/mt9p031.txt | 43 ++++++++++++++ drivers/media/i2c/mt9p031.c | 61 +++++++++++++++++++- 2 files changed, 103 insertions(+), 1 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..b985e63 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt @@ -0,0 +1,43 @@ +* 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 imaging pixel array of 2592H x 1944V. It incorporates sophisticated +camera functions on-chip such as windowing, column and row skip mode, and +snapshot mode. It is programmable through a simple two-wire serial interface. + +The MT9P031 is a progressive-scan sensor that generates a stream of pixel data +at a constant frame rate. It uses an on-chip, phase-locked loop (PLL) to +generate all internal clocks from a single master input clock running between 6 +and 27 MHz. The maximum pixel rate is 96 Mp/s, corresponding to a clock rate of +96 MHz. + +Required Properties : +- compatible : value should be either one among the following + (a) "aptina,mt9p031-sensor" for mt9p031 sensor + (b) "aptina,mt9p031m-sensor" for mt9p031m sensor + +- ext_freq: Input clock frequency. + +- target_freq: Pixel clock frequency. + +Optional Properties : +-reset: Chip reset GPIO (If not specified defaults to -1) + +Example: + +i2c0@1c22000 { + ... + ... + mt9p031@5d { + compatible = "aptina,mt9p031-sensor"; + reg = <0x5d>; + + port { + mt9p031_1: endpoint { + ext_freq = <6000000>; + target_freq = <96000000>; + }; + }; + }; + ... +}; \ No newline at end of file diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c index 28cf95b..66078a6 100644 --- a/drivers/media/i2c/mt9p031.c +++ b/drivers/media/i2c/mt9p031.c @@ -23,11 +23,13 @@ #include #include #include +#include #include #include #include #include +#include #include #include "aptina-pll.h" @@ -928,10 +930,66 @@ static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { * Driver initialization and probing */ +#if defined(CONFIG_OF) +static const struct of_device_id mt9p031_of_match[] = { + {.compatible = "aptina,mt9p031-sensor", }, + {.compatible = "aptina,mt9p031m-sensor", }, + {}, +}; +MODULE_DEVICE_TABLE(of, mt9p031_of_match); + +static struct mt9p031_platform_data + *mt9p031_get_pdata(struct i2c_client *client) + +{ + if (!client->dev.platform_data && client->dev.of_node) { + struct device_node *np; + struct mt9p031_platform_data *pdata; + int ret; + + 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) { + pr_warn("mt9p031 failed allocate memeory\n"); + return NULL; + } + ret = of_property_read_u32(np, "reset", &pdata->reset); + if (ret == -EINVAL) + pdata->reset = -1; + else if (ret == -ENODATA) + return NULL; + + if (of_property_read_u32(np, "ext_freq", &pdata->ext_freq)) + return NULL; + + if (of_property_read_u32(np, "target_freq", + &pdata->target_freq)) + return NULL; + + return pdata; + } + + return NULL; +} +#else +#define mt9p031_of_match NULL + +static struct mt9p031_platform_data + *mt9p031_get_pdata(struct i2c_client *client) +{ + return client->dev.platform_data; +} +#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; @@ -1072,6 +1130,7 @@ MODULE_DEVICE_TABLE(i2c, mt9p031_id); static struct i2c_driver mt9p031_i2c_driver = { .driver = { + .of_match_table = mt9p031_of_match, .name = "mt9p031", }, .probe = mt9p031_probe,