commit ac294855f68a2411b0283163de1c45994a509a73
author Matt Wagantall <mattw@codeaurora.org> Wed Aug 17 15:44:58 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:16:43 2011 -0700
tree fbc09daa6de467a401e045fef2cc7e24efa9c693
parent 33dbc0052a6610c41fdb239e9e1aba9bac0ffa29

msm: clock: Rename all I2C/SPI clocks to 'core_clk' or "iface_clk"

Drivers should now use their device names to distinguish between
clocks of the same type rather than the clock name.

Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

Conflicts:

	arch/arm/mach-msm/board-qrdc.c
	arch/arm/mach-msm/board-qt8660.c

drivers/spi/spi_qsd.c

diff --git a/drivers/spi/spi_qsd.c b/drivers/spi/spi_qsd.c
index 28d3955..9ef08cd 100644
--- a/drivers/spi/spi_qsd.c
+++ b/drivers/spi/spi_qsd.c
@@ -2302,16 +2302,16 @@
 	locked = 1;
 
 	dd->dev = &pdev->dev;
-	dd->clk = clk_get(&pdev->dev, "spi_clk");
+	dd->clk = clk_get(&pdev->dev, "core_clk");
 	if (IS_ERR(dd->clk)) {
-		dev_err(&pdev->dev, "%s: unable to get spi_clk\n", __func__);
+		dev_err(&pdev->dev, "%s: unable to get core_clk\n", __func__);
 		rc = PTR_ERR(dd->clk);
 		goto err_probe_clk_get;
 	}
 
-	dd->pclk = clk_get(&pdev->dev, "spi_pclk");
+	dd->pclk = clk_get(&pdev->dev, "iface_clk");
 	if (IS_ERR(dd->pclk)) {
-		dev_err(&pdev->dev, "%s: unable to get spi_pclk\n", __func__);
+		dev_err(&pdev->dev, "%s: unable to get iface_clk\n", __func__);
 		rc = PTR_ERR(dd->pclk);
 		goto err_probe_pclk_get;
 	}
@@ -2321,7 +2321,7 @@
 
 	rc = clk_enable(dd->clk);
 	if (rc) {
-		dev_err(&pdev->dev, "%s: unable to enable spi_clk\n",
+		dev_err(&pdev->dev, "%s: unable to enable core_clk\n",
 			__func__);
 		goto err_probe_clk_enable;
 	}
@@ -2329,7 +2329,7 @@
 
 	rc = clk_enable(dd->pclk);
 	if (rc) {
-		dev_err(&pdev->dev, "%s: unable to enable spi_pclk\n",
+		dev_err(&pdev->dev, "%s: unable to enable iface_clk\n",
 		__func__);
 		goto err_probe_pclk_enable;
 	}