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: 1168971 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 58B893FE4F for ; Sat, 7 Jul 2012 20:53:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Snbvi-00040K-Bd; Sat, 07 Jul 2012 20:48:38 +0000 Received: from mail-yw0-f49.google.com ([209.85.213.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Snbun-0003zc-5T for linux-arm-kernel@lists.infradead.org; Sat, 07 Jul 2012 20:47:46 +0000 Received: by yhjj52 with SMTP id j52so11759072yhj.36 for ; Sat, 07 Jul 2012 13:47:33 -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=k1wwLG8D1Iach7rCNLO6Ws62N+j+vBoihxNJHXtn+SQ=; b=Bd6pC52+iyPo8VxdpM9Bs6EjVa6wBvvSWdgETNQYIX8MsxT9ke1yDLAHwlPwLN0dWs 8eTfz5R6cU4FaKUhJryHs2z9voLWwjY8234MrQhM2RL/2HpnQiwGwQIzNiN8DpHzUz+b 3M6CH6DuMbh6fkPbK2wiWWovj/Di2hQEHz0Vc1sEUI7raqQRrQTiJ46A5NzMCgLnLGDQ NndJ/V9ll6lLRLuTA0zjWMEC5d1KnnM/BA3L7ZuZqMkk7w4qLvcepNsTcecnnoQzIsAB ZIWK6EBdsd6KSCzMNe3ghZo4nko9tJvgfwL4L/zjePqXsPExjrQHugnqjE8ZA5HokN29 WRjg== 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 Subject: [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-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.213.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (festevam[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Fabio Estevam , a.zummo@towertech.it, akpm@linux-foundation.org, rtc-linux@googlegroups.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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);