From patchwork Sat May 30 00:04:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 27863 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 19D7DB707D for ; Sat, 30 May 2009 10:07:10 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MAC3v-00064t-Og; Sat, 30 May 2009 00:04:35 +0000 Received: from wf-out-1314.google.com ([209.85.200.170]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MAC3m-00063S-G5 for linux-mtd@lists.infradead.org; Sat, 30 May 2009 00:04:33 +0000 Received: by wf-out-1314.google.com with SMTP id 23so1882651wfg.24 for ; Fri, 29 May 2009 17:04:24 -0700 (PDT) Received: by 10.142.162.9 with SMTP id k9mr1008751wfe.3.1243641864355; Fri, 29 May 2009 17:04:24 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 32sm780896wfc.14.2009.05.29.17.04.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 29 May 2009 17:04:23 -0700 (PDT) From: Kevin Hilman To: linux-mtd@lists.infradead.org Subject: [PATCH] NAND: davinci: update clock naming Date: Fri, 29 May 2009 17:04:22 -0700 Message-Id: <1243641862-1404-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.2.2 X-Spam-Score: 0.0 (/) Cc: Kevin Hilman , davinci-linux-open-source@linux.davincidsp.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org DaVinci clock support has been updated in mainline. Update clock names accordingly. Signed-off-by: Kevin Hilman Acked-by: David Brownell --- 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; }