From patchwork Wed Jun 5 23:57:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2676481 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 04B38DF264 for ; Wed, 5 Jun 2013 23:57:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754501Ab3FEX5w (ORCPT ); Wed, 5 Jun 2013 19:57:52 -0400 Received: from mail-bk0-f49.google.com ([209.85.214.49]:39422 "EHLO mail-bk0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753912Ab3FEX5u (ORCPT ); Wed, 5 Jun 2013 19:57:50 -0400 Received: by mail-bk0-f49.google.com with SMTP id 6so1239310bkj.8 for ; Wed, 05 Jun 2013 16:57:49 -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=EU9CXqOD/OBzdh8IHOBnSrxaUC6eqgii8gJDlBcwEg4=; b=WEnM/TTHR8Qelu3WK+NvgvmQaEJDbEbb3csCZbOZ9uVb9oHqQukqpwdKcaHy8nTKt0 Mr9CXTGsGdyB03WYCcpt5EgshW9ZeknKGyHFmov1d7CayZggI2tBNBGlycOM6PoT5wMp kj40gNQYVgpbKwsN6OpqxFS2uhO/QsF7p1bwqXiCWEbJY52RgWqqbcdB90i9w6S117tr 7S7dxorojPHH/BOFHzKlSoqAUEOyaQ7KULWpViHXbWUgDXD0nauG8DvO+EbSMoXDISJ7 dMiy6XrgLlYI5bCxqUFLmZjMa8E6wvdGrdJTnU7UjULTL6NgnsYho0SN+ad6a4XarjKm GrSQ== X-Received: by 10.204.239.9 with SMTP id ku9mr10353461bkb.51.1370476669080; Wed, 05 Jun 2013 16:57:49 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id so13sm26761378bkb.15.2013.06.05.16.57.47 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Jun 2013 16:57:48 -0700 (PDT) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@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, Tomasz Figa Subject: [PATCH 5/7] usb: host: ohci-s3c2410 Use clk_prepare_enable/clk_disable_unprepare Date: Thu, 6 Jun 2013 01:57:29 +0200 Message-Id: <1370476651-6743-6-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1370476651-6743-1-git-send-email-tomasz.figa@gmail.com> References: <1370476651-6743-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 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 --- 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