From patchwork Mon Jul 22 23:49:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2831631 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A6D779F4D4 for ; Mon, 22 Jul 2013 23:52:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D27FF2021A for ; Mon, 22 Jul 2013 23:52:37 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D3EAC20208 for ; Mon, 22 Jul 2013 23:52:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1Psc-0002ZK-6W; Mon, 22 Jul 2013 23:51:04 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1PsI-0001E5-Ub; Mon, 22 Jul 2013 23:50:42 +0000 Received: from mail-ee0-x229.google.com ([2a00:1450:4013:c00::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V1Prj-00017X-4C for linux-arm-kernel@lists.infradead.org; Mon, 22 Jul 2013 23:50:09 +0000 Received: by mail-ee0-f41.google.com with SMTP id d17so4151863eek.0 for ; Mon, 22 Jul 2013 16:49:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=j9ZjEm47fHCbN6O1RY3kU9KWVoteNlQdUSt9gNQUJJ0=; b=XRgetse14WKiDvH5mWYzKLZCQKKbCbrWc82wD5nmNd76ayauksng8Lu+QiwArzojSc iDFr4xvDS4wT2qRgiqvXNuld6uNgQvDcfWVCgxIhVQxyChOOuOviH4ihDgbpeG3UgXvb 7QN9uTJriMk8SCzK3tbNeOfCWyrE+ueZtrnEylKRM2XQJxFcp9nWFAIP6EsVdcITEOwQ 7cCZtLbH8ViDfiHKoYjG5J6PPxZ9UQ8mLfwBU0EZUoXf+zMlmeDG6Hahb7ctbwJ7wfgh scoHLCe6CdwV3Vcjz1f+DwvroIbGeUV8LlLFx5fDId/w4SGafYremJib2jbpwfE0Njap Gm6A== X-Received: by 10.14.87.133 with SMTP id y5mr29905237eee.50.1374536986482; Mon, 22 Jul 2013 16:49:46 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id n45sm54626864eew.1.2013.07.22.16.49.44 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Jul 2013 16:49:45 -0700 (PDT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 6/8] usb: host: ohci-s3c2410 Use clk_prepare_enable/clk_disable_unprepare Date: Tue, 23 Jul 2013 01:49:23 +0200 Message-Id: <1374536965-3545-7-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1374536965-3545-1-git-send-email-tomasz.figa@gmail.com> References: <1374536965-3545-1-git-send-email-tomasz.figa@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130722_195007_564592_3F17B988 X-CRM114-Status: GOOD ( 10.61 ) X-Spam-Score: -2.0 (--) Cc: devicetree@vger.kernel.org, Kukjin Kim , Mike Turquette , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Arnd Bergmann , gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, Tomasz Figa , Mark Brown , stern@rowland.harvard.edu, Olof Johansson , Thomas Abraham , Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch modifies the ohci-s3c2410 driver to prepare and unprepare clocks in addition to enabling and disabling, since it is required by common clock framework. Signed-off-by: Tomasz Figa Acked-by: Greg Kroah-Hartman --- drivers/usb/host/ohci-s3c2410.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index e125770..db096bf 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c @@ -47,10 +47,10 @@ static void s3c2410_start_hc(struct platform_device *dev, struct usb_hcd *hcd) dev_dbg(&dev->dev, "s3c2410_start_hc:\n"); - clk_enable(usb_clk); + clk_prepare_enable(usb_clk); mdelay(2); /* let the bus clock stabilise */ - clk_enable(clk); + clk_prepare_enable(clk); if (info != NULL) { info->hcd = hcd; @@ -75,8 +75,8 @@ static void s3c2410_stop_hc(struct platform_device *dev) (info->enable_oc)(info, 0); } - clk_disable(clk); - clk_disable(usb_clk); + clk_disable_unprepare(clk); + clk_disable_unprepare(usb_clk); } /* ohci_s3c2410_hub_status_data