From a0618201d42f4cba1b25ecda9bc11ca41511c206 Mon Sep 17 00:00:00 2001 From: Philip Chen Date: Wed, 23 Aug 2017 18:02:25 -0700 Subject: google/gru: Support Nefario rev0 Do not assert GPIO1_B3 otherwise BT would be disabled on Nefario. Also, remove DVS support for CENTERLOGIC. BUG=b:64702054, b:63537905 TEST=build coreboot Change-Id: I350db2c080f2e41ae56413f5f895557978ef0ba8 Signed-off-by: Philip Chen Reviewed-on: https://review.coreboot.org/21176 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/mainboard/google/gru/pwm_regulator.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/mainboard/google/gru/pwm_regulator.c') diff --git a/src/mainboard/google/gru/pwm_regulator.c b/src/mainboard/google/gru/pwm_regulator.c index 3ee74a4426..6a9f1714e8 100644 --- a/src/mainboard/google/gru/pwm_regulator.c +++ b/src/mainboard/google/gru/pwm_regulator.c @@ -40,7 +40,7 @@ int kevin6_pwm_design_voltage[][2] = { [PWM_REGULATOR_CENTERLOG] = {8001, 10497} }; -/* Applies for Gru rev2+ and Bob. */ +/* Applies for Gru rev2+, Bob, and Nefario. */ int pwm_design_voltage[][2] = { [PWM_REGULATOR_GPU] = {7864, 12177}, [PWM_REGULATOR_BIG] = {8001, 13022}, @@ -58,12 +58,15 @@ int scarlet_pwm_design_voltage[][2] = { int pwm_enum_to_pwm_number[] = { [PWM_REGULATOR_GPU] = 0, [PWM_REGULATOR_LIT] = 2, +#if IS_ENABLED(CONFIG_GRU_HAS_CENTERLOG_PWM) + [PWM_REGULATOR_CENTERLOG] = 3, +#else + [PWM_REGULATOR_CENTERLOG] = -1, +#endif #if IS_ENABLED(CONFIG_BOARD_GOOGLE_SCARLET) [PWM_REGULATOR_BIG] = 3, - [PWM_REGULATOR_CENTERLOG] = -1, /* fixed regulator on Scarlet */ #else [PWM_REGULATOR_BIG] = 1, - [PWM_REGULATOR_CENTERLOG] = 3, #endif }; -- cgit v1.2.3