From patchwork Thu May 2 06:22:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2510201 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 831A93FD85 for ; Thu, 2 May 2013 06:23:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752034Ab3EBGW5 (ORCPT ); Thu, 2 May 2013 02:22:57 -0400 Received: from mail-pb0-f43.google.com ([209.85.160.43]:61557 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751457Ab3EBGW4 (ORCPT ); Thu, 2 May 2013 02:22:56 -0400 Received: by mail-pb0-f43.google.com with SMTP id md12so174189pbc.16 for ; Wed, 01 May 2013 23:22:55 -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=5myiTtxfYdZIMwjD61gVUqe+3hhCX72xtaAACUtMgAY=; b=uhGCz0KlwLqUNZN4wvee+e1f1QIKkOHaxqHQFfhHKL6yQzxwP/JBDo+3JJ/YRjYO8y 7itshJRhugfXNa5nJ9wjyw0CGQMWqfKxXOvAHNOePyzOcxmIAVIE2pZPmAvpZZaqEPBp mO5vImIeaIv9YgBpeQLAFgRNjb8vkItBueEraPbpVjxPo2WNFgxHlh/tE8OD827+RRtS yLV18xm5LkVILgUn8qP9Oepz5gFDiWyLPYTYi9bfFHyWJeVUpigkoLIkVIJ1EbbA2lHA 5XoPFgE5muKuXyfgjPSMD0bLObhyxSeTI6X+RCMgPlGstoR4BLuPqLmAH4LZ6vHvlINo 4Ghg== X-Received: by 10.66.13.35 with SMTP id e3mr8332440pac.186.1367475775374; Wed, 01 May 2013 23:22:55 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPSA id cq1sm6070069pbc.13.2013.05.01.23.22.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 01 May 2013 23:22:54 -0700 (PDT) From: Prabhakar Lad To: LMML , Mauro Carvalho Chehab Cc: DLOS , Hans Verkuil , Laurent Pinchart , Guennadi Liakhovetski , LKML , Sakari Ailus , "Lad, Prabhakar" , Sylwester Nawrocki , Grant Likely , Sascha Hauer , Rob Herring , Rob Landley , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org Subject: [PATCH RFC v2] media: i2c: mt9p031: add OF support Date: Thu, 2 May 2013 11:52:34 +0530 Message-Id: <1367475754-19477-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. 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: 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. .../devicetree/bindings/media/i2c/mt9p031.txt | 37 ++++++++++++ drivers/media/i2c/mt9p031.c | 62 +++++++++++++++++++- 2 files changed, 97 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..cbe352b --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/mt9p031.txt @@ -0,0 +1,37 @@ +* 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 + +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..8ce3561 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,57 @@ static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { * Driver initialization and probing */ +#if defined(CONFIG_OF) +static struct mt9p031_platform_data * + mt9p031_get_pdata(struct i2c_client *client) + +{ + if (client->dev.of_node) { + struct device_node *np; + struct mt9p031_platform_data *pdata; + + 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) { + dev_err(&client->dev, + "mt9p031 failed allocate memeory\n"); + return NULL; + } + pdata->reset = of_get_named_gpio(client->dev.of_node, + "gpio-reset", 0); + if (!gpio_is_valid(pdata->reset)) + pdata->reset = -1; + + if (of_property_read_u32(np, "input-clock-frequency", + &pdata->ext_freq)) + return NULL; + + if (of_property_read_u32(np, "pixel-clock-frequency", + &pdata->target_freq)) + return NULL; + + return pdata; + } + + return client->dev.platform_data; +} +#else +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; @@ -1070,8 +1120,16 @@ static const struct i2c_device_id mt9p031_id[] = { }; MODULE_DEVICE_TABLE(i2c, mt9p031_id); +static const struct of_device_id mt9p031_of_match[] = { + { .compatible = "aptina,mt9p031", }, + { .compatible = "aptina,mt9p031m", }, + {}, +}; +MODULE_DEVICE_TABLE(of, mt9p031_of_match); + static struct i2c_driver mt9p031_i2c_driver = { .driver = { + .of_match_table = of_match_ptr(mt9p031_of_match), .name = "mt9p031", }, .probe = mt9p031_probe,