From patchwork Sun Jun 16 11:20:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 251670 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-wg0-x238.google.com (mail-wg0-x238.google.com [IPv6:2a00:1450:400c:c00::238]) (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 392142C016F for ; Sun, 16 Jun 2013 21:20:50 +1000 (EST) Received: by mail-wg0-f56.google.com with SMTP id k14sf371715wgh.1 for ; Sun, 16 Jun 2013 04:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:x-beenthere:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references:x-spam:x-mras: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=PMCEqMcEeZS6lVMRD3SSfNLWgS500D6rsOMC/D9oe/U=; b=NXQovFgiUxITbP7o7E34wCfPPl7bRHv2nUs0qHjBUue76eR2BwtIa4KP/dB+VpJOMZ VizWeqCkwrotaKWlF5NtYDlbq9F+prjCifVaaQnPEI4+lLl5bKQzBF7VvBH1LXznkZAA O4JiW5mDmEcIJQT7lVtrEE9WMsf587TOacm994/gdyXaoH7YcKy14+6MQF5wqoCSeWXS 8pf2OHyZjnYl2NGbxp2CN7amBLcOTruxvUnoD+wo5QibGLQZOLfVSeCd/UmonWE/Svde sAPuLEqv1kcaAvDi/CcCFHmCtxN8Zmb5DjFnlbRa0jOh1LHRGsxLsPQDo8kMCN1ONRai Lutg== X-Received: by 10.180.198.100 with SMTP id jb4mr130816wic.14.1371381645942; Sun, 16 Jun 2013 04:20:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.180.185.197 with SMTP id fe5ls185477wic.30.canary; Sun, 16 Jun 2013 04:20:45 -0700 (PDT) X-Received: by 10.205.32.144 with SMTP id sk16mr734139bkb.4.1371381645567; Sun, 16 Jun 2013 04:20:45 -0700 (PDT) Received: from smtp45.i.mail.ru (smtp45.i.mail.ru. [94.100.177.105]) by gmr-mx.google.com with ESMTPS id ev8si546922bkc.1.2013.06.16.04.20.45 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 16 Jun 2013 04:20:45 -0700 (PDT) Received-SPF: pass (google.com: domain of shc_work@mail.ru designates 94.100.177.105 as permitted sender) client-ip=94.100.177.105; Received: from [188.134.40.128] (port=21129 helo=shc.zet) by smtp45.i.mail.ru with esmtpa (envelope-from ) id 1UoB0m-0004jB-QO; Sun, 16 Jun 2013 15:20:44 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Cc: rtc-linux@googlegroups.com, Russell King , Sascha Hauer , Grant Likely , Rob Herring , Alessandro Zummo , Shawn Guo , Alexander Shiyan Subject: [rtc-linux] [PATCH 2/3] ARM: imx: Using proper clocks for RTC driver Date: Sun, 16 Jun 2013 15:20:23 +0400 Message-Id: <1371381624-18823-2-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1371381624-18823-1-git-send-email-shc_work@mail.ru> References: <1371381624-18823-1-git-send-email-shc_work@mail.ru> X-Spam: Not detected X-Mras: Ok X-Original-Sender: shc_work@mail.ru X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of shc_work@mail.ru designates 94.100.177.105 as permitted sender) smtp.mail=shc_work@mail.ru; dkim=pass header.i=@mail.ru 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: , i.MX RTC driver requires 32k clock for time function and optional clock for module itself. This patch fixes these clock names for the driver and adds missing definitions. Signed-off-by: Alexander Shiyan --- arch/arm/mach-imx/clk-imx1.c | 2 +- arch/arm/mach-imx/clk-imx21.c | 3 ++- arch/arm/mach-imx/clk-imx27.c | 3 ++- arch/arm/mach-imx/clk-imx31.c | 3 ++- arch/arm/mach-imx/clk-imx35.c | 2 ++ drivers/rtc/rtc-mxc.c | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/clk-imx1.c b/arch/arm/mach-imx/clk-imx1.c index 15f9d22..b001a8d 100644 --- a/arch/arm/mach-imx/clk-imx1.c +++ b/arch/arm/mach-imx/clk-imx1.c @@ -106,7 +106,7 @@ int __init mx1_clocks_init(unsigned long fref) clk_register_clkdev(clk[dummy], "ahb", "imx1-fb.0"); clk_register_clkdev(clk[hclk], "mshc", NULL); clk_register_clkdev(clk[per3], "ssi", NULL); - clk_register_clkdev(clk[clk32], NULL, "imx1-rtc.0"); + clk_register_clkdev(clk[clk32], "rtc", "imx1-rtc"); clk_register_clkdev(clk[clko], "clko", NULL); mxc_timer_init(MX1_IO_ADDRESS(MX1_TIM1_BASE_ADDR), MX1_TIM1_INT); diff --git a/arch/arm/mach-imx/clk-imx21.c b/arch/arm/mach-imx/clk-imx21.c index d7ed660..a88f331 100644 --- a/arch/arm/mach-imx/clk-imx21.c +++ b/arch/arm/mach-imx/clk-imx21.c @@ -172,7 +172,8 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) clk_register_clkdev(clk[emma_gate], "emma", NULL); clk_register_clkdev(clk[slcdc_gate], "slcdc", NULL); clk_register_clkdev(clk[gpio_gate], "gpio", NULL); - clk_register_clkdev(clk[rtc_gate], "rtc", NULL); + clk_register_clkdev(clk[ckil], "rtc", "imx21-rtc"); + clk_register_clkdev(clk[rtc_gate], "ipg", "imx21-rtc"); clk_register_clkdev(clk[csi_hclk_gate], "csi", NULL); clk_register_clkdev(clk[ssi1_gate], "ssi1", NULL); clk_register_clkdev(clk[ssi2_gate], "ssi2", NULL); diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c index c3cfa41..f1c01c4 100644 --- a/arch/arm/mach-imx/clk-imx27.c +++ b/arch/arm/mach-imx/clk-imx27.c @@ -283,7 +283,8 @@ int __init mx27_clocks_init(unsigned long fref) clk_register_clkdev(clk[gpio_ipg_gate], "gpio", NULL); clk_register_clkdev(clk[brom_ahb_gate], "brom", NULL); clk_register_clkdev(clk[ata_ahb_gate], "ata", NULL); - clk_register_clkdev(clk[rtc_ipg_gate], NULL, "imx21-rtc"); + clk_register_clkdev(clk[ckil], "rtc", "imx21-rtc"); + clk_register_clkdev(clk[rtc_ipg_gate], "ipg", "imx21-rtc"); clk_register_clkdev(clk[scc_ipg_gate], "scc", NULL); clk_register_clkdev(clk[cpu_div], NULL, "cpufreq-cpu0.0"); clk_register_clkdev(clk[emi_ahb_gate], "emi_ahb" , NULL); diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c index b5b65f3..3f2676d 100644 --- a/arch/arm/mach-imx/clk-imx31.c +++ b/arch/arm/mach-imx/clk-imx31.c @@ -134,7 +134,8 @@ int __init mx31_clocks_init(unsigned long fref) clk_register_clkdev(clk[cspi3_gate], NULL, "imx31-cspi.2"); clk_register_clkdev(clk[pwm_gate], "pwm", NULL); clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0"); - clk_register_clkdev(clk[rtc_gate], NULL, "imx21-rtc"); + clk_register_clkdev(clk[ckil], "rtc", "imx21-rtc"); + clk_register_clkdev(clk[rtc_gate], "ipg", "imx21-rtc"); clk_register_clkdev(clk[epit1_gate], "epit", NULL); clk_register_clkdev(clk[epit2_gate], "epit", NULL); clk_register_clkdev(clk[nfc], NULL, "imx27-nand.0"); diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c index 2193c83..2e5af91 100644 --- a/arch/arm/mach-imx/clk-imx35.c +++ b/arch/arm/mach-imx/clk-imx35.c @@ -258,6 +258,8 @@ int __init mx35_clocks_init(void) clk_register_clkdev(clk[nfc_div], NULL, "imx25-nand.0"); clk_register_clkdev(clk[csi_gate], NULL, "mx3-camera.0"); clk_register_clkdev(clk[admux_gate], "audmux", NULL); + clk_register_clkdev(clk[ckil], "rtc", "imx21-rtc"); + clk_register_clkdev(clk[rtc_gate], "ipg", "imx21-rtc"); clk_prepare_enable(clk[spba_gate]); clk_prepare_enable(clk[gpio1_gate]); diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c index 8becb95..3d692881 100644 --- a/drivers/rtc/rtc-mxc.c +++ b/drivers/rtc/rtc-mxc.c @@ -317,7 +317,7 @@ static int mxc_rtc_probe(struct platform_device *pdev) if (IS_ERR(priv->ioaddr)) return PTR_ERR(priv->ioaddr); - priv->clk_rtc = devm_clk_get(&pdev->dev, NULL); + priv->clk_rtc = devm_clk_get(&pdev->dev, "rtc"); if (IS_ERR(priv->clk_rtc)) { dev_err(&pdev->dev, "Unable to get clock!\n"); return PTR_ERR(priv->clk_rtc);