diff --git a/plat/qti/msm8916/include/msm8916_mmap.h b/plat/qti/msm8916/include/msm8916_mmap.h
index 1696b84..406ae6b 100644
--- a/plat/qti/msm8916/include/msm8916_mmap.h
+++ b/plat/qti/msm8916/include/msm8916_mmap.h
@@ -20,6 +20,9 @@
 
 #define GCC_BASE		(PCNOC_BASE + 0x1800000)
 
+#define APPS_SMMU_BASE		(PCNOC_BASE + 0x1e00000)
+#define APPS_SMMU_QCOM		(APPS_SMMU_BASE + 0xf0000)
+
 #define BLSP_UART1_BASE		(PCNOC_BASE + 0x78af000)
 #define BLSP_UART2_BASE		(PCNOC_BASE + 0x78b0000)
 
diff --git a/plat/qti/msm8916/include/platform_def.h b/plat/qti/msm8916/include/platform_def.h
index 4ad26dd..bfade70 100644
--- a/plat/qti/msm8916/include/platform_def.h
+++ b/plat/qti/msm8916/include/platform_def.h
@@ -47,4 +47,11 @@
 /* Timer frequency */
 #define PLAT_SYSCNT_FREQ		19200000
 
+/*
+ * The Qualcomm QGIC2 implementation seems to have PIDR0-4 and PIDR4-7
+ * erroneously swapped for some reason. PIDR2 is actually at 0xFD8.
+ * Override the address in <drivers/arm/gicv2.h> to avoid a failing assert().
+ */
+#define GICD_PIDR2_GICV2		U(0xFD8)
+
 #endif /* PLATFORM_DEF_H */