From patchwork Wed Aug 15 20:16:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 1328531 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 7408A3FC66 for ; Wed, 15 Aug 2012 20:38:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757332Ab2HOUim (ORCPT ); Wed, 15 Aug 2012 16:38:42 -0400 Received: from www.linuxtv.org ([130.149.80.248]:44497 "EHLO www.linuxtv.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757297Ab2HOUik (ORCPT ); Wed, 15 Aug 2012 16:38:40 -0400 Received: from mchehab by www.linuxtv.org with local (Exim 4.72) (envelope-from ) id 1T1kMQ-0007NZ-Si; Wed, 15 Aug 2012 22:38:38 +0200 Message-Id: From: Mauro Carvalho Chehab Date: Wed, 15 Aug 2012 22:16:19 +0200 Subject: [git:v4l-dvb/for_v3.7] [media] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare To: linuxtv-commits@linuxtv.org Cc: Fabio Estevam , Guennadi Liakhovetski , linux-media@vger.kernel.org Mail-followup-to: linux-media@vger.kernel.org Forward-to: linux-media@vger.kernel.org Reply-to: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/media_tree.git tree: Subject: [media] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare Author: Fabio Estevam Date: Fri May 25 20:14:47 2012 -0300 Prepare the clock before enabling it. Cc: Guennadi Liakhovetski Cc: Signed-off-by: Fabio Estevam Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab drivers/media/platform/mx1_camera.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- http://git.linuxtv.org/media_tree.git?a=commitdiff;h=52cf3e42951e8316af9ff0db002f169e3efb63e9 -- 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 diff --git a/drivers/media/platform/mx1_camera.c b/drivers/media/platform/mx1_camera.c index d2e6f82..560a65a 100644 --- a/drivers/media/platform/mx1_camera.c +++ b/drivers/media/platform/mx1_camera.c @@ -403,7 +403,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev) dev_dbg(pcdev->icd->parent, "Activate device\n"); - clk_enable(pcdev->clk); + clk_prepare_enable(pcdev->clk); /* enable CSI before doing anything else */ __raw_writel(csicr1, pcdev->base + CSICR1); @@ -422,7 +422,7 @@ static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev) /* Disable all CSI interface */ __raw_writel(0x00, pcdev->base + CSICR1); - clk_disable(pcdev->clk); + clk_disable_unprepare(pcdev->clk); } /*