msm: clock: Rename SDC clocks to match new naming convention
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 d77d7cb..9874929 100644
--- a/arch/arm/mach-msm/clock-7x30.c
+++ b/arch/arm/mach-msm/clock-7x30.c
@@ -2805,14 +2805,14 @@
OWN(ROW1, 17, "mdc_clk", mdc_clk, NULL),
OWN(ROW1, 19, "mddi_clk", pmdh_clk, NULL),
OWN(ROW1, 19, "mddi_pclk", pmdh_p_clk, NULL),
- OWN(ROW1, 23, "sdc_clk", sdc1_clk, "msm_sdcc.1"),
- OWN(ROW1, 23, "sdc_pclk", sdc1_p_clk, "msm_sdcc.1"),
- OWN(ROW1, 25, "sdc_clk", sdc2_clk, "msm_sdcc.2"),
- OWN(ROW1, 25, "sdc_pclk", sdc2_p_clk, "msm_sdcc.2"),
- OWN(ROW1, 27, "sdc_clk", sdc3_clk, "msm_sdcc.3"),
- 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, 23, "core_clk", sdc1_clk, "msm_sdcc.1"),
+ OWN(ROW1, 23, "iface_clk", sdc1_p_clk, "msm_sdcc.1"),
+ OWN(ROW1, 25, "core_clk", sdc2_clk, "msm_sdcc.2"),
+ OWN(ROW1, 25, "iface_clk", sdc2_p_clk, "msm_sdcc.2"),
+ OWN(ROW1, 27, "core_clk", sdc3_clk, "msm_sdcc.3"),
+ OWN(ROW1, 27, "iface_clk", sdc3_p_clk, "msm_sdcc.3"),
+ OWN(ROW1, 29, "core_clk", sdc4_clk, "msm_sdcc.4"),
+ OWN(ROW1, 29, "iface_clk", sdc4_p_clk, "msm_sdcc.4"),
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),
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 2acb533..78b1bf0 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -4219,11 +4219,11 @@
CLK_LOOKUP("pdm_clk", pdm_clk.c, NULL),
CLK_LOOKUP("pmem_clk", pmem_clk.c, NULL),
CLK_LOOKUP("prng_clk", prng_clk.c, NULL),
- CLK_LOOKUP("sdc_clk", sdc1_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_clk", sdc2_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_clk", sdc3_clk.c, "msm_sdcc.3"),
- CLK_LOOKUP("sdc_clk", sdc4_clk.c, "msm_sdcc.4"),
- CLK_LOOKUP("sdc_clk", sdc5_clk.c, "msm_sdcc.5"),
+ CLK_LOOKUP("core_clk", sdc1_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("core_clk", sdc2_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("core_clk", sdc3_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("core_clk", sdc4_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("core_clk", sdc5_clk.c, "msm_sdcc.5"),
CLK_LOOKUP("slimbus_xo_src_clk", slimbus_xo_src_clk.c, NULL),
CLK_LOOKUP("tsif_ref_clk", tsif_ref_clk.c, NULL),
CLK_LOOKUP("tssc_clk", tssc_clk.c, NULL),
@@ -4254,11 +4254,11 @@
CLK_LOOKUP("usb_fs_pclk", usb_fs1_p_clk.c, NULL),
CLK_LOOKUP("usb_fs_pclk", usb_fs2_p_clk.c, NULL),
CLK_LOOKUP("usb_hs_pclk", usb_hs1_p_clk.c, NULL),
- CLK_LOOKUP("sdc_pclk", sdc1_p_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_pclk", sdc2_p_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_pclk", sdc3_p_clk.c, "msm_sdcc.3"),
- CLK_LOOKUP("sdc_pclk", sdc4_p_clk.c, "msm_sdcc.4"),
- CLK_LOOKUP("sdc_pclk", sdc5_p_clk.c, "msm_sdcc.5"),
+ CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("iface_clk", sdc2_p_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("iface_clk", sdc3_p_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("iface_clk", sdc4_p_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("iface_clk", sdc5_p_clk.c, "msm_sdcc.5"),
CLK_LOOKUP("adm_clk", adm0_clk.c, NULL),
CLK_LOOKUP("adm_pclk", adm0_p_clk.c, NULL),
CLK_LOOKUP("pmic_arb_pclk", pmic_arb0_p_clk.c, NULL),
@@ -4371,11 +4371,11 @@
CLK_LOOKUP("iommu_clk", gfx2d1_clk.c, "msm_iommu.11"),
CLK_LOOKUP("dfab_dsps_clk", dfab_dsps_clk.c, NULL),
CLK_LOOKUP("dfab_usb_hs_clk", dfab_usb_hs_clk.c, NULL),
- CLK_LOOKUP("dfab_sdc_clk", dfab_sdc1_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("dfab_sdc_clk", dfab_sdc2_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("dfab_sdc_clk", dfab_sdc3_clk.c, "msm_sdcc.3"),
- CLK_LOOKUP("dfab_sdc_clk", dfab_sdc4_clk.c, "msm_sdcc.4"),
- CLK_LOOKUP("dfab_sdc_clk", dfab_sdc5_clk.c, "msm_sdcc.5"),
+ CLK_LOOKUP("bus_clk", dfab_sdc1_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("bus_clk", dfab_sdc2_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("bus_clk", dfab_sdc3_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("bus_clk", dfab_sdc4_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("bus_clk", dfab_sdc5_clk.c, "msm_sdcc.5"),
CLK_LOOKUP("dfab_clk", dfab_sps_clk.c, "msm_sps"),
CLK_LOOKUP("ebi1_msmbus_clk", ebi1_msmbus_clk.c, NULL),
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 0e82518..1de4f60 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3521,11 +3521,11 @@
CLK_LOOKUP("pdm_clk", pdm_clk.c, NULL),
CLK_LOOKUP("pmem_clk", pmem_clk.c, NULL),
CLK_LOOKUP("prng_clk", prng_clk.c, NULL),
- CLK_LOOKUP("sdc_clk", sdc1_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_clk", sdc2_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_clk", sdc3_clk.c, "msm_sdcc.3"),
- CLK_LOOKUP("sdc_clk", sdc4_clk.c, "msm_sdcc.4"),
- CLK_LOOKUP("sdc_clk", sdc5_clk.c, "msm_sdcc.5"),
+ CLK_LOOKUP("core_clk", sdc1_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("core_clk", sdc2_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("core_clk", sdc3_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("core_clk", sdc4_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("core_clk", sdc5_clk.c, "msm_sdcc.5"),
CLK_LOOKUP("tsif_ref_clk", tsif_ref_clk.c, NULL),
CLK_LOOKUP("tssc_clk", tssc_clk.c, NULL),
CLK_LOOKUP("usb_hs_clk", usb_hs1_xcvr_clk.c, NULL),
@@ -3558,11 +3558,11 @@
CLK_LOOKUP("usb_fs_pclk", usb_fs1_p_clk.c, NULL),
CLK_LOOKUP("usb_fs_pclk", usb_fs2_p_clk.c, NULL),
CLK_LOOKUP("usb_hs_pclk", usb_hs1_p_clk.c, NULL),
- CLK_LOOKUP("sdc_pclk", sdc1_p_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_pclk", sdc2_p_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_pclk", sdc3_p_clk.c, "msm_sdcc.3"),
- CLK_LOOKUP("sdc_pclk", sdc4_p_clk.c, "msm_sdcc.4"),
- CLK_LOOKUP("sdc_pclk", sdc5_p_clk.c, "msm_sdcc.5"),
+ CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("iface_clk", sdc2_p_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("iface_clk", sdc3_p_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("iface_clk", sdc4_p_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("iface_clk", sdc5_p_clk.c, "msm_sdcc.5"),
CLK_LOOKUP("adm_clk", adm0_clk.c, "msm_dmov.0"),
CLK_LOOKUP("adm_pclk", adm0_p_clk.c, "msm_dmov.0"),
CLK_LOOKUP("adm_clk", adm1_clk.c, "msm_dmov.1"),
@@ -3657,11 +3657,11 @@
CLK_LOOKUP("dfab_dsps_clk", dfab_dsps_clk.c, NULL),
CLK_LOOKUP("dfab_usb_hs_clk", dfab_usb_hs_clk.c, NULL),
- CLK_LOOKUP("dfab_sdc_clk", dfab_sdc1_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("dfab_sdc_clk", dfab_sdc2_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("dfab_sdc_clk", dfab_sdc3_clk.c, "msm_sdcc.3"),
- CLK_LOOKUP("dfab_sdc_clk", dfab_sdc4_clk.c, "msm_sdcc.4"),
- CLK_LOOKUP("dfab_sdc_clk", dfab_sdc5_clk.c, "msm_sdcc.5"),
+ CLK_LOOKUP("bus_clk", dfab_sdc1_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("bus_clk", dfab_sdc2_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("bus_clk", dfab_sdc3_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("bus_clk", dfab_sdc4_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("bus_clk", dfab_sdc5_clk.c, "msm_sdcc.5"),
CLK_LOOKUP("ebi1_msmbus_clk", ebi1_msmbus_clk.c, NULL),
CLK_LOOKUP("ebi1_clk", ebi1_adm0_clk.c, "msm_dmov.0"),
diff --git a/arch/arm/mach-msm/clock-pcom-lookup.c b/arch/arm/mach-msm/clock-pcom-lookup.c
index d3411a1..55a1850f 100644
--- a/arch/arm/mach-msm/clock-pcom-lookup.c
+++ b/arch/arm/mach-msm/clock-pcom-lookup.c
@@ -160,14 +160,14 @@
CLK_LOOKUP("pbus_clk", pbus_clk.c, NULL),
CLK_LOOKUP("pcm_clk", pcm_clk.c, NULL),
CLK_LOOKUP("sdac_clk", sdac_clk.c, NULL),
- CLK_LOOKUP("sdc_clk", sdc1_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_pclk", sdc1_p_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_clk", sdc2_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_pclk", sdc2_p_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_clk", sdc3_clk.c, "msm_sdcc.3"),
- 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("core_clk", sdc1_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("core_clk", sdc2_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("iface_clk", sdc2_p_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("core_clk", sdc3_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("iface_clk", sdc3_p_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("core_clk", sdc4_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("iface_clk", sdc4_p_clk.c, "msm_sdcc.4"),
CLK_LOOKUP("tsif_clk", tsif_clk.c, NULL),
CLK_LOOKUP("tsif_ref_clk", tsif_ref_clk.c, NULL),
CLK_LOOKUP("tv_dac_clk", tv_dac_clk.c, NULL),
@@ -212,14 +212,14 @@
CLK_LOOKUP("pbus_clk", pbus_clk.c, NULL),
CLK_LOOKUP("pcm_clk", pcm_clk.c, NULL),
CLK_LOOKUP("sdac_clk", sdac_clk.c, NULL),
- CLK_LOOKUP("sdc_clk", sdc1_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_pclk", sdc1_p_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_clk", sdc2_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_pclk", sdc2_p_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_clk", sdc3_clk.c, "msm_sdcc.3"),
- 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("core_clk", sdc1_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("core_clk", sdc2_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("iface_clk", sdc2_p_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("core_clk", sdc3_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("iface_clk", sdc3_p_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("core_clk", sdc4_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("iface_clk", sdc4_p_clk.c, "msm_sdcc.4"),
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),
@@ -288,14 +288,14 @@
CLK_LOOKUP("pbus_clk", pbus_clk.c, NULL),
CLK_LOOKUP("pcm_clk", pcm_clk.c, NULL),
CLK_LOOKUP("sdac_clk", sdac_clk.c, NULL),
- CLK_LOOKUP("sdc_clk", sdc1_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_pclk", sdc1_p_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_clk", sdc2_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_pclk", sdc2_p_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_clk", sdc3_clk.c, "msm_sdcc.3"),
- 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("core_clk", sdc1_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("core_clk", sdc2_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("iface_clk", sdc2_p_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("core_clk", sdc3_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("iface_clk", sdc3_p_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("core_clk", sdc4_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("iface_clk", 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("core_clk", uart1_clk.c, "msm_serial.0"),
@@ -347,14 +347,14 @@
CLK_LOOKUP("pbus_clk", pbus_clk.c, NULL),
CLK_LOOKUP("pcm_clk", pcm_clk.c, NULL),
CLK_LOOKUP("sdac_clk", sdac_clk.c, NULL),
- CLK_LOOKUP("sdc_clk", sdc1_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_pclk", sdc1_p_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_clk", sdc2_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_pclk", sdc2_p_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_clk", sdc3_clk.c, "msm_sdcc.3"),
- 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("core_clk", sdc1_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("core_clk", sdc2_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("iface_clk", sdc2_p_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("core_clk", sdc3_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("iface_clk", sdc3_p_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("core_clk", sdc4_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("iface_clk", sdc4_p_clk.c, "msm_sdcc.4"),
CLK_LOOKUP("core_clk", spi_clk.c, "spi_qsd.0"),
CLK_DUMMY("iface_clk", SPI_P_CLK, "spi_qsd.0", 0),
CLK_LOOKUP("tsif_clk", tsif_clk.c, NULL),
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index 98e0c1d..2b8f510 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -513,10 +513,10 @@
CLK_DUMMY("pdm_clk", PDM_CLK, NULL, OFF),
CLK_DUMMY("pmem_clk", PMEM_CLK, NULL, OFF),
CLK_DUMMY("prng_clk", PRNG_CLK, NULL, OFF),
- CLK_DUMMY("sdc_clk", SDC1_CLK, NULL, OFF),
- CLK_DUMMY("sdc_clk", SDC2_CLK, NULL, OFF),
- CLK_DUMMY("sdc_clk", SDC3_CLK, NULL, OFF),
- CLK_DUMMY("sdc_clk", SDC4_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", SDC1_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", SDC2_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", SDC3_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", SDC4_CLK, NULL, OFF),
CLK_DUMMY("tsif_ref_clk", TSIF_REF_CLK, NULL, OFF),
CLK_DUMMY("tssc_clk", TSSC_CLK, NULL, OFF),
CLK_DUMMY("usb_hs_clk", USB_HS1_XCVR_CLK, NULL, OFF),
@@ -547,11 +547,10 @@
CLK_DUMMY("usb_hs_pclk", USB_HS1_P_CLK, NULL, OFF),
CLK_DUMMY("usb_hs_pclk", USB_HS3_P_CLK, NULL, OFF),
CLK_DUMMY("usb_hs_pclk", USB_HS4_P_CLK, NULL, OFF),
- CLK_DUMMY("sdc_pclk", SDC1_P_CLK, NULL, OFF),
- CLK_DUMMY("sdc_pclk", SDC2_P_CLK, NULL, OFF),
- CLK_DUMMY("sdc_pclk", SDC3_P_CLK, NULL, OFF),
- CLK_DUMMY("sdc_pclk", SDC4_P_CLK, NULL, OFF),
- CLK_DUMMY("sdc_pclk", SDC5_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", SDC1_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", SDC2_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", SDC3_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", SDC4_P_CLK, NULL, OFF),
CLK_DUMMY("adm_clk", ADM0_CLK, NULL, OFF),
CLK_DUMMY("adm_pclk", ADM0_P_CLK, NULL, OFF),
CLK_DUMMY("pmic_arb_pclk", PMIC_ARB0_P_CLK, NULL, OFF),
@@ -647,11 +646,10 @@
CLK_DUMMY("dfab_dsps_clk", DFAB_DSPS_CLK, NULL, 0),
CLK_DUMMY("dfab_usb_hs_clk", DFAB_USB_HS_CLK, NULL, 0),
- CLK_DUMMY("dfab_sdc_clk", DFAB_SDC1_CLK, NULL, 0),
- CLK_DUMMY("dfab_sdc_clk", DFAB_SDC2_CLK, NULL, 0),
- CLK_DUMMY("dfab_sdc_clk", DFAB_SDC3_CLK, NULL, 0),
- CLK_DUMMY("dfab_sdc_clk", DFAB_SDC4_CLK, NULL, 0),
- CLK_DUMMY("dfab_sdc_clk", DFAB_SDC5_CLK, NULL, 0),
+ CLK_DUMMY("bus_clk", DFAB_SDC1_CLK, NULL, 0),
+ CLK_DUMMY("bus_clk", DFAB_SDC2_CLK, NULL, 0),
+ CLK_DUMMY("bus_clk", DFAB_SDC3_CLK, NULL, 0),
+ CLK_DUMMY("bus_clk", DFAB_SDC4_CLK, NULL, 0),
CLK_DUMMY("dfab_clk", DFAB_CLK, NULL, 0),
CLK_DUMMY("dma_bam_pclk", DMA_BAM_P_CLK, NULL, 0),
};
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 73953f9..2b68175 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1464,11 +1464,11 @@
CLK_DUMMY("pdm_clk", PDM_CLK, NULL, OFF),
CLK_DUMMY("pmem_clk", PMEM_CLK, NULL, OFF),
CLK_DUMMY("prng_clk", PRNG_CLK, NULL, OFF),
- CLK_DUMMY("sdc_clk", SDC1_CLK, NULL, OFF),
- CLK_DUMMY("sdc_clk", SDC2_CLK, NULL, OFF),
- CLK_DUMMY("sdc_clk", SDC3_CLK, NULL, OFF),
- CLK_DUMMY("sdc_clk", SDC4_CLK, NULL, OFF),
- CLK_DUMMY("sdc_clk", SDC5_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", SDC1_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", SDC2_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", SDC3_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", SDC4_CLK, NULL, OFF),
+ CLK_DUMMY("core_clk", SDC5_CLK, NULL, OFF),
CLK_DUMMY("tsif_ref_clk", TSIF_REF_CLK, NULL, OFF),
CLK_DUMMY("tssc_clk", TSSC_CLK, NULL, OFF),
CLK_DUMMY("usb_hs_clk", USB_HS1_XCVR_CLK, NULL, OFF),
@@ -1499,11 +1499,11 @@
CLK_DUMMY("usb_fs_pclk", USB_FS1_P_CLK, NULL, OFF),
CLK_DUMMY("usb_fs_pclk", USB_FS2_P_CLK, NULL, OFF),
CLK_DUMMY("usb_hs_pclk", USB_HS1_P_CLK, NULL, OFF),
- CLK_DUMMY("sdc_pclk", SDC1_P_CLK, NULL, OFF),
- CLK_DUMMY("sdc_pclk", SDC2_P_CLK, NULL, OFF),
- CLK_DUMMY("sdc_pclk", SDC3_P_CLK, NULL, OFF),
- CLK_DUMMY("sdc_pclk", SDC4_P_CLK, NULL, OFF),
- CLK_DUMMY("sdc_pclk", SDC5_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", SDC1_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", SDC2_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", SDC3_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", SDC4_P_CLK, NULL, OFF),
+ CLK_DUMMY("iface_clk", SDC5_P_CLK, NULL, OFF),
CLK_DUMMY("adm_clk", ADM0_CLK, NULL, OFF),
CLK_DUMMY("adm_pclk", ADM0_P_CLK, NULL, OFF),
CLK_DUMMY("pmic_arb_pclk", PMIC_ARB0_P_CLK, NULL, OFF),
@@ -1595,11 +1595,11 @@
CLK_DUMMY("dfab_dsps_clk", DFAB_DSPS_CLK, NULL, 0),
CLK_DUMMY("dfab_usb_hs_clk", DFAB_USB_HS_CLK, NULL, 0),
- CLK_DUMMY("dfab_sdc_clk", DFAB_SDC1_CLK, "msm_sdcc.1", 0),
- CLK_DUMMY("dfab_sdc_clk", DFAB_SDC2_CLK, "msm_sdcc.2", 0),
- CLK_DUMMY("dfab_sdc_clk", DFAB_SDC3_CLK, "msm_sdcc.3", 0),
- CLK_DUMMY("dfab_sdc_clk", DFAB_SDC4_CLK, "msm_sdcc.4", 0),
- CLK_DUMMY("dfab_sdc_clk", DFAB_SDC5_CLK, "msm_sdcc.5", 0),
+ CLK_DUMMY("bus_clk", DFAB_SDC1_CLK, "msm_sdcc.1", 0),
+ CLK_DUMMY("bus_clk", DFAB_SDC2_CLK, "msm_sdcc.2", 0),
+ CLK_DUMMY("bus_clk", DFAB_SDC3_CLK, "msm_sdcc.3", 0),
+ CLK_DUMMY("bus_clk", DFAB_SDC4_CLK, "msm_sdcc.4", 0),
+ CLK_DUMMY("bus_clk", DFAB_SDC5_CLK, "msm_sdcc.5", 0),
CLK_DUMMY("dfab_clk", DFAB_CLK, NULL, 0),
CLK_DUMMY("dma_bam_pclk", DMA_BAM_P_CLK, NULL, 0),
};
diff --git a/arch/arm/mach-msm/devices-msm7x25.c b/arch/arm/mach-msm/devices-msm7x25.c
index bebe497..83afed1 100644
--- a/arch/arm/mach-msm/devices-msm7x25.c
+++ b/arch/arm/mach-msm/devices-msm7x25.c
@@ -944,14 +944,14 @@
CLK_LOOKUP("pbus_clk", pbus_clk.c, NULL),
CLK_LOOKUP("pcm_clk", pcm_clk.c, NULL),
CLK_LOOKUP("sdac_clk", sdac_clk.c, NULL),
- CLK_LOOKUP("sdc_clk", sdc1_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_pclk", sdc1_p_clk.c, "msm_sdcc.1"),
- CLK_LOOKUP("sdc_clk", sdc2_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_pclk", sdc2_p_clk.c, "msm_sdcc.2"),
- CLK_LOOKUP("sdc_clk", sdc3_clk.c, "msm_sdcc.3"),
- 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("core_clk", sdc1_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("iface_clk", sdc1_p_clk.c, "msm_sdcc.1"),
+ CLK_LOOKUP("core_clk", sdc2_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("iface_clk", sdc2_p_clk.c, "msm_sdcc.2"),
+ CLK_LOOKUP("core_clk", sdc3_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("iface_clk", sdc3_p_clk.c, "msm_sdcc.3"),
+ CLK_LOOKUP("core_clk", sdc4_clk.c, "msm_sdcc.4"),
+ CLK_LOOKUP("iface_clk", sdc4_p_clk.c, "msm_sdcc.4"),
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"),
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 1ed2abe..0195ed4 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -3432,7 +3432,7 @@
* fabric core clock.
*/
if (plat->pclk_src_dfab) {
- host->dfab_pclk = clk_get(&pdev->dev, "dfab_sdc_clk");
+ host->dfab_pclk = clk_get(&pdev->dev, "bus_clk");
if (!IS_ERR(host->dfab_pclk)) {
/* Set the clock rate to 64MHz for max. performance */
ret = clk_set_rate(host->dfab_pclk, 64000000);
@@ -3448,7 +3448,7 @@
/*
* Setup main peripheral bus clock
*/
- host->pclk = clk_get(&pdev->dev, "sdc_pclk");
+ host->pclk = clk_get(&pdev->dev, "iface_clk");
if (!IS_ERR(host->pclk)) {
ret = clk_enable(host->pclk);
if (ret)
@@ -3460,7 +3460,7 @@
/*
* Setup SDC MMC clock
*/
- host->clk = clk_get(&pdev->dev, "sdc_clk");
+ host->clk = clk_get(&pdev->dev, "core_clk");
if (IS_ERR(host->clk)) {
ret = PTR_ERR(host->clk);
goto pclk_disable;