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/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 8f5ee70..3203cdf 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3493,18 +3493,18 @@
CLK_LOOKUP("smi_clk", smi_clk.c, NULL),
CLK_LOOKUP("smi_a_clk", smi_a_clk.c, NULL),
- CLK_LOOKUP("gsbi_uart_clk", gsbi1_uart_clk.c, NULL),
- CLK_LOOKUP("gsbi_uart_clk", gsbi2_uart_clk.c, NULL),
- CLK_LOOKUP("gsbi_uart_clk", gsbi3_uart_clk.c, "msm_serial_hsl.2"),
- CLK_LOOKUP("gsbi_uart_clk", gsbi4_uart_clk.c, NULL),
- CLK_LOOKUP("gsbi_uart_clk", gsbi5_uart_clk.c, NULL),
- CLK_LOOKUP("uartdm_clk", gsbi6_uart_clk.c, "msm_serial_hs.0"),
- CLK_LOOKUP("gsbi_uart_clk", gsbi7_uart_clk.c, NULL),
- CLK_LOOKUP("gsbi_uart_clk", gsbi8_uart_clk.c, NULL),
- CLK_LOOKUP("gsbi_uart_clk", gsbi9_uart_clk.c, "msm_serial_hsl.1"),
- CLK_LOOKUP("gsbi_uart_clk", gsbi10_uart_clk.c, NULL),
- CLK_LOOKUP("gsbi_uart_clk", gsbi11_uart_clk.c, NULL),
- CLK_LOOKUP("gsbi_uart_clk", gsbi12_uart_clk.c, "msm_serial_hsl.0"),
+ CLK_LOOKUP("core_clk", gsbi1_uart_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gsbi2_uart_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gsbi3_uart_clk.c, "msm_serial_hsl.2"),
+ CLK_LOOKUP("core_clk", gsbi4_uart_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gsbi5_uart_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gsbi6_uart_clk.c, "msm_serial_hs.0"),
+ CLK_LOOKUP("core_clk", gsbi7_uart_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gsbi8_uart_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gsbi9_uart_clk.c, "msm_serial_hsl.1"),
+ CLK_LOOKUP("core_clk", gsbi10_uart_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gsbi11_uart_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gsbi12_uart_clk.c, "msm_serial_hsl.0"),
CLK_LOOKUP("spi_clk", gsbi1_qup_clk.c, "spi_qsd.0"),
CLK_LOOKUP("gsbi_qup_clk", gsbi2_qup_clk.c, NULL),
CLK_LOOKUP("gsbi_qup_clk", gsbi3_qup_clk.c, "qup_i2c.0"),
@@ -3539,19 +3539,19 @@
CLK_LOOKUP("ce_clk", ce2_p_clk.c, NULL),
CLK_LOOKUP("spi_pclk", gsbi1_p_clk.c, "spi_qsd.0"),
CLK_LOOKUP("gsbi_pclk", gsbi2_p_clk.c, NULL),
- CLK_LOOKUP("gsbi_pclk", gsbi3_p_clk.c, "msm_serial_hsl.2"),
+ CLK_LOOKUP("iface_clk", gsbi3_p_clk.c, "msm_serial_hsl.2"),
CLK_LOOKUP("gsbi_pclk", gsbi3_p_clk.c, "qup_i2c.0"),
CLK_LOOKUP("gsbi_pclk", gsbi4_p_clk.c, "qup_i2c.1"),
CLK_LOOKUP("gsbi_pclk", gsbi5_p_clk.c, NULL),
- CLK_LOOKUP("uartdm_pclk", gsbi6_p_clk.c, "msm_serial_hs.0"),
+ CLK_LOOKUP("iface_clk", gsbi6_p_clk.c, "msm_serial_hs.0"),
CLK_LOOKUP("gsbi_pclk", gsbi7_p_clk.c, "qup_i2c.4"),
CLK_LOOKUP("gsbi_pclk", gsbi8_p_clk.c, "qup_i2c.3"),
- CLK_LOOKUP("gsbi_pclk", gsbi9_p_clk.c, "msm_serial_hsl.1"),
+ CLK_LOOKUP("iface_clk", gsbi9_p_clk.c, "msm_serial_hsl.1"),
CLK_LOOKUP("gsbi_pclk", gsbi9_p_clk.c, "qup_i2c.2"),
CLK_LOOKUP("spi_pclk", gsbi10_p_clk.c, "spi_qsd.1"),
CLK_LOOKUP("gsbi_pclk", gsbi11_p_clk.c, NULL),
CLK_LOOKUP("gsbi_pclk", gsbi12_p_clk.c, "msm_dsps.0"),
- CLK_LOOKUP("gsbi_pclk", gsbi12_p_clk.c, "msm_serial_hsl.0"),
+ CLK_LOOKUP("iface_clk", gsbi12_p_clk.c, "msm_serial_hsl.0"),
CLK_LOOKUP("gsbi_pclk", gsbi12_p_clk.c, "qup_i2c.5"),
CLK_LOOKUP("ppss_pclk", ppss_p_clk.c, NULL),
CLK_LOOKUP("tsif_pclk", tsif_p_clk.c, NULL),