From 25765a0dceaad9a475f4160c72ef82e02346db23 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 24 Oct 2023 15:25:45 -0500 Subject: mb/google/zork: Fix audio config on dalboz variants There is only a single i2c tunnel bus for audio from the EC, so all attached devices need to exist under a single device attached to that bus. This change will facilitate cleanup/simplification using device aliases in a subsequent commit. TEST=tested with rest of patch train Change-Id: Ie09c682a7419868d39421574568dff1a651fa0dc Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/78626 Reviewed-by: Felix Held Tested-by: build bot (Jenkins) --- src/mainboard/google/zork/variants/dirinboz/overridetree.cb | 12 ++++++------ src/mainboard/google/zork/variants/gumboz/overridetree.cb | 12 ++++++------ src/mainboard/google/zork/variants/shuboz/overridetree.cb | 12 ++++++------ src/mainboard/google/zork/variants/vilboz/overridetree.cb | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/mainboard/google/zork') diff --git a/src/mainboard/google/zork/variants/dirinboz/overridetree.cb b/src/mainboard/google/zork/variants/dirinboz/overridetree.cb index 327aacad7f..eb11a619e6 100644 --- a/src/mainboard/google/zork/variants/dirinboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/dirinboz/overridetree.cb @@ -166,11 +166,10 @@ chip soc/amd/picasso register "property_list[1].type" = "ACPI_DP_TYPE_STRING" register "property_list[1].name" = ""realtek,mclk-name"" register "property_list[1].string" = ""oscout1"" - device i2c 1a on end + device i2c 1a on + probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682 + end end - probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682 - end - device generic 1.0 on chip drivers/i2c/generic register "hid" = ""RTL5682"" register "name" = ""RT58"" @@ -184,9 +183,10 @@ chip soc/amd/picasso register "property_list[1].type" = "ACPI_DP_TYPE_STRING" register "property_list[1].name" = ""realtek,mclk-name"" register "property_list[1].string" = ""oscout1"" - device i2c 1a on end + device i2c 1a on + probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS + end end - probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end end diff --git a/src/mainboard/google/zork/variants/gumboz/overridetree.cb b/src/mainboard/google/zork/variants/gumboz/overridetree.cb index 327aacad7f..eb11a619e6 100644 --- a/src/mainboard/google/zork/variants/gumboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/gumboz/overridetree.cb @@ -166,11 +166,10 @@ chip soc/amd/picasso register "property_list[1].type" = "ACPI_DP_TYPE_STRING" register "property_list[1].name" = ""realtek,mclk-name"" register "property_list[1].string" = ""oscout1"" - device i2c 1a on end + device i2c 1a on + probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682 + end end - probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682 - end - device generic 1.0 on chip drivers/i2c/generic register "hid" = ""RTL5682"" register "name" = ""RT58"" @@ -184,9 +183,10 @@ chip soc/amd/picasso register "property_list[1].type" = "ACPI_DP_TYPE_STRING" register "property_list[1].name" = ""realtek,mclk-name"" register "property_list[1].string" = ""oscout1"" - device i2c 1a on end + device i2c 1a on + probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS + end end - probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end end diff --git a/src/mainboard/google/zork/variants/shuboz/overridetree.cb b/src/mainboard/google/zork/variants/shuboz/overridetree.cb index ad64c27d2e..e6f1dc7af9 100644 --- a/src/mainboard/google/zork/variants/shuboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/shuboz/overridetree.cb @@ -111,11 +111,10 @@ chip soc/amd/picasso register "property_list[1].type" = "ACPI_DP_TYPE_STRING" register "property_list[1].name" = ""realtek,mclk-name"" register "property_list[1].string" = ""oscout1"" - device i2c 1a on end + device i2c 1a on + probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682 + end end - probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682 - end - device generic 1.0 on chip drivers/i2c/generic register "hid" = ""RTL5682"" register "name" = ""RT58"" @@ -129,9 +128,10 @@ chip soc/amd/picasso register "property_list[1].type" = "ACPI_DP_TYPE_STRING" register "property_list[1].name" = ""realtek,mclk-name"" register "property_list[1].string" = ""oscout1"" - device i2c 1a on end + device i2c 1a on + probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS + end end - probe AUDIO_CODEC_SOURCE AUDIO_CODEC_ALC5682I_VS end end end diff --git a/src/mainboard/google/zork/variants/vilboz/overridetree.cb b/src/mainboard/google/zork/variants/vilboz/overridetree.cb index 15fd296167..c46c35266f 100644 --- a/src/mainboard/google/zork/variants/vilboz/overridetree.cb +++ b/src/mainboard/google/zork/variants/vilboz/overridetree.cb @@ -206,7 +206,7 @@ chip soc/amd/picasso chip ec/google/chromeec/i2c_tunnel register "uid" = "1" register "remote_bus" = "8" - device generic 1.0 on + device generic 0.0 on chip drivers/i2c/generic register "hid" = ""10EC1015"" register "desc" = ""RT1015 Tweeter Left Speaker Amp"" -- cgit v1.2.3