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-7x30.c b/arch/arm/mach-msm/clock-7x30.c
index 0fda790..e881d41 100644
--- a/arch/arm/mach-msm/clock-7x30.c
+++ b/arch/arm/mach-msm/clock-7x30.c
@@ -2739,7 +2739,7 @@
{ CLK_LOOKUP("ebi1_fixed_clk", ebi1_fixed_clk.c, NULL) },
{ CLK_LOOKUP("ecodec_clk", ecodec_clk.c, NULL) },
{ CLK_LOOKUP("gp_clk", gp_clk.c, NULL) },
- { CLK_LOOKUP("uart_clk", uart3_clk.c, "msm_serial.2") },
+ { CLK_LOOKUP("core_clk", uart3_clk.c, "msm_serial.2") },
{ CLK_LOOKUP("usb_phy_clk", usb_phy_clk.c, NULL) },
/* Voters */
@@ -2813,7 +2813,7 @@
OWN(ROW1, 27, "sdc_pclk", sdc3_p_clk, "msm_sdcc.3"),
OWN(ROW1, 29, "sdc_clk", sdc4_clk, "msm_sdcc.4"),
OWN(ROW1, 29, "sdc_pclk", sdc4_p_clk, "msm_sdcc.4"),
- OWN(ROW1, 0, "uart_clk", uart2_clk, "msm_serial.1"),
+ OWN(ROW1, 0, "core_clk", uart2_clk, "msm_serial.1"),
OWN(ROW1, 2, "usb_hs2_clk", usb_hs2_clk, NULL),
OWN(ROW1, 2, "usb_hs2_core_clk", usb_hs2_core_clk, NULL),
OWN(ROW1, 2, "usb_hs2_pclk", usb_hs2_p_clk, NULL),
@@ -2824,9 +2824,9 @@
OWN(ROW2, 3, "qup_clk", qup_i2c_clk, "qup_i2c.4"),
OWN(ROW2, 1, "spi_clk", spi_clk, NULL),
OWN(ROW2, 1, "spi_pclk", spi_p_clk, NULL),
- OWN(ROW2, 9, "uart_clk", uart1_clk, "msm_serial.0"),
- OWN(ROW2, 6, "uartdm_clk", uart1dm_clk, "msm_serial_hs.0"),
- OWN(ROW2, 8, "uartdm_clk", uart2dm_clk, "msm_serial_hs.1"),
+ OWN(ROW2, 9, "core_clk", uart1_clk, "msm_serial.0"),
+ OWN(ROW2, 6, "core_clk", uart1dm_clk, "msm_serial_hs.0"),
+ OWN(ROW2, 8, "core_clk", uart2dm_clk, "msm_serial_hs.1"),
OWN(ROW2, 11, "usb_hs_clk", usb_hs_clk, NULL),
OWN(ROW2, 11, "usb_hs_core_clk", usb_hs_core_clk, NULL),
OWN(ROW2, 11, "usb_hs_pclk", usb_hs_p_clk, NULL),
@@ -2849,9 +2849,9 @@
OWN(GLBL, 13, "rotator_clk", axi_rotator_clk, NULL),
OWN(GLBL, 13, "rotator_imem_clk", rotator_imem_clk, NULL),
OWN(GLBL, 13, "rotator_pclk", rotator_p_clk, NULL),
- { CLK_LOOKUP("uartdm_pclk", uart1dm_p_clk.c, "msm_serial_hs.0"),
+ { CLK_LOOKUP("iface_clk", uart1dm_p_clk.c, "msm_serial_hs.0"),
O(GLBL), BIT(8), &dummy_clk },
- { CLK_LOOKUP("uartdm_pclk", uart2dm_p_clk.c, "msm_serial_hs.1"),
+ { CLK_LOOKUP("iface_clk", uart2dm_p_clk.c, "msm_serial_hs.1"),
O(GLBL), BIT(8), &dummy_clk },
};
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 8ad143b..08a24cd 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -4192,18 +4192,18 @@
CLK_LOOKUP("sfpb_clk", sfpb_clk.c, NULL),
CLK_LOOKUP("sfpb_a_clk", sfpb_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, NULL),
- CLK_LOOKUP("gsbi_uart_clk", gsbi4_uart_clk.c, NULL),
- CLK_LOOKUP("gsbi_uart_clk", gsbi5_uart_clk.c, "msm_serial_hsl.0"),
- 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, NULL),
- 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, NULL),
+ 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, NULL),
+ CLK_LOOKUP("core_clk", gsbi4_uart_clk.c, NULL),
+ CLK_LOOKUP("core_clk", gsbi5_uart_clk.c, "msm_serial_hsl.0"),
+ 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, NULL),
+ 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, NULL),
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.3"),
@@ -4242,8 +4242,8 @@
CLK_LOOKUP("gsbi_pclk", gsbi2_p_clk.c, NULL),
CLK_LOOKUP("gsbi_pclk", gsbi3_p_clk.c, "qup_i2c.3"),
CLK_LOOKUP("gsbi_pclk", gsbi4_p_clk.c, "qup_i2c.4"),
- CLK_LOOKUP("gsbi_pclk", gsbi5_p_clk.c, "msm_serial_hsl.0"),
- CLK_LOOKUP("uartdm_pclk", gsbi6_p_clk.c, "msm_serial_hs.0"),
+ CLK_LOOKUP("iface_clk", gsbi5_p_clk.c, "msm_serial_hsl.0"),
+ CLK_LOOKUP("iface_clk", gsbi6_p_clk.c, "msm_serial_hs.0"),
CLK_LOOKUP("gsbi_pclk", gsbi7_p_clk.c, NULL),
CLK_LOOKUP("gsbi_pclk", gsbi8_p_clk.c, NULL),
CLK_LOOKUP("gsbi_pclk", gsbi9_p_clk.c, NULL),
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),
diff --git a/arch/arm/mach-msm/clock-fsm9xxx.c b/arch/arm/mach-msm/clock-fsm9xxx.c
index 4a064a7..e3209d2 100644
--- a/arch/arm/mach-msm/clock-fsm9xxx.c
+++ b/arch/arm/mach-msm/clock-fsm9xxx.c
@@ -23,7 +23,7 @@
static struct clk_lookup msm_clocks_fsm9xxx[] = {
CLK_DUMMY("adm_clk", ADM0_CLK, NULL, OFF),
- CLK_DUMMY("uart_clk", UART1_CLK, "msm_serial.0", OFF),
+ CLK_DUMMY("core_clk", UART1_CLK, "msm_serial.0", OFF),
CLK_DUMMY("ce_clk", CE_CLK, NULL, OFF),
};
diff --git a/arch/arm/mach-msm/clock-pcom-lookup.c b/arch/arm/mach-msm/clock-pcom-lookup.c
index 1b65ec0..ac32db4 100644
--- a/arch/arm/mach-msm/clock-pcom-lookup.c
+++ b/arch/arm/mach-msm/clock-pcom-lookup.c
@@ -172,11 +172,11 @@
CLK_LOOKUP("tsif_ref_clk", tsif_ref_clk.c, NULL),
CLK_LOOKUP("tv_dac_clk", tv_dac_clk.c, NULL),
CLK_LOOKUP("tv_enc_clk", tv_enc_clk.c, NULL),
- CLK_LOOKUP("uart_clk", uart1_clk.c, "msm_serial.0"),
- CLK_LOOKUP("uart_clk", uart2_clk.c, "msm_serial.1"),
- CLK_LOOKUP("uart_clk", uart3_clk.c, "msm_serial.2"),
- CLK_LOOKUP("uartdm_clk", uart1dm_clk.c, "msm_serial_hs.0"),
- CLK_LOOKUP("uartdm_clk", uart2dm_clk.c, "msm_serial_hs.1"),
+ CLK_LOOKUP("core_clk", uart1_clk.c, "msm_serial.0"),
+ CLK_LOOKUP("core_clk", uart2_clk.c, "msm_serial.1"),
+ CLK_LOOKUP("core_clk", uart3_clk.c, "msm_serial.2"),
+ CLK_LOOKUP("core_clk", uart1dm_clk.c, "msm_serial_hs.0"),
+ CLK_LOOKUP("core_clk", uart2dm_clk.c, "msm_serial_hs.1"),
CLK_LOOKUP("usb_hs_clk", usb_hs_clk.c, "msm_otg"),
CLK_LOOKUP("usb_hs_pclk", usb_hs_p_clk.c, "msm_otg"),
CLK_LOOKUP("usb_otg_clk", usb_otg_clk.c, NULL),
@@ -223,10 +223,10 @@
CLK_LOOKUP("tsif_clk", tsif_clk.c, NULL),
CLK_LOOKUP("tsif_ref_clk", tsif_ref_clk.c, NULL),
CLK_LOOKUP("tsif_pclk", tsif_p_clk.c, NULL),
- CLK_LOOKUP("uart_clk", uart1_clk.c, "msm_serial.0"),
- CLK_LOOKUP("uart_clk", uart2_clk.c, "msm_serial.1"),
- CLK_LOOKUP("uartdm_clk", uart1dm_clk.c, "msm_serial_hs.0"),
- CLK_LOOKUP("uartdm_clk", uart2dm_clk.c, "msm_serial_hs.1"),
+ CLK_LOOKUP("core_clk", uart1_clk.c, "msm_serial.0"),
+ CLK_LOOKUP("core_clk", uart2_clk.c, "msm_serial.1"),
+ CLK_LOOKUP("core_clk", uart1dm_clk.c, "msm_serial_hs.0"),
+ CLK_LOOKUP("core_clk", uart2dm_clk.c, "msm_serial_hs.1"),
CLK_LOOKUP("usb_hs_clk", usb_hs_clk.c, NULL),
CLK_LOOKUP("usb_hs_pclk", usb_hs_p_clk.c, NULL),
CLK_LOOKUP("usb_otg_clk", usb_otg_clk.c, NULL),
@@ -298,10 +298,10 @@
CLK_LOOKUP("sdc_pclk", sdc4_p_clk.c, "msm_sdcc.4"),
CLK_LOOKUP("tsif_ref_clk", tsif_ref_clk.c, NULL),
CLK_LOOKUP("tsif_pclk", tsif_p_clk.c, NULL),
- CLK_LOOKUP("uart_clk", uart1_clk.c, "msm_serial.0"),
- CLK_LOOKUP("uart_clk", uart2_clk.c, "msm_serial.1"),
- CLK_LOOKUP("uartdm_clk", uart1dm_clk.c, "msm_serial_hs.0"),
- CLK_LOOKUP("uartdm_clk", uart2dm_clk.c, "msm_serial_hsl.0"),
+ CLK_LOOKUP("core_clk", uart1_clk.c, "msm_serial.0"),
+ CLK_LOOKUP("core_clk", uart2_clk.c, "msm_serial.1"),
+ CLK_LOOKUP("core_clk", uart1dm_clk.c, "msm_serial_hs.0"),
+ CLK_LOOKUP("core_clk", uart2dm_clk.c, "msm_serial_hsl.0"),
CLK_LOOKUP("usb_hs_core_clk", usb_hs_core_clk.c, NULL),
CLK_LOOKUP("usb_hs2_clk", usb_hs2_clk.c, NULL),
CLK_LOOKUP("usb_hs_clk", usb_hs_clk.c, NULL),
@@ -361,11 +361,11 @@
CLK_LOOKUP("tsif_ref_clk", tsif_ref_clk.c, NULL),
CLK_LOOKUP("tv_dac_clk", tv_dac_clk.c, NULL),
CLK_LOOKUP("tv_enc_clk", tv_enc_clk.c, NULL),
- CLK_LOOKUP("uart_clk", uart1_clk.c, "msm_serial.0"),
- CLK_LOOKUP("uart_clk", uart2_clk.c, "msm_serial.1"),
- CLK_LOOKUP("uart_clk", uart3_clk.c, "msm_serial.2"),
- CLK_LOOKUP("uartdm_clk", uart1dm_clk.c, "msm_serial_hs.0"),
- CLK_LOOKUP("uartdm_clk", uart2dm_clk.c, "msm_serial_hs.1"),
+ CLK_LOOKUP("core_clk", uart1_clk.c, "msm_serial.0"),
+ CLK_LOOKUP("core_clk", uart2_clk.c, "msm_serial.1"),
+ CLK_LOOKUP("core_clk", uart3_clk.c, "msm_serial.2"),
+ CLK_LOOKUP("core_clk", uart1dm_clk.c, "msm_serial_hs.0"),
+ CLK_LOOKUP("core_clk", uart2dm_clk.c, "msm_serial_hs.1"),
CLK_LOOKUP("usb_hs_clk", usb_hs_clk.c, NULL),
CLK_LOOKUP("usb_hs_pclk", usb_hs_p_clk.c, NULL),
CLK_LOOKUP("usb_otg_clk", usb_otg_clk.c, NULL),
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 8bf25b2..61b0626 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -461,19 +461,19 @@
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, NULL, OFF),
- CLK_DUMMY("gsbi_uart_clk", GSBI3_UART_CLK,
+ CLK_DUMMY("core_clk", GSBI1_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI2_UART_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", GSBI3_UART_CLK,
"msm_serial_hsl.0", 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", 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("gsbi_qup_clk", GSBI1_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI2_QUP_CLK, NULL, OFF),
CLK_DUMMY("gsbi_qup_clk", GSBI3_QUP_CLK, NULL, OFF),
@@ -508,11 +508,10 @@
CLK_DUMMY("sata_phy_ref_clk", SATA_PHY_REF_CLK, NULL, OFF),
CLK_DUMMY("gsbi_pclk", GSBI1_P_CLK, NULL, OFF),
CLK_DUMMY("gsbi_pclk", GSBI2_P_CLK, NULL, OFF),
- CLK_DUMMY("gsbi_pclk", GSBI3_P_CLK,
- "msm_serial_hsl.0", OFF),
+ CLK_DUMMY("iface_clk", GSBI3_P_CLK, "msm_serial_hsl.0", OFF),
CLK_DUMMY("gsbi_pclk", GSBI4_P_CLK, "qup_i2c.4", OFF),
CLK_DUMMY("spi_pclk", GSBI5_P_CLK, "spi_qsd.0", 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("tsif_pclk", TSIF_P_CLK, NULL, OFF),
CLK_DUMMY("usb_fs_pclk", USB_FS1_P_CLK, NULL, OFF),
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),
diff --git a/arch/arm/mach-msm/devices-msm7x25.c b/arch/arm/mach-msm/devices-msm7x25.c
index f0b24d7..427c7b8 100644
--- a/arch/arm/mach-msm/devices-msm7x25.c
+++ b/arch/arm/mach-msm/devices-msm7x25.c
@@ -952,11 +952,11 @@
CLK_LOOKUP("sdc_pclk", sdc3_p_clk.c, "msm_sdcc.3"),
CLK_LOOKUP("sdc_clk", sdc4_clk.c, "msm_sdcc.4"),
CLK_LOOKUP("sdc_pclk", sdc4_p_clk.c, "msm_sdcc.4"),
- CLK_LOOKUP("uart_clk", uart1_clk.c, "msm_serial.0"),
- CLK_LOOKUP("uart_clk", uart2_clk.c, "msm_serial.1"),
- CLK_LOOKUP("uart_clk", uart3_clk.c, "msm_serial.2"),
- CLK_LOOKUP("uartdm_clk", uart1dm_clk.c, "msm_serial_hs.0"),
- CLK_LOOKUP("uartdm_clk", uart2dm_clk.c, "msm_serial_hs.1"),
+ CLK_LOOKUP("core_clk", uart1_clk.c, "msm_serial.0"),
+ CLK_LOOKUP("core_clk", uart2_clk.c, "msm_serial.1"),
+ CLK_LOOKUP("core_clk", uart3_clk.c, "msm_serial.2"),
+ CLK_LOOKUP("core_clk", uart1dm_clk.c, "msm_serial_hs.0"),
+ CLK_LOOKUP("core_clk", uart2dm_clk.c, "msm_serial_hs.1"),
CLK_LOOKUP("usb_hs_clk", usb_hs_clk.c, NULL),
CLK_LOOKUP("usb_hs_pclk", usb_hs_p_clk.c, NULL),
CLK_LOOKUP("usb_otg_clk", usb_otg_clk.c, NULL),
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);
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.
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;
}