diff options
| author | Todd Broch <tbroch@chromium.org> | 2015-02-12 11:22:34 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-02-25 03:33:12 +0000 |
| commit | e20d019fc4494d2340b227ed0c42c29ca39c85d3 (patch) | |
| tree | 0116ec759d2c1365bfcdb2b26856b883a9c25981 /board/twinkie | |
| parent | c3cd10937e321f04c4b2dfc4786ec146e785e5cb (diff) | |
| download | chrome-ec-e20d019fc4494d2340b227ed0c42c29ca39c85d3.tar.gz | |
pd: Massage initialization at task start.
Refactoring effort to unify the set of PD intialization tasks that
need to occur. Those areas include:
1. host mode as it relates to power & pull-ups/downs
2. PD tx init
3. PD mux settings
Signed-off-by: Todd Broch <tbroch@chromium.org>
BRANCH=samus
BUG=chrome-os-partner:36481
TEST=manual,
1. compiles and functions on samus_pd
2. If sysjump w/ dongle connected than alternate mode re-entered
properly including muxing and HPD
Change-Id: I47f32acaeccbd7745e1e01a8b085b1804c4c5000
Reviewed-on: https://chromium-review.googlesource.com/249273
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Tested-by: Alec Berg <alecaberg@chromium.org>
Commit-Queue: Alec Berg <alecaberg@chromium.org>
Diffstat (limited to 'board/twinkie')
| -rw-r--r-- | board/twinkie/injector.c | 2 | ||||
| -rw-r--r-- | board/twinkie/usb_pd_config.h | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/board/twinkie/injector.c b/board/twinkie/injector.c index 81e5217dfb..916bc1c65e 100644 --- a/board/twinkie/injector.c +++ b/board/twinkie/injector.c @@ -82,7 +82,7 @@ static void twinkie_init(void) /* configure TX clock pins */ gpio_config_module(MODULE_USB_PD, 1); /* Initialize physical layer */ - pd_hw_init(0); + pd_hw_init(0, PD_ROLE_SINK); } DECLARE_HOOK(HOOK_INIT, twinkie_init, HOOK_PRIO_DEFAULT); diff --git a/board/twinkie/usb_pd_config.h b/board/twinkie/usb_pd_config.h index 67a472fff4..466cc40905 100644 --- a/board/twinkie/usb_pd_config.h +++ b/board/twinkie/usb_pd_config.h @@ -165,6 +165,18 @@ static inline void pd_set_host_mode(int port, int enable) } } +static inline void pd_config_init(int port, uint8_t power_role) +{ + /* + * Set CC pull resistors, and charge_en and vbus_en GPIOs to match + * the initial role. + */ + pd_set_host_mode(port, power_role); + + /* Initialize TX pins and put them in Hi-Z */ + pd_tx_init(); +} + static inline int pd_adc_read(int port, int cc) { if (cc == 0) |