commit e5c341c98f9dcc467aa5f8262ee6e91a24ee97ec
author Linux Build Service Account <lnxbuild@localhost> Sat Sep 15 13:53:36 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Sep 15 13:53:33 2012 -0700
tree 5f4db05fc0a09d2f28201b37530a7b34c35aa9d8
parent ef61eb9988179a2ee9e31a61018c754d68644b2f
parent 26ac3b696566059dec4b857c38595e0d6838f260

Merge "msm: scm-pas: stub out bus scaling on 8226"

arch/arm/mach-msm/scm-pas.c

diff --git a/arch/arm/mach-msm/scm-pas.c b/arch/arm/mach-msm/scm-pas.c
index 55ae2f8..43436e5 100644
--- a/arch/arm/mach-msm/scm-pas.c
+++ b/arch/arm/mach-msm/scm-pas.c
@@ -204,7 +204,11 @@
 		}
 	}
 
-	scm_perf_client = msm_bus_scale_register_client(&scm_pas_bus_pdata);
+	/* TODO : Remove once bus scaling driver is in place */
+	if (!cpu_is_msm8226())
+		scm_perf_client = msm_bus_scale_register_client(
+				&scm_pas_bus_pdata);
+
 	if (!scm_perf_client)
 		pr_warn("unable to register bus client\n");