From 3417ee9a3fc4fcb6e758962781c9b8ff0a353f6d Mon Sep 17 00:00:00 2001 From: Naveen Manohar Date: Tue, 14 Nov 2017 00:35:21 +0530 Subject: mb/google/poppy/variants/nautilus: add SPK DMIC nhlt support Nautilus board uses max989357a speaker codec and 4CH DMIC. Select the appropriate NHLT blob to be packaged in CBFS. Also generate the required ACPI NHLT table for codec and the supported topology in nautilus. BUG=b:68686020 TEST=With the required driver support in kernel verify that the Audio plays on Speaker and captures on 4CH DMIC Change-Id: Ie90af02e0935029f53f9020bd78027b6eb31a187 Signed-off-by: Naveen Manohar Reviewed-on: https://review.coreboot.org/22457 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/poppy/Kconfig | 2 ++ src/mainboard/google/poppy/variants/nautilus/nhlt.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index a4decbe2e2..57c19543ab 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -52,6 +52,8 @@ config INCLUDE_NHLT_BLOBS config INCLUDE_NHLT_BLOBS_NAUTILUS bool "Include blobs for nautilus audio." select NHLT_DA7219 + select NHLT_DMIC_4CH + select NHLT_MAX98357 config MAINBOARD_DIR string diff --git a/src/mainboard/google/poppy/variants/nautilus/nhlt.c b/src/mainboard/google/poppy/variants/nautilus/nhlt.c index b6496e255a..690fed570b 100644 --- a/src/mainboard/google/poppy/variants/nautilus/nhlt.c +++ b/src/mainboard/google/poppy/variants/nautilus/nhlt.c @@ -20,7 +20,16 @@ void variant_nhlt_init(struct nhlt *nhlt) { + /* 4 Channel DMIC array. */ + if (nhlt_soc_add_dmic_array(nhlt, 4)) + printk(BIOS_ERR, "Couldn't add 4CH DMIC array.\n"); + /* Dialog DA7219 Headset codec. */ if (nhlt_soc_add_da7219(nhlt, AUDIO_LINK_SSP1)) printk(BIOS_ERR, "Couldn't add Dialog DA7219.\n"); + + /* MAXIM Smart Amps for left and right speakers. */ + if (nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP0)) + printk(BIOS_ERR, "Couldn't add Maxim_98357 codec.\n"); + } -- cgit v1.2.3