[PATCH] NAND: davinci: update clock naming

[PATCH] NAND: davinci: update clock naming

[Kevin Hilman]

DaVinci clock support has been updated in mainline.
Update clock names accordingly.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
 drivers/mtd/nand/davinci_nand.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 0119220..02700f7 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -407,16 +407,17 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
 	}
 	info->chip.ecc.mode = ecc_mode;
 
-	info->clk = clk_get(&pdev->dev, "AEMIFCLK");
+	info->clk = clk_get(&pdev->dev, "aemif");
 	if (IS_ERR(info->clk)) {
 		ret = PTR_ERR(info->clk);
-		dev_dbg(&pdev->dev, "unable to get AEMIFCLK, err %d\n", ret);
+		dev_dbg(&pdev->dev, "unable to get AEMIF clock, err %d\n", ret);
 		goto err_clk;
 	}
 
 	ret = clk_enable(info->clk);
 	if (ret < 0) {
-		dev_dbg(&pdev->dev, "unable to enable AEMIFCLK, err %d\n", ret);
+		dev_dbg(&pdev->dev, "unable to enable AEMIF clock, err %d\n",
+			ret);
 		goto err_clk_enable;
 	}
 
-- 
1.6.2.2

Re: [PATCH] NAND: davinci: update clock naming

[David Brownell]

On Friday 29 May 2009, Kevin Hilman wrote:
> DaVinci clock support has been updated in mainline.
> Update clock names accordingly.

... and before 2.6.30-final ships, please.

Acked-by: David Brownell <dbrownell@users.sourceforge.net>


> 
> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
> ---
>  drivers/mtd/nand/davinci_nand.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
> index 0119220..02700f7 100644
> --- a/drivers/mtd/nand/davinci_nand.c
> +++ b/drivers/mtd/nand/davinci_nand.c
> @@ -407,16 +407,17 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
>  	}
>  	info->chip.ecc.mode = ecc_mode;
>  
> -	info->clk = clk_get(&pdev->dev, "AEMIFCLK");
> +	info->clk = clk_get(&pdev->dev, "aemif");
>  	if (IS_ERR(info->clk)) {
>  		ret = PTR_ERR(info->clk);
> -		dev_dbg(&pdev->dev, "unable to get AEMIFCLK, err %d\n", ret);
> +		dev_dbg(&pdev->dev, "unable to get AEMIF clock, err %d\n", ret);
>  		goto err_clk;
>  	}
>  
>  	ret = clk_enable(info->clk);
>  	if (ret < 0) {
> -		dev_dbg(&pdev->dev, "unable to enable AEMIFCLK, err %d\n", ret);
> +		dev_dbg(&pdev->dev, "unable to enable AEMIF clock, err %d\n",
> +			ret);
>  		goto err_clk_enable;
>  	}
>  
> -- 
> 1.6.2.2
> 
> 
> _______________________________________________
> Davinci-linux-open-source mailing list
> Davinci-linux-open-source@linux.davincidsp.com
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
> 
> 

Re: [PATCH] NAND: davinci: update clock naming

[Artem Bityutskiy]

On Fri, 2009-05-29 at 17:04 -0700, Kevin Hilman wrote:
> DaVinci clock support has been updated in mainline.
> Update clock names accordingly.
> 
> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
> ---
>  drivers/mtd/nand/davinci_nand.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)

I've taken this to my l2-mtd-2.6.git. Will also ping dwmw2 about
2.6.30 merging of this patch.

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)

Re: [PATCH] NAND: davinci: update clock naming

[David Woodhouse]

On Fri, 2009-05-29 at 17:28 -0700, David Brownell wrote:
> On Friday 29 May 2009, Kevin Hilman wrote:
> > DaVinci clock support has been updated in mainline.
> > Update clock names accordingly.
> 
> ... and before 2.6.30-final ships, please.

http://git.kernel.org/linus/cd24f8c1

-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation