commit 2429f15fa72df7c6e582cb52d43c3249ce1b3400
author Stepan Moskovchenko <stepanm@codeaurora.org> Tue Oct 25 14:42:35 2011 -0700
committer Linux Build Service Account <lnxbuild@localhost> Fri Oct 28 23:42:43 2011 -0600
tree 2a1742a7eaa00f36f2afc7485f4e5e5348070f6a
parent 96b94ec9ddc59b1dcf3ad3c333c30f78375ec84e

msm: clock-8960: Update usage of cpu_is_msm8960 for 8930

Update drivers' usage of cpu_is_msm8960() to also include a
check for cpu_is_msm8930(), to support the pre-silicon
effort.

Change-Id: I5bf61d35c6e3a8d2d41a5d1e7d021a4835e67fc7
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>

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

diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index b12517f..b0a2e04 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -5573,7 +5573,7 @@
 	rmwreg(0x80FF0000, VFE_CC_REG,        0xE0FF4010);
 	rmwreg(0x800000FF, VFE_CC2_REG,       0xE00000FF);
 	rmwreg(0x80FF0000, VPE_CC_REG,        0xE0FF0010);
-	if (cpu_is_msm8960()) {
+	if (cpu_is_msm8960() || cpu_is_msm8930()) {
 		rmwreg(0x80FF0000, GFX2D0_CC_REG,     0xE0FF0010);
 		rmwreg(0x80FF0000, GFX2D1_CC_REG,     0xE0FF0010);
 		rmwreg(0x80FF0000, TV_CC_REG,         0xE1FFC010);
@@ -5618,7 +5618,7 @@
 	writel_relaxed(BIT(15), PDM_CLK_NS_REG);
 
 	/* Source SLIMBus xo src from slimbus reference clock */
-	if (cpu_is_msm8960())
+	if (cpu_is_msm8960() || cpu_is_msm8930())
 		writel_relaxed(0x3, SLIMBUS_XO_SRC_CLK_CTL_REG);
 
 	/* Source the dsi_byte_clks from the DSI PHY PLLs */
@@ -5801,7 +5801,7 @@
 		BUG();
 	}
 
-	if (cpu_is_msm8960()) {
+	if (cpu_is_msm8960() || cpu_is_msm8930()) {
 		memcpy(msm_clocks_8960, msm_clocks_8960_v1,
 				sizeof(msm_clocks_8960_v1));
 		if (SOCINFO_VERSION_MAJOR(socinfo_get_version()) >= 2) {
@@ -5861,7 +5861,7 @@
 		clk_set_rate(&usb_hs4_xcvr_clk.c, 60000000);
 	}
 	clk_set_rate(&usb_fs1_src_clk.c, 60000000);
-	if (cpu_is_msm8960())
+	if (cpu_is_msm8960() || cpu_is_msm8930())
 		clk_set_rate(&usb_fs2_src_clk.c, 60000000);
 	clk_set_rate(&usb_hsic_xcvr_fs_clk.c, 60000000);
 	clk_set_rate(&usb_hsic_hsic_src_clk.c, 480000000);