diff options
author | Jeremy Thorpe <jeremyt@chromium.org> | 2013-03-04 10:18:25 -0800 |
---|---|---|
committer | ChromeBot <chrome-bot@google.com> | 2013-03-07 20:37:33 -0800 |
commit | f568b823219183af836567cc44912199ec24b0c2 (patch) | |
tree | 1ffee955eecacf230fd17c97c9094042c49f76a1 /board | |
parent | fa144d8ac007c3333435f0f419c6a5b511118988 (diff) | |
download | chrome-ec-f568b823219183af836567cc44912199ec24b0c2.tar.gz |
Rename CODEC_INT to ID_MUX.
Rename CODEC_INT to ID_MUX and let it be settable on the EC command line. This
GPIO line controls the ID line MUX in Spring.
BRANCH=spring
BUG=chrome-os-partner:16196
TEST=manual
Change-Id: Ib29f31cf5dd28f5166236b5f98560543298b083b
Signed-off-by: Jeremy Thorpe <jeremyt@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/44531
Reviewed-by: Vic Yang <victoryang@chromium.org>
Tested-by: Vic Yang <victoryang@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/spring/board.c | 9 | ||||
-rw-r--r-- | board/spring/board.h | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/board/spring/board.c b/board/spring/board.c index 5cf3fcf914..d32c33080a 100644 --- a/board/spring/board.c +++ b/board/spring/board.c @@ -99,7 +99,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"ENTERING_RW", GPIO_D, (1<<0), GPIO_OUT_LOW, NULL}, {"CHARGER_EN", GPIO_B, (1<<2), GPIO_OUT_LOW, NULL}, {"EC_INT", GPIO_B, (1<<9), GPIO_HI_Z, NULL}, - {"CODEC_INT", GPIO_D, (1<<1), GPIO_HI_Z, NULL}, + {"ID_MUX", GPIO_D, (1<<1), GPIO_OUT_LOW, NULL}, {"KB_OUT00", GPIO_B, (1<<0), GPIO_KB_OUTPUT, NULL}, {"KB_OUT01", GPIO_B, (1<<8), GPIO_KB_OUTPUT, NULL}, {"KB_OUT02", GPIO_B, (1<<12), GPIO_KB_OUTPUT, NULL}, @@ -205,13 +205,6 @@ void board_interrupt_host(int active) gpio_set_level(GPIO_EC_INT, !active); } -void board_keyboard_suppress_noise(void) -{ - /* notify audio codec of keypress for noise suppression */ - gpio_set_level(GPIO_CODEC_INT, 0); - gpio_set_level(GPIO_CODEC_INT, 1); -} - static void board_startup_hook(void) { gpio_set_flags(GPIO_SUSPEND_L, INT_BOTH_PULL_UP); diff --git a/board/spring/board.h b/board/spring/board.h index dd1b755da0..836e175e5a 100644 --- a/board/spring/board.h +++ b/board/spring/board.h @@ -113,7 +113,7 @@ enum gpio_signal { GPIO_ENTERING_RW, /* EC is R/W mode for the kbc mux */ GPIO_CHARGER_EN, GPIO_EC_INT, - GPIO_CODEC_INT, /* To audio codec (KB noise cancellation) */ + GPIO_ID_MUX, GPIO_KB_OUT00, GPIO_KB_OUT01, GPIO_KB_OUT02, |