diff --git a/src/soc/amd/cezanne/include/soc/smi.h b/src/soc/amd/cezanne/include/soc/smi.h
index f0948bbbc7..aad4123083 100644
--- a/src/soc/amd/cezanne/include/soc/smi.h
+++ b/src/soc/amd/cezanne/include/soc/smi.h
@@ -8,6 +8,7 @@
 #define SMI_GEVENTS			24
 #define SCIMAPS				59 /* 0..58 */
 #define SCI_GPES			32
+#define NUMBER_SMITYPES			160
 
 #define SMI_EVENT_STATUS		0x0
 #define SMI_EVENT_ENABLE		0x04
@@ -138,7 +139,7 @@
 /* 153-155 Reserved */
 #define SMITYPE_CFGTRAP0		156
 /* 157-159 Reserved */
-#define NUMBER_SMITYPES			160
+
 #define TYPE_TO_MASK(X)				(1 << (X) % 32)
 
 #define SMI_REG_SMISTS0			0x80
diff --git a/src/soc/amd/picasso/include/soc/smi.h b/src/soc/amd/picasso/include/soc/smi.h
index 8256b2116a..dba3bea63e 100644
--- a/src/soc/amd/picasso/include/soc/smi.h
+++ b/src/soc/amd/picasso/include/soc/smi.h
@@ -8,6 +8,7 @@
 #define SMI_GEVENTS			24
 #define SCIMAPS				59 /* 0..58 */
 #define SCI_GPES			32
+#define NUMBER_SMITYPES			160
 
 #define SMI_EVENT_STATUS		0x0
 #define SMI_EVENT_ENABLE		0x04
@@ -140,7 +141,7 @@
 /* 153-155 Reserved */
 #define SMITYPE_CFGTRAP0		156
 /* 157-159 Reserved */
-#define NUMBER_SMITYPES			160
+
 #define TYPE_TO_MASK(X)				(1 << (X) % 32)
 
 #define SMI_REG_SMISTS0			0x80
diff --git a/src/soc/amd/stoneyridge/include/soc/smi.h b/src/soc/amd/stoneyridge/include/soc/smi.h
index 0e0bc3715a..3ce41df40c 100644
--- a/src/soc/amd/stoneyridge/include/soc/smi.h
+++ b/src/soc/amd/stoneyridge/include/soc/smi.h
@@ -6,6 +6,7 @@
 #define SMI_GEVENTS			24
 #define SCIMAPS				59 /* 0..58 */
 #define SCI_GPES			32
+#define NUMBER_SMITYPES			160
 
 #define SMI_EVENT_STATUS		0x0
 #define SMI_EVENT_ENABLE		0x04
@@ -138,7 +139,7 @@
 /* 153-155 Reserved */
 #define SMITYPE_CFGTRAP0			156
 /* 157-159 Reserved */
-#define NUMBER_SMITYPES				160
+
 #define TYPE_TO_MASK(X)				(1 << (X) % 32)
 
 #define SMI_REG_SMISTS0			0x80