diff --git a/src/soc/amd/picasso/include/soc/cpu.h b/src/soc/amd/picasso/include/soc/cpu.h
index 7051bb8b10..28f395c1d6 100644
--- a/src/soc/amd/picasso/include/soc/cpu.h
+++ b/src/soc/amd/picasso/include/soc/cpu.h
@@ -3,11 +3,9 @@
 #ifndef AMD_PICASSO_CPU_H
 #define AMD_PICASSO_CPU_H
 
-#define RAVEN1_B0_CPUID			0x00810f10
-#define PICASSO_B0_CPUID		0x00810f80
-#define PICASSO_B1_CPUID		0x00810f81
-#define RAVEN2_A0_CPUID			0x00820f00
-#define RAVEN2_A1_CPUID			0x00820f01
+#define RAVEN1_B0_CPUID			CPUID_FROM_FMS(0x17, 0x11, 0)
+#define PICASSO_B0_CPUID		CPUID_FROM_FMS(0x17, 0x18, 0)
+#define RAVEN2_A0_CPUID			CPUID_FROM_FMS(0x17, 0x20, 0)
 
 #define RAVEN1_VBIOS_VID_DID		0x100215dd
 #define RAVEN1_VBIOS_REV		0x81
diff --git a/src/soc/amd/picasso/soc_util.c b/src/soc/amd/picasso/soc_util.c
index 9616f26bf5..59c82c65cd 100644
--- a/src/soc/amd/picasso/soc_util.c
+++ b/src/soc/amd/picasso/soc_util.c
@@ -94,7 +94,7 @@ static bool is_mystery_silicon(void)
 static bool is_fam17_1x(void)
 {
 	/* mask lower model number nibble and stepping */
-	return cpuid_eax(1) >> 8 == PICASSO_B1_CPUID >> 8;
+	return cpuid_eax(1) >> 8 == PICASSO_B0_CPUID >> 8;
 }
 
 static bool is_fam17_11(void)
@@ -106,19 +106,19 @@ static bool is_fam17_11(void)
 static bool is_fam17_18(void)
 {
 	/* only mask stepping */
-	return cpuid_eax(1) >> 4 == PICASSO_B1_CPUID >> 4;
+	return cpuid_eax(1) >> 4 == PICASSO_B0_CPUID >> 4;
 }
 
 static bool is_fam17_2x(void)
 {
 	/* mask lower model number nibble and stepping */
-	return cpuid_eax(1) >> 8 == RAVEN2_A1_CPUID >> 8;
+	return cpuid_eax(1) >> 8 == RAVEN2_A0_CPUID >> 8;
 }
 
 static bool is_fam17_20(void)
 {
 	/* only mask stepping */
-	return cpuid_eax(1) >> 4 == RAVEN2_A1_CPUID >> 4;
+	return cpuid_eax(1) >> 4 == RAVEN2_A0_CPUID >> 4;
 }
 
 enum silicon_type get_silicon_type(void)