diff options
| author | Todd Broch <tbroch@chromium.org> | 2015-04-27 18:14:26 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-04-30 00:23:37 +0000 |
| commit | 1ecab8b50854bec3a803bdcef2213e7d351b96fc (patch) | |
| tree | 2d578eabb775271b3f48c828687adb0be6050a1f | |
| parent | 8652dcceb92d3b3ae517010fdb296c3b1e77c409 (diff) | |
| download | chrome-ec-1ecab8b50854bec3a803bdcef2213e7d351b96fc.tar.gz | |
samus_pd: Cleanup HPD port calls.
Signed-off-by: Todd Broch <tbroch@chromium.org>
BRANCH=samus
BUG=chrome-os-partner:38728
TEST=make buildall -j
Change-Id: I6be4e59daf7d79f643a6e4fa6400d6f13f521ea4
Reviewed-on: https://chromium-review.googlesource.com/267795
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Queue: Todd Broch <tbroch@chromium.org>
Tested-by: Todd Broch <tbroch@chromium.org>
| -rw-r--r-- | board/samus_pd/usb_pd_policy.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/board/samus_pd/usb_pd_policy.c b/board/samus_pd/usb_pd_policy.c index c0ae02d17b..59530116c9 100644 --- a/board/samus_pd/usb_pd_policy.c +++ b/board/samus_pd/usb_pd_policy.c @@ -307,16 +307,14 @@ static int svdm_dp_config(int port, uint32_t *payload) return 2; }; +#define PORT_TO_HPD(port) ((port) ? GPIO_USB_C1_DP_HPD : GPIO_USB_C0_DP_HPD) static void svdm_dp_post_config(int port) { dp_flags[port] |= DP_FLAGS_DP_ON; if (!(dp_flags[port] & DP_FLAGS_HPD_HI_PENDING)) return; - if (port) - gpio_set_level(GPIO_USB_C1_DP_HPD, 1); - else - gpio_set_level(GPIO_USB_C0_DP_HPD, 1); + gpio_set_level(PORT_TO_HPD(port), 1); } static void hpd0_irq_deferred(void) @@ -331,8 +329,8 @@ static void hpd1_irq_deferred(void) DECLARE_DEFERRED(hpd0_irq_deferred); DECLARE_DEFERRED(hpd1_irq_deferred); - -#define PORT_TO_HPD(port) ((port) ? GPIO_USB_C1_DP_HPD : GPIO_USB_C0_DP_HPD) +#define PORT_TO_HPD_IRQ_DEFERRED(port) ((port) ? hpd1_irq_deferred : \ + hpd0_irq_deferred) static int svdm_dp_attention(int port, uint32_t *payload) { @@ -352,10 +350,7 @@ static int svdm_dp_attention(int port, uint32_t *payload) if (irq & cur_lvl) { gpio_set_level(hpd, 0); /* 250 usecs is minimum, 2msec is max */ - if (port) - hook_call_deferred(hpd1_irq_deferred, 300); - else - hook_call_deferred(hpd0_irq_deferred, 300); + hook_call_deferred(PORT_TO_HPD_IRQ_DEFERRED(port), 300); } else if (irq & !cur_lvl) { CPRINTF("ERR:HPD:IRQ&LOW\n"); return 0; /* nak */ |