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>
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 5c7ccbc..c338868 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1437,19 +1437,18 @@
CLK_DUMMY("sfpb_clk", SFPB_CLK, NULL, 0),
CLK_DUMMY("sfpb_a_clk", SFPB_A_CLK, NULL, 0),
- CLK_DUMMY("gsbi_uart_clk", GSBI1_UART_CLK, NULL, OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI2_UART_CLK,
- "msm_serial_hsl.0", OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI3_UART_CLK, NULL, OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI4_UART_CLK, NULL, OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI5_UART_CLK, NULL, OFF),
- CLK_DUMMY("uartdm_clk", GSBI6_UART_CLK, NULL, OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI7_UART_CLK, NULL, OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI8_UART_CLK, NULL, OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI9_UART_CLK, NULL, OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI10_UART_CLK, NULL, OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI11_UART_CLK, NULL, OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI12_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI1_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI2_UART_CLK, "msm_serial_hsl.0", OFF),
+ CLK_DUMMY("core_clk", GSBI3_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI4_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI5_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI6_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI7_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI8_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI9_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI10_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI11_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI12_UART_CLK, NULL, OFF),
CLK_DUMMY("spi_clk", GSBI1_QUP_CLK, "spi_qsd.0", OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI2_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI3_QUP_CLK, NULL, OFF),
@@ -1490,7 +1489,7 @@
CLK_DUMMY("gsbi_pclk", GSBI4_P_CLK,
"qup_i2c.4", OFF),
CLK_DUMMY("gsbi_pclk", GSBI5_P_CLK, NULL, OFF),
- CLK_DUMMY("uartdm_pclk", GSBI6_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", GSBI6_P_CLK, NULL, OFF),
CLK_DUMMY("gsbi_pclk", GSBI7_P_CLK, NULL, OFF),
CLK_DUMMY("gsbi_pclk", GSBI8_P_CLK, NULL, OFF),
CLK_DUMMY("gsbi_pclk", GSBI9_P_CLK, NULL, OFF),