commit bd717822848ae358bec0c5ae76122eba538b365c
author Linux Build Service Account <lnxbuild@localhost> Sun Mar 03 02:16:29 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Mar 03 02:16:29 2013 -0800
tree 415f035acc4bb3bd96ba2f048ba1b8af842405a4
parent a85365812ce2987ab328ce4d4a531079fdb2253c
parent db8c6f691ab75f34ff6f88a55ce05c44ff367b25

Merge "msm: ipa: Fix BAM configuration used by IPA HW 1.1"

drivers/platform/msm/ipa/ipa.c

diff --git a/drivers/platform/msm/ipa/ipa.c b/drivers/platform/msm/ipa/ipa.c
index ccf5f96..870a6bc 100644
--- a/drivers/platform/msm/ipa/ipa.c
+++ b/drivers/platform/msm/ipa/ipa.c
@@ -1417,7 +1417,8 @@
 {
 	void *bam_cnfg_bits;
 
-	if (ipa_ctx->ipa_hw_type == IPA_HW_v1_0) {
+	if ((ipa_ctx->ipa_hw_type == IPA_HW_v1_0) ||
+	    (ipa_ctx->ipa_hw_type == IPA_HW_v1_1)) {
 		bam_cnfg_bits = ioremap(res->ipa_mem_base +
 						IPA_BAM_REG_BASE_OFST,
 					IPA_BAM_REMAP_SIZE);