summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew McRae <amcrae@google.com>2020-01-22 16:55:16 +1100
committerCommit Bot <commit-bot@chromium.org>2020-01-23 05:41:16 +0000
commitf2207c4c7a632e604221909f4e8935ad16bf32a2 (patch)
treef840a8974b2cdf52ca3387997b44735921f98322
parenta8ea3bfdbe928b9bcf2d3756a2fae16fe40132ae (diff)
downloadchrome-ec-f2207c4c7a632e604221909f4e8935ad16bf32a2.tar.gz
puff ec: Add EVT GPIO definitions.
Update the puff EC GPIO definitions to include EVT changes. BRANCH=none BUG=b:147983217 TEST=Ran on puff. Change-Id: I9fa911881dfbd705ee8e264d7f55576b45b80893 Signed-off-by: Andrew McRae <amcrae@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2014003 Reviewed-by: Peter Marheine <pmarheine@chromium.org> Commit-Queue: Andrew McRae <amcrae@chromium.org> Tested-by: Andrew McRae <amcrae@chromium.org>
-rw-r--r--board/puff/board.h4
-rw-r--r--board/puff/gpio.inc10
2 files changed, 7 insertions, 7 deletions
diff --git a/board/puff/board.h b/board/puff/board.h
index e07622c762..7d0fdbaefc 100644
--- a/board/puff/board.h
+++ b/board/puff/board.h
@@ -212,10 +212,6 @@
#define PP5000_PGOOD_POWER_SIGNAL_MASK POWER_SIGNAL_MASK(PP5000_A_PGOOD)
-#define CEC_GPIO_OUT GPIO_CEC_OUT
-#define CEC_GPIO_IN GPIO_CEC_IN
-#define CEC_GPIO_PULL_UP GPIO_CEC_PULL_UP
-
#ifndef __ASSEMBLER__
#include "gpio_signal.h"
diff --git a/board/puff/gpio.inc b/board/puff/gpio.inc
index 9897b9acc0..9bc3bafd72 100644
--- a/board/puff/gpio.inc
+++ b/board/puff/gpio.inc
@@ -85,6 +85,13 @@ GPIO(EC_ENTERING_RW, PIN(E, 3), GPIO_OUT_LOW)
GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_ODR_HIGH)
GPIO(EN_PP_MST_OD, PIN(9, 6), GPIO_ODR_HIGH)
+/* HDMI/CEC */
+GPIO(EN_PP5000_HDMI, PIN(5, 0), GPIO_OUT_LOW)
+GPIO(HDMI_CONN0_CEC_OUT, PIN(C, 2), GPIO_ODR_HIGH)
+GPIO(HDMI_CONN0_CEC_IN, PIN(B, 1), GPIO_INPUT)
+GPIO(HDMI_CONN1_CEC_OUT, PIN(6, 0), GPIO_ODR_HIGH)
+GPIO(HDMI_CONN1_CEC_IN, PIN(9, 5), GPIO_INPUT)
+
/* I2C pins - Alternate function below configures I2C module on these pins */
GPIO(I2C0_SCL, PIN(B, 5), GPIO_INPUT) /* EC_I2C_INA_SCL */
GPIO(I2C0_SDA, PIN(B, 4), GPIO_INPUT) /* EC_I2C_INA_SDA */
@@ -142,13 +149,10 @@ UNUSED(PIN(3, 2)) /* E5 NC */
UNUSED(PIN(D, 6)) /* F6 NC */
UNUSED(PIN(3, 5)) /* F5 NC */
UNUSED(PIN(5, 6)) /* M2 NC */
-UNUSED(PIN(5, 0)) /* G4 NC */
UNUSED(PIN(D, 2)) /* C11 NC */
UNUSED(PIN(D, 3)) /* E9 NC */
UNUSED(PIN(8, 6)) /* J8 NC */
UNUSED(PIN(7, 5)) /* J6 NC */
-UNUSED(PIN(C, 2)) /* A12 NC */
-UNUSED(PIN(6, 0)) /* G5 NC */
UNUSED(PIN(9, 3)) /* M11 NC */
UNUSED(PIN(7, 2)) /* H6 NC */
UNUSED(PIN(F, 1)) /* G3 NC */