Change in coreboot[master]: mb/google/zork: Use SSDT generator for Chrome EC audio codec device
Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43042 )
Change subject: mb/google/zork: Use SSDT generator for Chrome EC audio codec device ......................................................................
mb/google/zork: Use SSDT generator for Chrome EC audio codec device
This change drops the inclusion of codec.asl in DSDT for `GOOG0013` device and instead uses the newly added Chrome EC audio codec driver for filling in the device node in SSDT.
TEST=Verified that following node gets generated: Scope (_SB.PCI0.LPCB.EC0.CREC) { Device (ECA0) { Name (_HID, "GOOG0013") // _HID: Hardware ID Name (_UID, One) // _UID: Unique ID Name (_DDN, "Cros EC audio codec") // _DDN: DOS Device Name Method (_STA, 0, NotSerialized) // _STA: Status { Return (0x0F) } } }
Change-Id: I3e626ce01a3735ac2c966c0e95310be4c828b241 Signed-off-by: Furquan Shaikh furquan@google.com --- M src/mainboard/google/zork/Kconfig M src/mainboard/google/zork/dsdt.asl M src/mainboard/google/zork/variants/baseboard/devicetree.cb D src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl D src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl D src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl D src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl D src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl D src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl D src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl 10 files changed, 5 insertions(+), 25 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/43042/1
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 3e7756b..e24f78a 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -19,6 +19,7 @@ select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_AUDIO_CODEC select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_ESPI select EC_GOOGLE_CHROMEEC_I2C_TUNNEL diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl index f561de3..8b42102 100644 --- a/src/mainboard/google/zork/dsdt.asl +++ b/src/mainboard/google/zork/dsdt.asl @@ -60,8 +60,6 @@ #include <ec/google/chromeec/acpi/superio.asl> /* ACPI code for EC functions */ #include <ec/google/chromeec/acpi/ec.asl> - /* ACPI code for EC I2C Audio Tunnel */ - #include <variant/acpi/audio.asl> } } /* End of ASL file */ diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree.cb b/src/mainboard/google/zork/variants/baseboard/devicetree.cb index 9324749..79a4c89 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree.cb @@ -171,6 +171,10 @@ register "remote_bus" = "9" device generic 1.0 on end end + chip ec/google/chromeec/audio_codec + register "uid" = "1" + device generic 0 on end + end end end end diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl b/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl deleted file mode 100644 index b892570..0000000 --- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl +++ /dev/null @@ -1,5 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -Scope (EC0.CREC) { - #include <ec/google/chromeec/acpi/codec.asl> -} diff --git a/src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl> diff --git a/src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl> diff --git a/src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl> diff --git a/src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl> diff --git a/src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl> diff --git a/src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl>
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43042 )
Change subject: mb/google/zork: Use SSDT generator for Chrome EC audio codec device ......................................................................
Patch Set 2: Code-Review+2
Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43042 )
Change subject: mb/google/zork: Use SSDT generator for Chrome EC audio codec device ......................................................................
mb/google/zork: Use SSDT generator for Chrome EC audio codec device
This change drops the inclusion of codec.asl in DSDT for `GOOG0013` device and instead uses the newly added Chrome EC audio codec driver for filling in the device node in SSDT.
TEST=Verified that following node gets generated: Scope (_SB.PCI0.LPCB.EC0.CREC) { Device (ECA0) { Name (_HID, "GOOG0013") // _HID: Hardware ID Name (_UID, One) // _UID: Unique ID Name (_DDN, "Cros EC audio codec") // _DDN: DOS Device Name Method (_STA, 0, NotSerialized) // _STA: Status { Return (0x0F) } } }
Change-Id: I3e626ce01a3735ac2c966c0e95310be4c828b241 Signed-off-by: Furquan Shaikh furquan@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/43042 Reviewed-by: Aaron Durbin adurbin@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/zork/Kconfig M src/mainboard/google/zork/dsdt.asl M src/mainboard/google/zork/variants/baseboard/devicetree.cb D src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl D src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl D src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl D src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl D src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl D src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl D src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl 10 files changed, 5 insertions(+), 25 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 3e7756b..e24f78a 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -19,6 +19,7 @@ select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID select EC_GOOGLE_CHROMEEC + select EC_GOOGLE_CHROMEEC_AUDIO_CODEC select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_ESPI select EC_GOOGLE_CHROMEEC_I2C_TUNNEL diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl index f561de3..8b42102 100644 --- a/src/mainboard/google/zork/dsdt.asl +++ b/src/mainboard/google/zork/dsdt.asl @@ -60,8 +60,6 @@ #include <ec/google/chromeec/acpi/superio.asl> /* ACPI code for EC functions */ #include <ec/google/chromeec/acpi/ec.asl> - /* ACPI code for EC I2C Audio Tunnel */ - #include <variant/acpi/audio.asl> } } /* End of ASL file */ diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree.cb b/src/mainboard/google/zork/variants/baseboard/devicetree.cb index 85ce4e6..159665f 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree.cb @@ -163,6 +163,10 @@ register "remote_bus" = "9" device generic 1.0 on end end + chip ec/google/chromeec/audio_codec + register "uid" = "1" + device generic 0 on end + end end end end diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl b/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl deleted file mode 100644 index b892570..0000000 --- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/acpi/audio.asl +++ /dev/null @@ -1,5 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -Scope (EC0.CREC) { - #include <ec/google/chromeec/acpi/codec.asl> -} diff --git a/src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/berknip/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl> diff --git a/src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/dalboz/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl> diff --git a/src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/ezkinil/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl> diff --git a/src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/morphius/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl> diff --git a/src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/trembyle/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl> diff --git a/src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl b/src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl deleted file mode 100644 index 900e36f..0000000 --- a/src/mainboard/google/zork/variants/vilboz/include/variant/acpi/audio.asl +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/acpi/audio.asl>
-
Aaron Durbin (Code Review) -
Furquan Shaikh (Code Review)