From patchwork Sat Jul 7 20:47:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 169610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-ob0-f184.google.com (mail-ob0-f184.google.com [209.85.214.184]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 87A6E2C0215 for ; Sun, 8 Jul 2012 06:47:36 +1000 (EST) Received: by obbwc20 with SMTP id wc20sf10364146obb.11 for ; Sat, 07 Jul 2012 13:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; bh=UjkWFXbp+NvmUg8I6EMaFqw0ujMBuWNSCcUDiA6N3oc=; b=KbbOvCc0hiIQm0Db/n77mIohlrmuZ9V3CbzRYRV0/4ECWNYJTVA2XyR1ckIvTd3OBE 7DQIKVZpT7Nlw/Id9bu0qdB0jReaRvJCMd9MGhkhOCqrpZoPzDZZG6TPNNGj5ampqNV1 h8S+QLNce0sc0fsgihk7+hYVLqoT9rq/c0WRk= Received: by 10.236.176.66 with SMTP id a42mr2826108yhm.5.1341694053671; Sat, 07 Jul 2012 13:47:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.236.114.20 with SMTP id b20ls8073469yhh.2.gmail; Sat, 07 Jul 2012 13:47:33 -0700 (PDT) Received: by 10.236.191.40 with SMTP id f28mr62068535yhn.2.1341694053366; Sat, 07 Jul 2012 13:47:33 -0700 (PDT) Received: by 10.236.191.40 with SMTP id f28mr62068532yhn.2.1341694053355; Sat, 07 Jul 2012 13:47:33 -0700 (PDT) Received: from mail-yx0-f174.google.com (mail-yx0-f174.google.com [209.85.213.174]) by gmr-mx.google.com with ESMTPS id u67si2610200yhi.7.2012.07.07.13.47.33 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 07 Jul 2012 13:47:33 -0700 (PDT) Received-SPF: pass (google.com: domain of festevam@gmail.com designates 209.85.213.174 as permitted sender) client-ip=209.85.213.174; Received: by mail-yx0-f174.google.com with SMTP id l2so10348355yen.33 for ; Sat, 07 Jul 2012 13:47:33 -0700 (PDT) Received: by 10.236.186.74 with SMTP id v50mr42048291yhm.1.1341694053145; Sat, 07 Jul 2012 13:47:33 -0700 (PDT) Received: from localhost.localdomain ([189.5.6.233]) by mx.google.com with ESMTPS id t22sm25977814anh.20.2012.07.07.13.47.31 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 07 Jul 2012 13:47:32 -0700 (PDT) From: Fabio Estevam To: kernel@pengutronix.de Cc: a.zummo@towertech.it, linux-arm-kernel@lists.infradead.org, rtc-linux@googlegroups.com, akpm@linux-foundation.org, Fabio Estevam Subject: [rtc-linux] [PATCH 2/3] rtc: rtc-mxc: Adapt to the new i.mx clock framework Date: Sat, 7 Jul 2012 17:47:20 -0300 Message-Id: <1341694041-7839-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1341694041-7839-1-git-send-email-festevam@gmail.com> References: <1341694041-7839-1-git-send-email-festevam@gmail.com> X-Original-Sender: festevam@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of festevam@gmail.com designates 209.85.213.174 as permitted sender) smtp.mail=festevam@gmail.com; dkim=pass header.i=@gmail.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , From: Fabio Estevam Signed-off-by: Fabio Estevam --- drivers/rtc/rtc-mxc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c index e3e50d6..5d8456a 100644 --- a/drivers/rtc/rtc-mxc.c +++ b/drivers/rtc/rtc-mxc.c @@ -367,14 +367,14 @@ static int __init mxc_rtc_probe(struct platform_device *pdev) pdata->ioaddr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - pdata->clk = clk_get(&pdev->dev, "rtc"); + pdata->clk = clk_get(&pdev->dev, NULL); if (IS_ERR(pdata->clk)) { dev_err(&pdev->dev, "unable to get clock!\n"); ret = PTR_ERR(pdata->clk); goto exit_free_pdata; } - clk_enable(pdata->clk); + clk_prepare_enable(pdata->clk); rate = clk_get_rate(pdata->clk); if (rate == 32768) @@ -426,7 +426,7 @@ static int __init mxc_rtc_probe(struct platform_device *pdev) exit_clr_drvdata: platform_set_drvdata(pdev, NULL); exit_put_clk: - clk_disable(pdata->clk); + clk_disable_unprepare(pdata->clk); clk_put(pdata->clk); exit_free_pdata: @@ -440,7 +440,7 @@ static int __exit mxc_rtc_remove(struct platform_device *pdev) rtc_device_unregister(pdata->rtc); - clk_disable(pdata->clk); + clk_disable_unprepare(pdata->clk); clk_put(pdata->clk); platform_set_drvdata(pdev, NULL);