From patchwork Wed Sep 23 16:02:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 49562 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8NG38VN024190 for ; Wed, 23 Sep 2009 16:03:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753121AbZIWQBw (ORCPT ); Wed, 23 Sep 2009 12:01:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753079AbZIWQBv (ORCPT ); Wed, 23 Sep 2009 12:01:51 -0400 Received: from mail.gmx.net ([213.165.64.20]:50916 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753080AbZIWQBt (ORCPT ); Wed, 23 Sep 2009 12:01:49 -0400 Received: (qmail invoked by alias); 23 Sep 2009 16:01:51 -0000 Received: from p57BD253C.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.37.60] by mail.gmx.net (mp054) with SMTP; 23 Sep 2009 18:01:51 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1+kfPM5WnikLPkQ4AtVaeGd8ISXSz6VCEQcRYgfwA MgWIMelae8BFmI Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1MqUI8-0002cX-4r; Wed, 23 Sep 2009 18:02:04 +0200 Date: Wed, 23 Sep 2009 18:02:04 +0200 (CEST) From: Guennadi Liakhovetski To: Linux Media Mailing List cc: Mauro Carvalho Chehab , Paul Mundt Subject: Re: [PULL] soc-camera 2.6.32: new driver and a compile-fix In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.46 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Wed, 23 Sep 2009, Guennadi Liakhovetski wrote: > Hi Mauro > > The following two patches are for 2.6.32. One of them fixes > sh_mobile_ceu_camera compile breakage, and another one adds a new > soc-camera / v4l2-subdev driver for ov9640. Marek, looks like you didn't > even compile tested your driver with CONFIG_VIDEO_ADV_DEBUG=y. It didn't > compile, so, I had to fix it. > > Please pull from http://linuxtv.org/hg/~gliakhovetski/v4l-dvb > > for the following 2 changesets: > > 01/02: V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV9640 sensor > http://linuxtv.org/hg/~gliakhovetski/v4l-dvb?cmd=changeset;node=1dec51b360a3 > > 02/02: sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge > http://linuxtv.org/hg/~gliakhovetski/v4l-dvb?cmd=changeset;node=a798c751f06d Sorry, forgot to mention, somehow, the git and the hg versions got Thanks Guennadi Acked-by: Mauro Carvalho Chehab --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html different merges, both wrong, so, for the git the following equivalent patch will be needed, after which the two versions shall be in sync again: sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge Signed-off-by: Guennadi Liakhovetski --- diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 5ab7c5a..65ac474 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/video/sh_mobile_ceu_camera.c @@ -404,7 +404,7 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd) "SuperH Mobile CEU driver attached to camera %d\n", icd->devnum); - clk_enable(pcdev->clk); + pm_runtime_get_sync(ici->v4l2_dev.dev); ceu_write(pcdev, CAPSR, 1 << 16); /* reset */ while (ceu_read(pcdev, CSTSR) & 1) @@ -438,7 +438,7 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd) } spin_unlock_irqrestore(&pcdev->lock, flags); - clk_disable(pcdev->clk); + pm_runtime_put_sync(ici->v4l2_dev.dev); dev_info(icd->dev.parent, "SuperH Mobile CEU driver detached from camera %d\n",