diff --git a/src/mainboard/google/hatch/variants/dratini/overridetree.cb b/src/mainboard/google/hatch/variants/dratini/overridetree.cb
index 0de44339a5..7e25df5e29 100644
--- a/src/mainboard/google/hatch/variants/dratini/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/dratini/overridetree.cb
@@ -167,7 +167,7 @@ chip soc/intel/cannonlake
 				register "compat_string" = ""google,cros-ec-spi""
 				register "irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_A23_IRQ)"
 				register "wake" = "GPE0_DW0_23"
-				device spi 1 on end
+				device spi 1 hidden end
 			end # FPMCU
 		end
 		device ref lpc_espi	on
diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
index 952bf7553d..e302aff06c 100644
--- a/src/mainboard/google/hatch/variants/hatch/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
@@ -166,7 +166,7 @@ chip soc/intel/cannonlake
 				register "compat_string" = ""google,cros-ec-spi""
 				register "irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_A23_IRQ)"
 				register "wake" = "GPE0_DW0_23"
-				device spi 1 on end
+				device spi 1 hidden end
 			end # FPMCU
 		end
 		device ref hda		on
diff --git a/src/mainboard/google/hatch/variants/helios/overridetree.cb b/src/mainboard/google/hatch/variants/helios/overridetree.cb
index 341ebf0c66..3a624d976e 100644
--- a/src/mainboard/google/hatch/variants/helios/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/helios/overridetree.cb
@@ -184,7 +184,7 @@ chip soc/intel/cannonlake
 				register "compat_string" = ""google,cros-ec-spi""
 				register "irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_A23_IRQ)"
 				register "wake" = "GPE0_DW0_23"
-				device spi 1 on end
+				device spi 1 hidden end
 			end # FPMCU
 		end
 		device ref hda		on
diff --git a/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb b/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb
index 38ab2697f5..691e51f69f 100644
--- a/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/helios_diskswap/overridetree.cb
@@ -194,7 +194,7 @@ chip soc/intel/cannonlake
 				register "compat_string" = ""google,cros-ec-spi""
 				register "irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_A23_IRQ)"
 				register "wake" = "GPE0_DW0_23"
-				device spi 1 on end
+				device spi 1 hidden end
 			end # FPMCU
 		end
 		device ref hda		on
diff --git a/src/mainboard/google/hatch/variants/jinlon/overridetree.cb b/src/mainboard/google/hatch/variants/jinlon/overridetree.cb
index 7a645109a1..61ebf24c09 100644
--- a/src/mainboard/google/hatch/variants/jinlon/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/jinlon/overridetree.cb
@@ -191,7 +191,7 @@ chip soc/intel/cannonlake
 				register "compat_string" = ""google,cros-ec-spi""
 				register "irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_A23_IRQ)"
 				register "wake" = "GPE0_DW0_23"
-				device spi 1 on end
+				device spi 1 hidden end
 			end # FPMCU
 		end
 		device ref hda		on
diff --git a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
index 9b55d9025c..8c7a9e851c 100644
--- a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
@@ -221,7 +221,7 @@ chip soc/intel/cannonlake
 				register "compat_string" = ""google,cros-ec-spi""
 				register "irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_A23_IRQ)"
 				register "wake" = "GPE0_DW0_23"
-				device spi 1 on end
+				device spi 1 hidden end
 			end # FPMCU
 		end
 		device ref hda		on
diff --git a/src/mainboard/google/hatch/variants/mushu/overridetree.cb b/src/mainboard/google/hatch/variants/mushu/overridetree.cb
index 2344e4059e..0424da2f2c 100644
--- a/src/mainboard/google/hatch/variants/mushu/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/mushu/overridetree.cb
@@ -186,7 +186,7 @@ chip soc/intel/cannonlake
 				register "compat_string" = ""google,cros-ec-spi""
 				register "irq" = "ACPI_IRQ_WAKE_LEVEL_LOW(GPP_A23_IRQ)"
 				register "wake" = "GPE0_DW0_23"
-				device spi 1 on end
+				device spi 1 hidden end
 			end # FPMCU
 		end
 		device ref hda		on