diff --git a/msm/sde/sde_hw_catalog.h b/msm/sde/sde_hw_catalog.h
index 6bc737e71757..b3227703dbfc 100644
--- a/msm/sde/sde_hw_catalog.h
+++ b/msm/sde/sde_hw_catalog.h
@@ -21,7 +21,7 @@
  */
 #define MAX_BLOCKS    12
 
-#define SDE_HW_VER(MAJOR, MINOR, STEP) (((MAJOR & 0xF) << 28)    |\
+#define SDE_HW_VER(MAJOR, MINOR, STEP) ((u32)((MAJOR & 0xF) << 28)    |\
 		((MINOR & 0xFFF) << 16)  |\
 		(STEP & 0xFFFF))
 
diff --git a/msm/sde/sde_kms.h b/msm/sde/sde_kms.h
index 468c5d94c116..7a9db1ae24ba 100644
--- a/msm/sde/sde_kms.h
+++ b/msm/sde/sde_kms.h
@@ -248,7 +248,7 @@ struct sde_kms_frame_event_cb_data {
 struct sde_kms {
 	struct msm_kms base;
 	struct drm_device *dev;
-	int core_rev;
+	uint32_t core_rev;
 	struct sde_mdss_cfg *catalog;
 
 	struct generic_pm_domain genpd;