From patchwork Fri Apr 12 15:40:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2436381 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 28EF9DF2A1 for ; Fri, 12 Apr 2013 15:41:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754637Ab3DLPk6 (ORCPT ); Fri, 12 Apr 2013 11:40:58 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:58671 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754624Ab3DLPk4 (ORCPT ); Fri, 12 Apr 2013 11:40:56 -0400 Received: from axis700.grange (dslb-088-076-023-104.pools.arcor-ip.net [88.76.23.104]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0Lhp7m-1Uw8wj39Aw-00n6Kx; Fri, 12 Apr 2013 17:40:44 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 2885940BCA; Fri, 12 Apr 2013 17:40:42 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1UQg5h-0004E6-UT; Fri, 12 Apr 2013 17:40:41 +0200 From: Guennadi Liakhovetski To: linux-media@vger.kernel.org Cc: Sylwester Nawrocki , Laurent Pinchart , Hans Verkuil , linux-sh@vger.kernel.org, Magnus Damm , Sakari Ailus , Prabhakar Lad Subject: [PATCH v9 19/20] imx074: support asynchronous probing Date: Fri, 12 Apr 2013 17:40:39 +0200 Message-Id: <1365781240-16149-20-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1365781240-16149-1-git-send-email-g.liakhovetski@gmx.de> References: <1365781240-16149-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:FQqYwzaF/FQsEqoA9E4nMgX+7MMYbeIhm2BK30sVug1 jMan2PEnrUpYAZDb3Zi6dz6pwcXKMvnuLYCZFknH/Y6S6N/lje D8YY/13a9c9FEByCKJ4drlXjk34qLa8iQwpwfyBRLo1KGc3POO 6Tsdzql3pAtIRH8T4uJKzMH+Ad46aaiPKwPHUSthodW/tcqZgf uPlz9+Ejiypn8wT+zal3aR5IFaI7EEcWvCDOv9D6OQxNzLVy4r VG7HFQGd+YBoO9/feRM6NeCQb7Z7L5V8lyuV27cuUxag4m9WmN kIoTN+n8SElS60g//3YrNEB6SlK2fOdoY12bdsK8kbS6oI5tte fvZ4ZjZOkWDeCf3knN1qQ2hilshEN03rCGLwcpHML/UAOW7UjM y1Q2jJ9rPyD0w== 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 | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/soc_camera/imx074.c b/drivers/media/i2c/soc_camera/imx074.c index a6a5060..c0eed84 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 @@ -455,14 +456,27 @@ static int imx074_probe(struct i2c_client *client, priv->fmt = &imx074_colour_fmts[0]; + priv->subdev.dev = &client->dev; + 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 +485,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);