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 <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78626
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Matt DeVillier 2023-10-24 15:25:45 -05:00 committed by Felix Held
parent 1e0842e8bc
commit 25765a0dce
4 changed files with 19 additions and 19 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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""