diff --git a/src/mainboard/google/brya/variants/craask/overridetree.cb b/src/mainboard/google/brya/variants/craask/overridetree.cb
index a1ff69c..0f19bc9 100644
--- a/src/mainboard/google/brya/variants/craask/overridetree.cb
+++ b/src/mainboard/google/brya/variants/craask/overridetree.cb
@@ -17,6 +17,13 @@
 		option SD_GL9750S		0
 		option SD_ABSENT		1
 	end
+	field CODEC 6 7
+		option CODEC_NAU8825		0
+		option CODEC_ALC5682I_VS	1
+	end
+	field AMP 8 9
+		option AMP_MX98360A		0
+	end
 end
 
 chip soc/intel/alderlake
@@ -294,7 +301,23 @@
 				register "short_key_debounce" = "2"	# 100ms
 				register "jack_insert_debounce" = "7"	# 512ms
 				register "jack_eject_debounce" = "7"	# 512ms
-				device i2c 1a on end
+				device i2c 1a on
+					probe CODEC CODEC_NAU8825
+				end
+			end
+                        chip drivers/i2c/generic
+				register "hid" = ""RTL5682""
+				register "name" = ""RT58""
+				register "desc" = ""Headset Codec""
+				register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_A23)"
+				# Set the jd_src to RT5668_JD1 for jack detection
+				register "property_count" = "1"
+				register "property_list[0].type" = "ACPI_DP_TYPE_INTEGER"
+				register "property_list[0].name" = ""realtek,jd-src""
+				register "property_list[0].integer" = "1"
+				device i2c 1a on
+					probe CODEC CODEC_ALC5682I_VS
+				end
 			end
 		end
 		device ref i2c5 on
@@ -321,7 +344,9 @@
 				register "hid" = ""MX98360A""
 				register "sdmode_gpio" =  "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A11)"
 				register "sdmode_delay" = "5"
-				device generic 0 on end
+				device generic 0 on
+					probe AMP AMP_MX98360A
+				end
 			end
 		end
 		device ref pcie_rp7 on