From 76e9d6b1ac5b89fbc5fb5ad77b128920c11b995d Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Thu, 8 Feb 2018 11:52:48 -0700 Subject: mb/google/kahlee: Add grunt audio codecs to devicetree Remove manually written asl entries for grunt's DA7219 and MAX98357A audio codecs, and replace them with equivalent devicetree entries. BUG=b:72121803 TEST=With grunt audio kernel patches, "aplay -l" shows playback devices: **** List of PLAYBACK Hardware Devices **** card 0: acpd7219m98357 [acpd7219m98357], device 0: Playback da7219-hifi-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: acpd7219m98357 [acpd7219m98357], device 2: HiFi Playback HiFi-2 [] Subdevices: 1/1 Subdevice #0: subdevice #0 Change-Id: Ia658c54a28a5363aabb4c50478adaca1f46d166a Signed-off-by: Daniel Kurtz Reviewed-on: https://review.coreboot.org/23658 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Justin TerAvest --- .../baseboard/include/baseboard/acpi/audio.asl | 108 --------------------- 1 file changed, 108 deletions(-) (limited to 'src/mainboard/google/kahlee/variants/baseboard') diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl index 520c0d11ce..ea58f89a3d 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl @@ -21,111 +21,3 @@ Device (I2S) Name (_HID, "AMD7219") Name (_CID, "AMD7219") } - -/* DA7219 codec */ -Device (DLG7) -{ - Name (_HID, "DLGS7219") - Name (_UID, 1) - Name (_DDN, "Dialog Semiconductor DA7219 Audio Codec") - Name (_S0W, 0x04) - - Name(_CRS, ResourceTemplate () - { - I2cSerialBus ( - 0x001A, - ControllerInitiated, - 0x00061A80, - AddressingMode7Bit, - "\\_SB.I2CA", - 0x00, - ResourceConsumer, - , - ) - - /* Jack Detect AGPIO14 */ - GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,, - "\\_SB.GPIO") { 14 } - }) - - /* Device-Specific Data */ - Name (_DSD, Package () - { - ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package () - { - Package () { "dlg,micbias-lvl", 2600 }, - Package () { "dlg,mic-amp-in-sel", "diff" } - }, - - ToUUID ("dbb8e3e6-5886-4ba6-8795-1319f52a966b"), - Package () - { - Package () { "da7219_aad", "DAAD" } - } - }) - - /* Device Properties for _DSD */ - Name (DAAD, Package () - { - ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package () - { - Package () { "dlg,btn-cfg", 50 }, - Package () { "dlg,mic-det-thr", 500 }, - Package () { "dlg,jack-ins-deb", 20 }, - Package () { "dlg,jack-det-rate", "32ms_64ms" }, - Package () { "dlg,jack-rem-deb", 1 }, - Package () { "dlg,a-d-btn-thr", 0xa }, - Package () { "dlg,d-b-btn-thr", 0x16 }, - Package () { "dlg,b-c-btn-thr", 0x21 }, - Package () { "dlg,c-mic-btn-thr", 0x3e }, - Package () { "dlg,btn-avg", 4 }, - Package () { "dlg,adc-1bit-rpt", 1 }, - Package () { "dlg,micbias-pulse-lvl", 0 }, - Package () { "dlg,micbias-pulse-time", 0 } - } - }) /* DAAD */ - - Method (_STA, 0, NotSerialized) - { - Return (0x0F) - } -} - -/* MAX98357 codec */ -Device (MAXM) -{ - Name (_HID, "MX98357A") - Name (_UID, 0) - Name (_DDN, "Maxim Integrated 98357A Amplifier") - - Name (_CRS, ResourceTemplate () - { - GpioIo (Exclusive, PullDefault, 0x0000, 0x0000, - IoRestrictionOutputOnly, - "\\_SB.GPIO", 0x00, ResourceConsumer, ,) { 119 } - }) - - Name (_DSD, Package () - { - ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package () - { - Package () - { - "sdmode-gpio", Package () { \MAXM, 0, 0, 0 } - }, - - Package () - { - "sdmode-delay", 5 - } - } - }) - - Method (_STA, 0, NotSerialized) - { - Return (0x0F) - } -} -- cgit v1.2.3