diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c
index 2602be5087..3d82c37099 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -45,13 +45,6 @@ struct device_operations pci_domain_ops = {
 
 static void enable_dev(device_t dev)
 {
-	static int done = 0;
-
-	if (!done) {
-		setup_bsp_ramtop();
-		done = 1;
-	}
-
 	/* Set the operations if it is a special bus type */
 	if (dev->path.type == DEVICE_PATH_DOMAIN)
 		dev->ops = &pci_domain_ops;
@@ -64,6 +57,7 @@ static void enable_dev(device_t dev)
 static void soc_init(void *chip_info)
 {
 	southbridge_init(chip_info);
+	setup_bsp_ramtop();
 }
 
 static void soc_final(void *chip_info)