diff options
author | Tzung-Bi Shih <tzungbi@chromium.org> | 2020-01-03 14:34:07 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-01-14 05:30:14 +0000 |
commit | ca47b0c5673ee2e970a9b29b095d4183849e3cae (patch) | |
tree | 396a5002d398c221461a510e18149996c13dfbb9 /board | |
parent | f6d248bb6d334b0dd0b02b7a1960079378a623ff (diff) | |
download | chrome-ec-ca47b0c5673ee2e970a9b29b095d4183849e3cae.tar.gz |
audio_codec: npcx: deprecate legacy option CONFIG_WAKE_ON_VOICE
CONFIG_WAKE_ON_VOICE consists 3 features in NPCX:
- DMIC
- I2S_RX
- WOV
These features has broken down into smaller CONFIG options. Deprecates
CONFIG_WAKE_ON_VOICE and prepares to separate smaller features in NPCX.
BRANCH=none
BUG=b:144064048, b:144063867
TEST=make BOARD=trembyle -j
Change-Id: Ieaa123299ea687644f19066cf95ef150a18bf252
Signed-off-by: Tzung-Bi Shih <tzungbi@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1986687
Commit-Queue: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Tested-by: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/npcx7_evb/board.h | 4 | ||||
-rw-r--r-- | board/npcx7_evb/gpio.inc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h index 35e5e0a031..298b5acad0 100644 --- a/board/npcx7_evb/board.h +++ b/board/npcx7_evb/board.h @@ -79,7 +79,9 @@ #define CONFIG_HIBERNATE_PSL /* Use PSL (Power Switch Logic) for hibernate */ #define CONFIG_CLOCK_SRC_EXTERNAL /* Use external 32kHz OSC as LFCLK source */ #if defined(CHIP_VARIANT_NPCX7M7WB) || defined(CHIP_VARIANT_NPCX7M7WC) -#define CONFIG_WAKE_ON_VOICE /* Use Audio front-end for Wake-on-Voice */ +#define CONFIG_AUDIO_CODEC +#define CONFIG_AUDIO_CODEC_DMIC +#define CONFIG_AUDIO_CODEC_I2S_RX /* Use Audio front-end for Wake-on-Voice */ #endif #undef CONFIG_FANS /* Remove fan application */ #define CONFIG_FANS 0 diff --git a/board/npcx7_evb/gpio.inc b/board/npcx7_evb/gpio.inc index e0bb9c1df8..145a48de85 100644 --- a/board/npcx7_evb/gpio.inc +++ b/board/npcx7_evb/gpio.inc @@ -107,7 +107,7 @@ ALTERNATE(PIN_MASK(D, 0x04), 1, MODULE_PMU, 0) /* PSL_IN1 GPIOD2 */ ALTERNATE(PIN_MASK(0, 0x07), 1, MODULE_PMU, 0) /* PSL_IN2/3/4 GPIO00/01/02 */ #endif -#ifdef CONFIG_WAKE_ON_VOICE +#if defined(CONFIG_AUDIO_CODEC_I2S_RX) || defined(CONFIG_AUDIO_CODEC_WOV) ALTERNATE(PIN_MASK(A, 0xA0), 1, MODULE_WOV, 0) /* I2S_SYNC/I2S_SCLK GPIOA5/A7 */ ALTERNATE(PIN_MASK(B, 0x01), 1, MODULE_WOV, 0) /* I2S_SDAT GPIOB0 */ ALTERNATE(PIN_MASK(9, 0x90), 1, MODULE_WOV, 0) /* DMIC_CLK/DMIC_IN GPIO94/97 */ |