diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index acb2e3c..4af59e6 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -526,7 +526,34 @@
 				register "spkr_tplg" = "max98373"
 				register "jack_tplg" = "rt5682"
 				register "mic_tplg" = "_2ch_pdm0"
-				device generic 0 on end
+				device generic 0 on
+					probe AUDIO MAX98373_ALC5682I_I2S
+					probe AUDIO MAX98373_ALC5682_SNDW
+				end
+			end
+			chip drivers/sof
+				register "spkr_tplg" = "max98373_ssp2"
+				register "jack_tplg" = "rt5682"
+				register "mic_tplg" = "_2ch_pdm0"
+				device generic 0 on
+					probe AUDIO MAX98373_ALC5682I_I2S_UP4
+				end
+			end
+			chip drivers/sof
+				register "spkr_tplg" = "max98360a"
+				register "jack_tplg" = "rt5682"
+				register "mic_tplg" = "_2ch_pdm0"
+				device generic 0 on
+					probe AUDIO MAX98360_ALC5682I_I2S
+				end
+			end
+			chip drivers/sof
+				register "spkr_tplg" = "rt1011"
+				register "jack_tplg" = "rt5682"
+				register "mic_tplg" = "_2ch_pdm0"
+				device generic 0 on
+					probe AUDIO RT1011_ALC5682I_I2S
+				end
 			end
 		end
 	end
diff --git a/src/mainboard/google/volteer/variants/lindar/overridetree.cb b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
index e543b9f..b74bb23 100644
--- a/src/mainboard/google/volteer/variants/lindar/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/lindar/overridetree.cb
@@ -276,12 +276,6 @@
 			probe AUDIO MAX98373_ALC5682I_I2S_UP4
 			probe AUDIO MAX98360_ALC5682I_I2S
 			probe AUDIO RT1011_ALC5682I_I2S
-			chip drivers/sof
-				register "spkr_tplg" = "rt1011"
-				register "jack_tplg" = "rt5682"
-				register "mic_tplg" = "_2ch_pdm0"
-				device generic 0 on end
-			end
 		end
 		device ref pcie_rp9 on
 			chip soc/intel/common/block/pcie/rtd3