diff options
| author | Naveen Manohar <naveen.m@intel.com> | 2017-11-04 03:16:42 +0530 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2017-11-07 23:37:19 +0000 |
| commit | 351059a0b4a32eff7a2e44b2b745690dbd091867 (patch) | |
| tree | 8903fcf0ac4b11374da819a074620afa4a040a34 /src/mainboard/google/poppy | |
| parent | 83670c517694de4803e5bf00348e303092155326 (diff) | |
mb/google/poppy/variants/nautilus: add nhlt support
Nautilus board uses Dialog da7219 headset codec,
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.
Removes unwanted DMIC blob pick for nautilus
BUG=b:68686020
TEST=With the required driver support in kernel verify that
the Audio plays on headset and recording on headset mic
Change-Id: I104889f54da1de38854bcb72aabbc88b739d6c09
Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Reviewed-on: https://review.coreboot.org/22325
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/poppy')
| -rw-r--r-- | src/mainboard/google/poppy/Kconfig | 3 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nautilus/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nautilus/nhlt.c | 26 |
3 files changed, 28 insertions, 2 deletions
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index a6ba1a8112..f186daac61 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -55,8 +55,7 @@ config INCLUDE_NHLT_BLOBS config INCLUDE_NHLT_BLOBS_NAUTILUS bool "Include blobs for nautilus audio." - select NHLT_DMIC_2CH - select NHLT_DMIC_4CH + select NHLT_DA7219 config MAINBOARD_DIR string diff --git a/src/mainboard/google/poppy/variants/nautilus/Makefile.inc b/src/mainboard/google/poppy/variants/nautilus/Makefile.inc index 2854c86014..fce99cb832 100644 --- a/src/mainboard/google/poppy/variants/nautilus/Makefile.inc +++ b/src/mainboard/google/poppy/variants/nautilus/Makefile.inc @@ -5,3 +5,4 @@ SPD_SOURCES += samsung_dimm_K4EBE304EB-EGCG # 0b0010 bootblock-y += gpio.c ramstage-y += gpio.c +ramstage-y += nhlt.c diff --git a/src/mainboard/google/poppy/variants/nautilus/nhlt.c b/src/mainboard/google/poppy/variants/nautilus/nhlt.c new file mode 100644 index 0000000000..b6496e255a --- /dev/null +++ b/src/mainboard/google/poppy/variants/nautilus/nhlt.c @@ -0,0 +1,26 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2017 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <baseboard/variants.h> +#include <console/console.h> +#include <nhlt.h> +#include <soc/nhlt.h> + +void variant_nhlt_init(struct nhlt *nhlt) +{ + /* Dialog DA7219 Headset codec. */ + if (nhlt_soc_add_da7219(nhlt, AUDIO_LINK_SSP1)) + printk(BIOS_ERR, "Couldn't add Dialog DA7219.\n"); +} |