mb/google/zork: Use device aliases for audio overrides
Simplify audio overrides for dalboz baseboard-based variants by using
device aliases. This prevents duplicate ACPI devices from being
generated for the ChromeEC i2s tunnel (which causes Windows to BSOD
with an ACPI_BIOS_ERROR).
TEST=build/boot Win11 on google/zork (vilboz), dump ACPI tables
and verify only one EC tunnel device in SSDT.
Change-Id: I56aa2f761843aa269620f7e8c89ae9c0f205f349
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78509
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/google/zork/variants/baseboard/dalboz/devicetree.cb b/src/mainboard/google/zork/variants/baseboard/dalboz/devicetree.cb
index cf27b5a..e8b73ca 100644
--- a/src/mainboard/google/zork/variants/baseboard/dalboz/devicetree.cb
+++ b/src/mainboard/google/zork/variants/baseboard/dalboz/devicetree.cb
@@ -346,11 +346,11 @@
end
device ref lpc_bridge on
chip ec/google/chromeec
- device pnp 0c09.0 on
+ device pnp 0c09.0 alias cros_ec on
chip ec/google/chromeec/i2c_tunnel
register "uid" = "1"
register "remote_bus" = "8"
- device generic 0.0 on
+ device generic 0.0 alias cros_ec_i2c_8 on
chip drivers/i2c/generic
register "hid" = ""10EC5682""
register "name" = ""RT58""
diff --git a/src/mainboard/google/zork/variants/dirinboz/overridetree.cb b/src/mainboard/google/zork/variants/dirinboz/overridetree.cb
index eb11a619..741baed 100644
--- a/src/mainboard/google/zork/variants/dirinboz/overridetree.cb
+++ b/src/mainboard/google/zork/variants/dirinboz/overridetree.cb
@@ -150,9 +150,9 @@
end
device ref lpc_bridge on
chip ec/google/chromeec
- device pnp 0c09.0 on
+ device ref cros_ec on
chip ec/google/chromeec/i2c_tunnel
- device generic 0.0 on
+ device ref cros_ec_i2c_8 on
chip drivers/i2c/generic
register "hid" = ""10EC5682""
register "name" = ""RT58""
diff --git a/src/mainboard/google/zork/variants/gumboz/overridetree.cb b/src/mainboard/google/zork/variants/gumboz/overridetree.cb
index eb11a619..741baed 100644
--- a/src/mainboard/google/zork/variants/gumboz/overridetree.cb
+++ b/src/mainboard/google/zork/variants/gumboz/overridetree.cb
@@ -150,9 +150,9 @@
end
device ref lpc_bridge on
chip ec/google/chromeec
- device pnp 0c09.0 on
+ device ref cros_ec on
chip ec/google/chromeec/i2c_tunnel
- device generic 0.0 on
+ device ref cros_ec_i2c_8 on
chip drivers/i2c/generic
register "hid" = ""10EC5682""
register "name" = ""RT58""
diff --git a/src/mainboard/google/zork/variants/shuboz/overridetree.cb b/src/mainboard/google/zork/variants/shuboz/overridetree.cb
index e6f1dc7..0a898b8 100644
--- a/src/mainboard/google/zork/variants/shuboz/overridetree.cb
+++ b/src/mainboard/google/zork/variants/shuboz/overridetree.cb
@@ -95,9 +95,9 @@
end
device ref lpc_bridge on
chip ec/google/chromeec
- device pnp 0c09.0 on
+ device ref cros_ec on
chip ec/google/chromeec/i2c_tunnel
- device generic 0.0 on
+ device ref cros_ec_i2c_8 on
chip drivers/i2c/generic
register "hid" = ""10EC5682""
register "name" = ""RT58""
diff --git a/src/mainboard/google/zork/variants/vilboz/overridetree.cb b/src/mainboard/google/zork/variants/vilboz/overridetree.cb
index c46c352..f4eb635 100644
--- a/src/mainboard/google/zork/variants/vilboz/overridetree.cb
+++ b/src/mainboard/google/zork/variants/vilboz/overridetree.cb
@@ -202,11 +202,9 @@
end
device ref lpc_bridge on
chip ec/google/chromeec
- device pnp 0c09.0 on
+ device ref cros_ec on
chip ec/google/chromeec/i2c_tunnel
- register "uid" = "1"
- register "remote_bus" = "8"
- device generic 0.0 on
+ device ref cros_ec_i2c_8 on
chip drivers/i2c/generic
register "hid" = ""10EC1015""
register "desc" = ""RT1015 Tweeter Left Speaker Amp""