From 3b19c46c314fe003fc476701a6909921bcdd0871 Mon Sep 17 00:00:00 2001 From: Mary Ruthven Date: Wed, 15 Jun 2016 17:39:19 -0700 Subject: [PATCH] g: remove the fuse override in rbox FUSE_CTRL_OVERRIDE overrides all rbox fuse values with the values in RBOX_DEBUG not just the ones that are explicitly set. This change removes the override from rbox. BUG=chrome-os-partner:54238 BRANCH=none TEST=on gru and kevin check that pressing 'c' registers on the EC. Change-Id: I655e9ca96e52359a7d36e0d691f838c335df8cb8 Signed-off-by: Mary Ruthven Reviewed-on: https://chromium-review.googlesource.com/353033 Reviewed-by: Bill Richardson Reviewed-by: David Schneider --- chip/g/rbox.c | 14 -------------- chip/g/rbox.h | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/chip/g/rbox.c b/chip/g/rbox.c index 56c58b72df..1a71f1d507 100644 --- a/chip/g/rbox.c +++ b/chip/g/rbox.c @@ -67,20 +67,6 @@ void rbox_init(void) GWRITE(RBOX, WAKEUP_CLEAR, 1); GWRITE(RBOX, INT_STATE, 1); - /* Make sure fuse override is not already enabled */ - GWRITE(RBOX, FUSE_CTRL, 0); - - /* Block output from key0 and 1 when power button is pressed */ - GWRITE_FIELD(RBOX, DEBUG_BLOCK_OUTPUT, KEY0_SEL, 1); - GWRITE_FIELD(RBOX, DEBUG_BLOCK_OUTPUT, KEY1_SEL, 1); - - /* Increase debounce */ - GWRITE_FIELD(RBOX, DEBUG_DEBOUNCE, PERIOD, 15); - - /* Enable debug override */ - GWRITE_FIELD(RBOX, FUSE_CTRL, OVERRIDE_FUSE, 1); - GWRITE_FIELD(RBOX, FUSE_CTRL, OVERRIDE_FUSE_READY, 1); - #ifdef CONFIG_RBOX_DEBUG enable_interrupts(); #endif diff --git a/chip/g/rbox.h b/chip/g/rbox.h index c2a09c8432..20e9b1ecba 100644 --- a/chip/g/rbox.h +++ b/chip/g/rbox.h @@ -32,4 +32,4 @@ } #endif /* DEBUG_RBOX */ -#endif /* __CROS_RDD_H */ +#endif /* __CROS_RBOX_H */