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: 2831624 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5C857C0319 for ; Mon, 22 Jul 2013 23:49:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8956420243 for ; Mon, 22 Jul 2013 23:49:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B30BE20208 for ; Mon, 22 Jul 2013 23:49:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753193Ab3GVXtu (ORCPT ); Mon, 22 Jul 2013 19:49:50 -0400 Received: from mail-ee0-f52.google.com ([74.125.83.52]:54976 "EHLO mail-ee0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753094Ab3GVXts (ORCPT ); Mon, 22 Jul 2013 19:49:48 -0400 Received: by mail-ee0-f52.google.com with SMTP id c50so4154194eek.25 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 Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Kukjin Kim , Mark Brown , Mike Turquette , Arnd Bergmann , Olof Johansson , stern@rowland.harvard.edu, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, Sylwester Nawrocki , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Thomas Abraham , Tomasz Figa 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> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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