From patchwork Mon May 13 05:17:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 2556251 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 98BDC3FD4E for ; Mon, 13 May 2013 05:17:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752684Ab3EMFRd (ORCPT ); Mon, 13 May 2013 01:17:33 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:52983 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751418Ab3EMFRc (ORCPT ); Mon, 13 May 2013 01:17:32 -0400 Received: by mail-pa0-f46.google.com with SMTP id fa10so4318536pad.33 for ; Sun, 12 May 2013 22:17:31 -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=52sOzZ/ko/L6g5PUTYfzMNLc2IVm+EL7t2C2lCqONZY=; b=HoQEv6StFeRCZ8aCBk7iEtOZPlFurPYJVR17TwvUJQAwWQDeLUvzSvcPHCXf1PSenN fsSB75LmuDG35ngfyS8a+fgY3BgxbixtCCh+Y0OGaNAYDH0PfT3fLK5MijgZywNlRi6V /SrgnnlI2vQDlQfIotud5P1RLQtDRpJPHJamR+tB0Bpii4NR+VZP/ZkGJs1scAPdZcU8 j8shBToa47+i85xLlv2CXedczKRRRbOpQkBuJ86MOCyh/AUt5Yd1E7zYl2mOmFhsh160 379BI5xsYNgzXjSheDwj1KnMu7xL75dMN/F0nGrpM4NKL0lDViDKIv/SGf5jeUOzsLk5 TfGg== X-Received: by 10.68.13.168 with SMTP id i8mr27787460pbc.86.1368422251403; Sun, 12 May 2013 22:17:31 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPSA id zy5sm12494527pbb.43.2013.05.12.22.17.22 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 12 May 2013 22:17:30 -0700 (PDT) From: Lad Prabhakar To: LMML Cc: DLOS , LKML , Mauro Carvalho Chehab , "Lad, Prabhakar" , Hans Verkuil , Laurent Pinchart , Guennadi Liakhovetski , Sylwester Nawrocki , Sakari Ailus , Grant Likely , Sascha Hauer , Rob Herring , Rob Landley , Arnd Bergmann , devicetree-discuss@lists.ozlabs.org, linux-doc@vger.kernel.org Subject: [PATCH RFC V4 FINAL] media: i2c: mt9p031: add OF support Date: Mon, 13 May 2013 10:47:04 +0530 Message-Id: <1368422224-19590-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: 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 v4: 1: Renamed "gpio-reset" property to "reset-gpios". 2: Dropped assigning the driver data from the of node. 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. 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 | 40 +++++++++++++++++++ drivers/media/i2c/mt9p031.c | 42 +++++++++++++++++++- 2 files changed, 80 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 28cf95b..a58207c 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,35 @@ 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, "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); + + 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 +1098,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,