[ARM] MXC: remove _clk suffix from clock names

The context makes it clear already that these are clocks, so there's
no need for such a suffix. This patch only changes the clocks actually
used in the tree. The remaining clocks are renamed in the subsequent
architecture specific patches.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 21fd4f1c4806..bad048aca89a 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -880,7 +880,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
         this->read_buf = mxc_nand_read_buf;
         this->verify_buf = mxc_nand_verify_buf;
 
-        host->clk = clk_get(&pdev->dev, "nfc_clk");
+        host->clk = clk_get(&pdev->dev, "nfc");
         if (IS_ERR(host->clk))
                 goto eclk;
 
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index a50954612b60..9f460b175c50 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1129,7 +1129,7 @@ static int serial_imx_probe(struct platform_device *pdev)
         sport->timer.function = imx_timeout;
         sport->timer.data     = (unsigned long)sport;
 
-        sport->clk = clk_get(&pdev->dev, "uart_clk");
+        sport->clk = clk_get(&pdev->dev, "uart");
         if (IS_ERR(sport->clk)) {
                 ret = PTR_ERR(sport->clk);
                 goto unmap;
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index b9d74d0b353e..65244c02551b 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -116,7 +116,7 @@ static int __init mxc_w1_probe(struct platform_device *pdev)
         if (!mdev)
                 return -ENOMEM;
 
-        mdev->clk = clk_get(&pdev->dev, "owire_clk");
+        mdev->clk = clk_get(&pdev->dev, "owire");
         if (!mdev->clk) {
                 err = -ENODEV;
                 goto failed_clk;