From patchwork Wed Mar 24 11:30:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Zapolskiy X-Patchwork-Id: 48395 Return-Path: <3BvipSwoJCfMquVkjgnfdtbhVdg.XjhmoX-gdipsbjjbgZbmjpkn.Xjh@groups.bounces.google.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-gw0-f56.google.com (mail-gw0-f56.google.com [74.125.83.56]) by ozlabs.org (Postfix) with ESMTP id 5A3A7B7CF9 for ; Wed, 24 Mar 2010 22:31:20 +1100 (EST) Received: by gwaa12 with SMTP id a12sf4599419gwa.11 for ; Wed, 24 Mar 2010 04:31:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:received:mime-version:x-beenthere:received :received:received:received:received-spf:received:received:received :from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-original-authentication-results:x-original-sender:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :x-thread-url:x-message-url:sender:list-subscribe:list-unsubscribe :content-type; bh=0IVPa4+B24urZMgbZczNgHCH5R898kZKiM7HD/yPe3E=; b=6gnaS70/k2Z4aXjItf0XiyxI4I2DE7EJV4SVrzNv5ADxCVxB4M6GWzlyjdnymlX8TC 0Dv5evDHAGa3fqEw0Sk1hQIP1JU7dTYKorHGZbwhPTaSjrzG64DAvCZ6SqlfCuwYmk1P kbHE55lzf9IHGXuClcL2UPCjIAu2cajdl63PY= DomainKey-Signature: a=rsa-sha1; c=nofws; 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-authentication-results:x-original-sender:reply-to :precedence:mailing-list:list-id:list-post:list-help:list-archive :x-thread-url:x-message-url:sender:list-subscribe:list-unsubscribe :content-type; b=uwqKcRXMjIi5GydGdS4SALIkPKvuFvrAvfE0mnpZbaP4jgF3a9R24/X6dV/0M5XbeA 2aPQB7aVwwsiPWJpB/mSo7YFF+trQEAtZWGmPJccZEfMk2+YA/kusn/56SAURR8znyC/ wL9urpsZ99kj8bVNJ2eKONcVnaKxjv8DtaKdw= Received: by 10.91.119.12 with SMTP id w12mr29709agm.42.1269430278586; Wed, 24 Mar 2010 04:31:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.204.35.68 with SMTP id o4ls474826bkd.1.p; Wed, 24 Mar 2010 04:31:17 -0700 (PDT) Received: by 10.204.36.198 with SMTP id u6mr139391bkd.35.1269430276783; Wed, 24 Mar 2010 04:31:16 -0700 (PDT) Received: by 10.204.36.198 with SMTP id u6mr139390bkd.35.1269430276761; Wed, 24 Mar 2010 04:31:16 -0700 (PDT) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.155]) by gmr-mx.google.com with ESMTP id e24si5130362bke.2.2010.03.24.04.31.15; Wed, 24 Mar 2010 04:31:15 -0700 (PDT) Received-SPF: pass (google.com: domain of vzapolskiy@gmail.com designates 72.14.220.155 as permitted sender) client-ip=72.14.220.155; Received: by fg-out-1718.google.com with SMTP id d23so1812901fga.16 for ; Wed, 24 Mar 2010 04:31:15 -0700 (PDT) Received: by 10.87.63.22 with SMTP id q22mr8503232fgk.2.1269430275487; Wed, 24 Mar 2010 04:31:15 -0700 (PDT) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id 4sm19732fge.28.2010.03.24.04.31.14 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 24 Mar 2010 04:31:15 -0700 (PDT) From: Vladimir Zapolskiy To: rtc-linux@googlegroups.com Cc: Vladimir Zapolskiy , Alessandro Zummo , Daniel Mack , Andrew Morton Subject: [rtc-linux] [PATCH 2/2] rtc-mxc: remove unnecessary clock source for rtc subsystem Date: Wed, 24 Mar 2010 14:30:45 +0300 Message-Id: <1269430245-22546-2-git-send-email-vzapolskiy@gmail.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1269430245-22546-1-git-send-email-vzapolskiy@gmail.com> References: <1269430245-22546-1-git-send-email-vzapolskiy@gmail.com> X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vzapolskiy@gmail.com designates 72.14.220.155 as permitted sender) smtp.mail=vzapolskiy@gmail.com; dkim=pass (test mode) header.i=@gmail.com X-Original-Sender: vzapolskiy@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: List-Post: , List-Help: , List-Archive: X-Thread-Url: http://groups.google.com/group/rtc-linux/t/bdb9f13a6f48c21c X-Message-Url: http://groups.google.com/group/rtc-linux/msg/c60d686f0c613aa6 Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , On imx SoCs rtc clock parent is CKIL, but clock rate shall be determined using rtc clock itself, that eliminates CKIL clock usage in the driver. Signed-off-by: Vladimir Zapolskiy Cc: Alessandro Zummo Cc: Daniel Mack Cc: Andrew Morton --- drivers/rtc/rtc-mxc.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c index b3fa23d..190c1fd 100644 --- a/drivers/rtc/rtc-mxc.c +++ b/drivers/rtc/rtc-mxc.c @@ -378,7 +378,6 @@ static struct rtc_class_ops mxc_rtc_ops = { static int __init mxc_rtc_probe(struct platform_device *pdev) { - struct clk *clk; struct resource *res; struct rtc_device *rtc; struct rtc_plat_data *pdata = NULL; @@ -401,14 +400,15 @@ static int __init mxc_rtc_probe(struct platform_device *pdev) pdata->ioaddr = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - clk = clk_get(&pdev->dev, "ckil"); - if (IS_ERR(clk)) { - ret = PTR_ERR(clk); + pdata->clk = clk_get(&pdev->dev, "rtc"); + if (IS_ERR(pdata->clk)) { + dev_err(&pdev->dev, "unable to get clock!\n"); + ret = PTR_ERR(pdata->clk); goto exit_free_pdata; } - rate = clk_get_rate(clk); - clk_put(clk); + clk_enable(pdata->clk); + rate = clk_get_rate(pdata->clk); if (rate == 32768) reg = RTC_INPUT_CLK_32768HZ; @@ -419,7 +419,7 @@ static int __init mxc_rtc_probe(struct platform_device *pdev) else { dev_err(&pdev->dev, "rtc clock is not valid (%lu)\n", rate); ret = -EINVAL; - goto exit_free_pdata; + goto exit_put_clk; } reg |= RTC_ENABLE_BIT; @@ -427,18 +427,9 @@ static int __init mxc_rtc_probe(struct platform_device *pdev) if (((readw(pdata->ioaddr + RTC_RTCCTL)) & RTC_ENABLE_BIT) == 0) { dev_err(&pdev->dev, "hardware module can't be enabled!\n"); ret = -EIO; - goto exit_free_pdata; - } - - pdata->clk = clk_get(&pdev->dev, "rtc"); - if (IS_ERR(pdata->clk)) { - dev_err(&pdev->dev, "unable to get clock!\n"); - ret = PTR_ERR(pdata->clk); - goto exit_free_pdata; + goto exit_put_clk; } - clk_enable(pdata->clk); - rtc = rtc_device_register(pdev->name, &pdev->dev, &mxc_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) {