commit e252237237dd9a482ea75a7fd29ebd443ec4eb35
author Matt Wagantall <mattw@codeaurora.org> Wed Aug 17 14:52:21 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:16:07 2011 -0700
tree 0dfc68e9e1047ae7b82dcd8c102eff652fae6589
parent 688c66a4c2ba7134b68dc026621704397ea6fed4

msm: clock: Rename all UART 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>

drivers/tty/serial/msm_serial.c

diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index e6646ab..dc87ef9 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -1023,7 +1023,7 @@
 	port->dev = &pdev->dev;
 	msm_port = UART_TO_MSM(port);
 
-	msm_port->clk = clk_get(&pdev->dev, "uart_clk");
+	msm_port->clk = clk_get(&pdev->dev, "core_clk");
 	if (unlikely(IS_ERR(msm_port->clk)))
 		return PTR_ERR(msm_port->clk);
 	port->uartclk = clk_get_rate(msm_port->clk);

drivers/tty/serial/msm_serial_hs.c

diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 308616c..17c79b5 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -1907,11 +1907,11 @@
 	uport->uartclk = 7372800;
 	msm_uport->imr_reg = 0x0;
 
-	msm_uport->clk = clk_get(&pdev->dev, "uartdm_clk");
+	msm_uport->clk = clk_get(&pdev->dev, "core_clk");
 	if (IS_ERR(msm_uport->clk))
 		return PTR_ERR(msm_uport->clk);
 
-	msm_uport->pclk = clk_get(&pdev->dev, "uartdm_pclk");
+	msm_uport->pclk = clk_get(&pdev->dev, "iface_clk");
 	/*
 	 * Some configurations do not require explicit pclk control so
 	 * do not flag error on pclk get failure.

drivers/tty/serial/msm_serial_hs_lite.c

diff --git a/drivers/tty/serial/msm_serial_hs_lite.c b/drivers/tty/serial/msm_serial_hs_lite.c
index e41375a1..7fe558b 100644
--- a/drivers/tty/serial/msm_serial_hs_lite.c
+++ b/drivers/tty/serial/msm_serial_hs_lite.c
@@ -1132,13 +1132,12 @@
 	gsbi_resource =	platform_get_resource_byname(pdev,
 						     IORESOURCE_MEM,
 						     "gsbi_resource");
+	msm_hsl_port->clk = clk_get(&pdev->dev, "core_clk");
 	if (gsbi_resource) {
 		msm_hsl_port->is_uartdm = 1;
-		msm_hsl_port->clk = clk_get(&pdev->dev, "gsbi_uart_clk");
-		msm_hsl_port->pclk = clk_get(&pdev->dev, "gsbi_pclk");
+		msm_hsl_port->pclk = clk_get(&pdev->dev, "iface_clk");
 	} else {
 		msm_hsl_port->is_uartdm = 0;
-		msm_hsl_port->clk = clk_get(&pdev->dev, "uartdm_clk");
 		msm_hsl_port->pclk = NULL;
 	}