commit b86ad26112defb83cf3798cff94bd7615c9e4281
author Matt Wagantall <mattw@codeaurora.org> Mon Oct 24 19:50:29 2011 -0700
committer Linux Build Service Account <lnxbuild@localhost> Thu Oct 27 13:43:56 2011 -0600
tree b62e42bc76d3afb26665f4989e78c53bb3b226d1
parent d39da5a41fb8728809fec30c72f798dee780af63

msm: clock: Rename various unused clocks to match the new naming convention

Remaining clocks still not matching the naming convention will
be updated individually in later changes.

Change-Id: I0ff7514a300c071c45ab7cf308de45a67135795d
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

arch/arm/mach-msm/devices-8960.c

diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index f92c54a..7512414 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1585,7 +1585,7 @@
 	CLK_DUMMY("core_clk",	GSBI10_QUP_CLK,		NULL, OFF),
 	CLK_DUMMY("core_clk",	GSBI11_QUP_CLK,		NULL, OFF),
 	CLK_DUMMY("core_clk",	GSBI12_QUP_CLK,		NULL, OFF),
-	CLK_DUMMY("pdm_clk",		PDM_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",		PDM_CLK,		NULL, OFF),
 	CLK_DUMMY("mem_clk",		PMEM_CLK,		NULL, OFF),
 	CLK_DUMMY("core_clk",		PRNG_CLK,		NULL, OFF),
 	CLK_DUMMY("core_clk",		SDC1_CLK,		NULL, OFF),
@@ -1594,7 +1594,7 @@
 	CLK_DUMMY("core_clk",		SDC4_CLK,		NULL, OFF),
 	CLK_DUMMY("core_clk",		SDC5_CLK,		NULL, OFF),
 	CLK_DUMMY("core_clk",		TSIF_REF_CLK,		NULL, OFF),
-	CLK_DUMMY("tssc_clk",		TSSC_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",		TSSC_CLK,		NULL, OFF),
 	CLK_DUMMY("usb_hs_clk",		USB_HS1_XCVR_CLK,	NULL, OFF),
 	CLK_DUMMY("usb_phy_clk",	USB_PHY0_CLK,		NULL, OFF),
 	CLK_DUMMY("usb_fs_src_clk",	USB_FS1_SRC_CLK,	NULL, OFF),
@@ -1630,11 +1630,11 @@
 	CLK_DUMMY("iface_clk",		SDC5_P_CLK,		NULL, OFF),
 	CLK_DUMMY("core_clk",		ADM0_CLK,		NULL, OFF),
 	CLK_DUMMY("iface_clk",		ADM0_P_CLK,		NULL, OFF),
-	CLK_DUMMY("pmic_arb_pclk",	PMIC_ARB0_P_CLK,	NULL, OFF),
-	CLK_DUMMY("pmic_arb_pclk",	PMIC_ARB1_P_CLK,	NULL, OFF),
-	CLK_DUMMY("pmic_ssbi2",		PMIC_SSBI2_CLK,		NULL, OFF),
-	CLK_DUMMY("rpm_msg_ram_pclk",	RPM_MSG_RAM_P_CLK,	NULL, OFF),
-	CLK_DUMMY("amp_clk",		AMP_CLK,		NULL, OFF),
+	CLK_DUMMY("iface_clk",		PMIC_ARB0_P_CLK,	NULL, OFF),
+	CLK_DUMMY("iface_clk",		PMIC_ARB1_P_CLK,	NULL, OFF),
+	CLK_DUMMY("core_clk",		PMIC_SSBI2_CLK,		NULL, OFF),
+	CLK_DUMMY("mem_clk",		RPM_MSG_RAM_P_CLK,	NULL, OFF),
+	CLK_DUMMY("core_clk",		AMP_CLK,		NULL, OFF),
 	CLK_DUMMY("cam_clk",		CAM0_CLK,		NULL, OFF),
 	CLK_DUMMY("cam_clk",		CAM1_CLK,		NULL, OFF),
 	CLK_DUMMY("csi_src_clk",	CSI0_SRC_CLK,		NULL, OFF),
@@ -1655,7 +1655,7 @@
 	CLK_DUMMY("core_clk",		GFX3D_CLK,		NULL, OFF),
 	CLK_DUMMY("ijpeg_clk",		IJPEG_CLK,		NULL, OFF),
 	CLK_DUMMY("mem_clk",		IMEM_CLK,		NULL, OFF),
-	CLK_DUMMY("jpegd_clk",		JPEGD_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",		JPEGD_CLK,		NULL, OFF),
 	CLK_DUMMY("mdp_clk",		MDP_CLK,		NULL, OFF),
 	CLK_DUMMY("mdp_vsync_clk",	MDP_VSYNC_CLK,		NULL, OFF),
 	CLK_DUMMY("lut_mdp",		LUT_MDP_CLK,		NULL, OFF),
@@ -1663,7 +1663,7 @@
 	CLK_DUMMY("tv_src_clk",		TV_SRC_CLK,		NULL, OFF),
 	CLK_DUMMY("tv_enc_clk",		TV_ENC_CLK,		NULL, OFF),
 	CLK_DUMMY("tv_dac_clk",		TV_DAC_CLK,		NULL, OFF),
-	CLK_DUMMY("vcodec_clk",		VCODEC_CLK,		NULL, OFF),
+	CLK_DUMMY("core_clk",		VCODEC_CLK,		NULL, OFF),
 	CLK_DUMMY("mdp_tv_clk",		MDP_TV_CLK,		NULL, OFF),
 	CLK_DUMMY("hdmi_clk",		HDMI_TV_CLK,		NULL, OFF),
 	CLK_DUMMY("hdmi_app_clk",	HDMI_APP_CLK,		NULL, OFF),