Patchwork [1/3] ARM: clk-imx27: Fix rtc clock id

login
register
mail settings
Submitter Fabio Estevam
Date July 7, 2012, 8:47 p.m.
Message ID <1341694041-7839-1-git-send-email-festevam@gmail.com>
Download mbox | patch
Permalink /patch/169613/
State New
Headers show

Comments

Fabio Estevam - July 7, 2012, 8:47 p.m.
From: Fabio Estevam <fabio.estevam@freescale.com>

Fix rtc clock id.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/mach-imx/clk-imx27.c |    2 +-
 arch/arm/mach-imx/clk-imx31.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Sascha Hauer - July 9, 2012, 6:50 a.m.
On Sat, Jul 07, 2012 at 05:47:20PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  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);

Since the rest of the driver already uses devm_, why not do it here
aswell?

Sascha

>  	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);
>  
> -- 
> 1.7.1
> 
>
Sascha Hauer - July 9, 2012, 6:51 a.m.
On Sat, Jul 07, 2012 at 05:47:19PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> Fix rtc clock id.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Applied this patch.

Sascha

> ---
>  arch/arm/mach-imx/clk-imx27.c |    2 +-
>  arch/arm/mach-imx/clk-imx31.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c
> index 295cbd7..167a3f1 100644
> --- a/arch/arm/mach-imx/clk-imx27.c
> +++ b/arch/arm/mach-imx/clk-imx27.c
> @@ -256,7 +256,7 @@ 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], "rtc", NULL);
> +	clk_register_clkdev(clk[rtc_ipg_gate], NULL, "mxc_rtc");
>  	clk_register_clkdev(clk[scc_ipg_gate], "scc", NULL);
>  	clk_register_clkdev(clk[cpu_div], "cpu", NULL);
>  	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 c9a06d8..8711090 100644
> --- a/arch/arm/mach-imx/clk-imx31.c
> +++ b/arch/arm/mach-imx/clk-imx31.c
> @@ -123,7 +123,7 @@ 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], "rtc", NULL);
> +	clk_register_clkdev(clk[rtc_gate], NULL, "mxc_rtc");
>  	clk_register_clkdev(clk[epit1_gate], "epit", NULL);
>  	clk_register_clkdev(clk[epit2_gate], "epit", NULL);
>  	clk_register_clkdev(clk[nfc], NULL, "mxc_nand.0");
> -- 
> 1.7.1
> 
>
Andrew Morton - July 9, 2012, 9:18 p.m.
On Sat,  7 Jul 2012 17:47:19 -0300
Fabio Estevam <festevam@gmail.com> wrote:

> Fix rtc clock id.
> 
> --- a/arch/arm/mach-imx/clk-imx27.c
> +++ b/arch/arm/mach-imx/clk-imx27.c
> @@ -256,7 +256,7 @@ 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], "rtc", NULL);
> +	clk_register_clkdev(clk[rtc_ipg_gate], NULL, "mxc_rtc");
>  	clk_register_clkdev(clk[scc_ipg_gate], "scc", NULL);
>  	clk_register_clkdev(clk[cpu_div], "cpu", NULL);
>  	clk_register_clkdev(clk[emi_ahb_gate], "emi_ahb" , NULL);


When I look at this patch I don't know if it changes the user interface
(does it rename or move sysfs files or contents?) and I don't know
whether the patch fixes serious issues, which would indicate that a
backport into -stable is needed.

So, please read and remember these words: when fixing a bug, always
provide a complete description of that bug.  Most especially, provide a
description of the end-user effects of the bug.

Patch

diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c
index 295cbd7..167a3f1 100644
--- a/arch/arm/mach-imx/clk-imx27.c
+++ b/arch/arm/mach-imx/clk-imx27.c
@@ -256,7 +256,7 @@  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], "rtc", NULL);
+	clk_register_clkdev(clk[rtc_ipg_gate], NULL, "mxc_rtc");
 	clk_register_clkdev(clk[scc_ipg_gate], "scc", NULL);
 	clk_register_clkdev(clk[cpu_div], "cpu", NULL);
 	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 c9a06d8..8711090 100644
--- a/arch/arm/mach-imx/clk-imx31.c
+++ b/arch/arm/mach-imx/clk-imx31.c
@@ -123,7 +123,7 @@  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], "rtc", NULL);
+	clk_register_clkdev(clk[rtc_gate], NULL, "mxc_rtc");
 	clk_register_clkdev(clk[epit1_gate], "epit", NULL);
 	clk_register_clkdev(clk[epit2_gate], "epit", NULL);
 	clk_register_clkdev(clk[nfc], NULL, "mxc_nand.0");