From patchwork Fri Apr 3 11:26:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 16094 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 n33BQAYD015772 for ; Fri, 3 Apr 2009 11:26:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757356AbZDCL0K (ORCPT ); Fri, 3 Apr 2009 07:26:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761548AbZDCL0J (ORCPT ); Fri, 3 Apr 2009 07:26:09 -0400 Received: from mail.gmx.net ([213.165.64.20]:56928 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1757356AbZDCL0I (ORCPT ); Fri, 3 Apr 2009 07:26:08 -0400 Received: (qmail invoked by alias); 03 Apr 2009 11:26:05 -0000 Received: from p57BD1713.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.23.19] by mail.gmx.net (mp002) with SMTP; 03 Apr 2009 13:26:05 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1/SYJxHUATSyEhaXLNxC85hID3C1bNNTdrwFNykfy hX1upKbgRcWC/j Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1LphXI-0001oS-0F; Fri, 03 Apr 2009 13:26:12 +0200 Date: Fri, 3 Apr 2009 13:26:11 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Sascha Hauer cc: Linux Media Mailing List Subject: [PATCH v2] mx3-camera: adapt the clock definition and the driver to the new clock naming In-Reply-To: <20090403085401.GO23731@pengutronix.de> Message-ID: References: <20090403082844.GM23731@pengutronix.de> <20090403085401.GO23731@pengutronix.de> MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.49 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org With the i.MX31 transition to clkdev clock names have changed, but mistakenly the "mx3-camera.0" has been registered with a non-NULL connection ID, which is not necessary, since this is the only clock, used by the capture interface driver. Fix the clock definition and the driver to use NULL as a connection ID. Signed-off-by: Guennadi Liakhovetski --- Clock connection IDs fixed to NULL. Sascha, please, ack. arch/arm/mach-mx3/clock.c | 2 +- drivers/media/video/mx3_camera.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c index ca46f48..9957a11 100644 --- a/arch/arm/mach-mx3/clock.c +++ b/arch/arm/mach-mx3/clock.c @@ -533,7 +533,7 @@ static struct clk_lookup lookups[] __initdata = { _REGISTER_CLOCK(NULL, "kpp", kpp_clk) _REGISTER_CLOCK("fsl-usb2-udc", "usb", usb_clk1) _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", usb_clk2) - _REGISTER_CLOCK("mx3-camera.0", "csi", csi_clk) + _REGISTER_CLOCK("mx3-camera.0", NULL, csi_clk) _REGISTER_CLOCK("imx-uart.0", NULL, uart1_clk) _REGISTER_CLOCK("imx-uart.1", NULL, uart2_clk) _REGISTER_CLOCK("imx-uart.2", NULL, uart3_clk) diff --git a/drivers/media/video/mx3_camera.c b/drivers/media/video/mx3_camera.c index 70629e1..c462b81 100644 --- a/drivers/media/video/mx3_camera.c +++ b/drivers/media/video/mx3_camera.c @@ -1100,7 +1100,7 @@ static int mx3_camera_probe(struct platform_device *pdev) } memset(mx3_cam, 0, sizeof(*mx3_cam)); - mx3_cam->clk = clk_get(&pdev->dev, "csi_clk"); + mx3_cam->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(mx3_cam->clk)) { err = PTR_ERR(mx3_cam->clk); goto eclkget;