From patchwork Tue Jun 11 08:23:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2700761 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6D25EDF23A for ; Tue, 11 Jun 2013 09:27:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752717Ab3FKJ1X (ORCPT ); Tue, 11 Jun 2013 05:27:23 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:55107 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752104Ab3FKJ1S (ORCPT ); Tue, 11 Jun 2013 05:27:18 -0400 Received: from axis700.grange (dslb-178-001-148-081.pools.arcor-ip.net [178.1.148.81]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0MQcnt-1UwONy1KXd-00TkxX; Tue, 11 Jun 2013 11:27:16 +0200 Received: from 6a.grange (unknown [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 8A01340BD1; Tue, 11 Jun 2013 10:24:05 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1UmJs5-0002C7-6Z; Tue, 11 Jun 2013 10:24:05 +0200 From: Guennadi Liakhovetski To: linux-media@vger.kernel.org Cc: Laurent Pinchart , Sylwester Nawrocki , Hans Verkuil , linux-sh@vger.kernel.org, Magnus Damm , Sakari Ailus , Prabhakar Lad , Sascha Hauer , Guennadi Liakhovetski Subject: [PATCH v10 20/21] imx074: support asynchronous probing Date: Tue, 11 Jun 2013 10:23:47 +0200 Message-Id: <1370939028-8352-21-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1370939028-8352-1-git-send-email-g.liakhovetski@gmx.de> References: <1370939028-8352-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:uN7mn9etsvIo4kkWvYc7Yuv2mrnTg4uKFJI8qptQpUn 9gTS6pIRK/RRZQ2LHpTPvAaLOlH5WQGT1ULzAmftx1qVMvMYsR 5zA29dNrPl9LzpOlgaX0kGzGXIT0jAlXq/lEg+fEHl/1Udq8Qn gR06Apv8mSF+QSp6jnUhnIyDSFT+99FfAGt6M1AVwhVP4CWooE LMxAxY+DMrUJxOixmCrmVN0lWB6ACJBSNiNPhPeg7q52qJms2E 59/ZmOlXvRPBnoieDnliKlGltw6gkL+0BBRuq7yoGAabQrTmxx +U7XC7c8gtZPhGWixqXXgcU3QzfQLHLdGuSMYUCud540/wVu9E UDgj9EHFkycbimn8WuIfCEu6j9T5bNgLBXGbMCeqZY9fwiF+wB pp9n7psR7iVLw== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Both synchronous and asynchronous imx074 subdevice probing is supported by this patch. Signed-off-by: Guennadi Liakhovetski --- drivers/media/i2c/soc_camera/imx074.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/soc_camera/imx074.c b/drivers/media/i2c/soc_camera/imx074.c index a6a5060..84245e1 100644 --- a/drivers/media/i2c/soc_camera/imx074.c +++ b/drivers/media/i2c/soc_camera/imx074.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -456,13 +457,24 @@ static int imx074_probe(struct i2c_client *client, priv->fmt = &imx074_colour_fmts[0]; priv->clk = v4l2_clk_get(&client->dev, "mclk"); - if (IS_ERR(priv->clk)) - return PTR_ERR(priv->clk); + if (IS_ERR(priv->clk)) { + dev_info(&client->dev, "Error %ld getting clock\n", PTR_ERR(priv->clk)); + return -EPROBE_DEFER; + } + + ret = soc_camera_power_init(&client->dev, ssdd); + if (ret < 0) + goto epwrinit; ret = imx074_video_probe(client); if (ret < 0) - v4l2_clk_put(priv->clk); + goto eprobe; + return v4l2_async_register_subdev(&priv->subdev); + +epwrinit: +eprobe: + v4l2_clk_put(priv->clk); return ret; } @@ -471,7 +483,9 @@ static int imx074_remove(struct i2c_client *client) struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client); struct imx074 *priv = to_imx074(client); + v4l2_async_unregister_subdev(&priv->subdev); v4l2_clk_put(priv->clk); + if (ssdd->free_bus) ssdd->free_bus(ssdd);