diff options
-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"); +} |