diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-03-19 12:35:16 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-26 00:28:13 +0000 |
| commit | f6a87936b224620c18b58f45af5ef1a42e116561 (patch) | |
| tree | 048ff9b2b724384dcd3297e737ad4df17c015358 | |
| parent | b70f61a519e67ef4f19d6f3dd0b9c9862b02eef1 (diff) | |
| download | chrome-ec-f6a87936b224620c18b58f45af5ef1a42e116561.tar.gz | |
Waddledee: Configure DAC for PSYS
This commit configures the DAC module in the waddledee build and sets
up the PSYS output to use it.
BUG=b:149094279
BRANCH=None
TEST=make -j buildall
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: I1b08e46f25ec3f14924b0ed9da17a8cd213ddacc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2110534
| -rw-r--r-- | baseboard/dedede/baseboard.h | 10 | ||||
| -rw-r--r-- | board/waddledee/gpio.inc | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h index 0b18483ccc..a7e7168b28 100644 --- a/baseboard/dedede/baseboard.h +++ b/baseboard/dedede/baseboard.h @@ -56,15 +56,15 @@ #define CONFIG_CHARGER_SM5803 /* C0 and C1: Charger */ #define CONFIG_FPU /* For charger calculations */ + #define CONFIG_USB_PD_VBUS_DETECT_CHARGER + #define CONFIG_USB_PD_5V_CHARGER_CTRL + #define CONFIG_CHARGER_OTG + + #define CONFIG_DAC /* DAC for PSYS */ #define CONFIG_USB_PD_TCPM_ITE_ON_CHIP /* C0: ITE EC TCPC */ #define CONFIG_USB_PD_TCPM_ANX7447 /* C1: ANX TCPC + Mux */ #define CONFIG_BC12_DETECT_PI3USB9201 /* BC 1.2 */ - - /* Vbus is controlled by the charger */ - #define CONFIG_USB_PD_VBUS_DETECT_CHARGER - #define CONFIG_USB_PD_5V_CHARGER_CTRL - #define CONFIG_CHARGER_OTG #else #error "Must define a VARIANT_DEDEDE_EC!" #endif diff --git a/board/waddledee/gpio.inc b/board/waddledee/gpio.inc index c1ed840f37..3ad7190941 100644 --- a/board/waddledee/gpio.inc +++ b/board/waddledee/gpio.inc @@ -133,7 +133,8 @@ ALTERNATE(PIN_MASK(A, BIT(4) | BIT(5)), 0, MODULE_I2C, 0) /* I2C5 */ ALTERNATE(PIN_MASK(L, BIT(0)), 0, MODULE_ADC, 0) /* ADC13: EC_SUB_ANALOG */ ALTERNATE(PIN_MASK(I, BIT(0) | BIT(2) | BIT(3)), 0, MODULE_ADC, 0) /* ADC0: EC_VSNS_PP3300_A, ADC2: TEMP_SENSOR_1, ADC3: TEMP_SENSOR_2 */ -/* TODO(b/149094279): DAC module for PSYS */ +/* DAC */ +ALTERNATE(PIN_MASK(J, BIT(2)), 0, MODULE_DAC, 0) /* DAC2: EC_AP_PSYS */ /* PWM */ ALTERNATE(PIN_MASK(A, BIT(0) | BIT(1) | BIT(2) | BIT(3)), 0, MODULE_PWM, 0) /* KB_BL_PWM, LED_[R,G,B]_ODL */ |