summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorRob Barnes <robbarnes@google.com>2021-06-21 16:59:21 -0600
committerCommit Bot <commit-bot@chromium.org>2021-07-02 01:02:08 +0000
commit9684fadcc059f4644dd5932acf125e94d9f0e55e (patch)
tree1436c8f2517101314279ee09cc4d4d8d327558d1 /board
parent9a909e15a7f1e1ddba969af4af6b3a800d042590 (diff)
downloadchrome-ec-9684fadcc059f4644dd5932acf125e94d9f0e55e.tar.gz
dedede: Enable CONFIG_ASSERT_CCD_MODE_ON_DTS_CONNECT
Enable CONFIG_ASSERT_CCD_MODE_ON_DTS_CONNECT on all dedede boards. This will assert GPIO_CCD_MODE_ODL when a debug device is connected to a CCD port. GPIO_CCD_MODE_ODL must be configured as an open drain so EC and Cr50 don't drive fight. BUG=b:190189242 TEST=Build dedede BRANCH=None Change-Id: I2d71312967f2d4a693ac9753279f49478e8c092c Signed-off-by: Rob Barnes <robbarnes@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2976759 Reviewed-by: Diana Z <dzigterman@chromium.org> Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> Tested-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/blipper/gpio.inc2
-rw-r--r--board/boten/gpio.inc2
-rw-r--r--board/cret/gpio.inc2
-rw-r--r--board/drawcia/gpio.inc2
-rw-r--r--board/galtic/gpio.inc2
-rw-r--r--board/kracko/gpio.inc2
-rw-r--r--board/lantis/gpio.inc2
-rw-r--r--board/madoo/gpio.inc2
-rw-r--r--board/magolor/gpio.inc2
-rw-r--r--board/metaknight/gpio.inc2
-rw-r--r--board/pirika/gpio.inc2
-rw-r--r--board/sasuke/gpio.inc2
-rw-r--r--board/sasukette/gpio.inc2
-rw-r--r--board/storo/gpio.inc2
-rw-r--r--board/waddledee/gpio.inc2
-rw-r--r--board/waddledoo/gpio.inc2
-rw-r--r--board/wheelie/gpio.inc2
17 files changed, 17 insertions, 17 deletions
diff --git a/board/blipper/gpio.inc b/board/blipper/gpio.inc
index c536d55537..516fcdcf61 100644
--- a/board/blipper/gpio.inc
+++ b/board/blipper/gpio.inc
@@ -90,7 +90,7 @@ GPIO(EC_AP_MKBP_INT_L, PIN(L, 5), GPIO_ODR_HIGH)
GPIO(EN_BL_OD, PIN(K, 4), GPIO_ODR_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
GPIO(EC_ENTERING_RW2, PIN(C, 7), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO(ECH1_PACKET_MODE, PIN(H, 1), GPIO_OUT_LOW)
diff --git a/board/boten/gpio.inc b/board/boten/gpio.inc
index afd17c3da0..4e8290c277 100644
--- a/board/boten/gpio.inc
+++ b/board/boten/gpio.inc
@@ -95,7 +95,7 @@ GPIO(EC_AP_MKBP_INT_L, PIN(L, 5), GPIO_ODR_HIGH)
GPIO(EN_BL_OD, PIN(K, 4), GPIO_ODR_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
GPIO(EC_ENTERING_RW2, PIN(C, 7), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO_INT(PEN_DET_ODL, PIN(J, 1), GPIO_INT_BOTH | GPIO_PULL_UP, pen_detect_interrupt)
GPIO(EN_PP5000_PEN, PIN(B, 5), GPIO_OUT_LOW)
diff --git a/board/cret/gpio.inc b/board/cret/gpio.inc
index 3686fa3ec3..352f689620 100644
--- a/board/cret/gpio.inc
+++ b/board/cret/gpio.inc
@@ -79,7 +79,7 @@ GPIO(EC_PROCHOT_ODL, PIN(F, 1), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
GPIO(EC_ENTERING_RW, PIN(E, 3), GPIO_OUT_LOW)
GPIO(ALL_SYS_PWRGD, PIN(A, 0), GPIO_OUT_LOW)
GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH)
-GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_ODR_HIGH)
GPIO(USB_C0_RST_ODL, PIN(9, 7), GPIO_OUT_HIGH) /* currently unused */
GPIO(EC_AP_USB_C1_HDMI_HPD, PIN(9, 6), GPIO_OUT_LOW)
diff --git a/board/drawcia/gpio.inc b/board/drawcia/gpio.inc
index 890b6ee9e4..2bfbb9c91b 100644
--- a/board/drawcia/gpio.inc
+++ b/board/drawcia/gpio.inc
@@ -99,7 +99,7 @@ GPIO(EC_SUB_IO_2_1, PIN(F, 1), GPIO_INPUT)
GPIO(EN_BL_OD, PIN(K, 4), GPIO_ODR_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
GPIO(EC_ENTERING_RW2, PIN(C, 7), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO(EN_KB_BL, PIN(J, 3), GPIO_OUT_LOW) /* Currently unused */
GPIO(ECH1_PACKET_MODE, PIN(H, 1), GPIO_OUT_LOW)
diff --git a/board/galtic/gpio.inc b/board/galtic/gpio.inc
index 5a25121b6f..fe484c7f38 100644
--- a/board/galtic/gpio.inc
+++ b/board/galtic/gpio.inc
@@ -92,7 +92,7 @@ GPIO(EC_AP_MKBP_INT_L, PIN(L, 5), GPIO_ODR_HIGH)
GPIO(EN_BL_OD, PIN(K, 4), GPIO_ODR_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
GPIO(EC_ENTERING_RW2, PIN(C, 7), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO(ECH1_PACKET_MODE, PIN(H, 1), GPIO_OUT_LOW)
diff --git a/board/kracko/gpio.inc b/board/kracko/gpio.inc
index dda9301ddf..cdcf8834c7 100644
--- a/board/kracko/gpio.inc
+++ b/board/kracko/gpio.inc
@@ -99,7 +99,7 @@ GPIO(EC_SUB_IO_2_1, PIN(F, 1), GPIO_INPUT)
GPIO(EN_BL_OD, PIN(K, 4), GPIO_ODR_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
GPIO(EC_ENTERING_RW2, PIN(C, 7), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO(EN_KB_BL, PIN(J, 3), GPIO_OUT_LOW) /* Currently unused */
GPIO(ECH1_PACKET_MODE, PIN(H, 1), GPIO_OUT_LOW)
diff --git a/board/lantis/gpio.inc b/board/lantis/gpio.inc
index 18464f817f..c24e20d5ec 100644
--- a/board/lantis/gpio.inc
+++ b/board/lantis/gpio.inc
@@ -95,7 +95,7 @@ GPIO(EC_AP_MKBP_INT_L, PIN(L, 5), GPIO_ODR_HIGH)
GPIO(EN_BL_OD, PIN(K, 4), GPIO_ODR_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
GPIO(EC_ENTERING_RW2, PIN(C, 7), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO(EN_KB_BL, PIN(J, 3), GPIO_OUT_LOW) /* Currently unused */
GPIO(ECH1_PACKET_MODE, PIN(H, 1), GPIO_OUT_LOW)
diff --git a/board/madoo/gpio.inc b/board/madoo/gpio.inc
index 80ff8c6ec5..b26c7814ce 100644
--- a/board/madoo/gpio.inc
+++ b/board/madoo/gpio.inc
@@ -80,7 +80,7 @@ GPIO(EC_PROCHOT_ODL, PIN(F, 1), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
GPIO(EC_ENTERING_RW, PIN(E, 3), GPIO_OUT_LOW)
GPIO(ALL_SYS_PWRGD, PIN(A, 0), GPIO_OUT_LOW)
GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH)
-GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_ODR_HIGH)
GPIO(USB_C0_RST_ODL, PIN(9, 7), GPIO_OUT_HIGH) /* currently unused */
GPIO(EC_AP_USB_C1_HDMI_HPD, PIN(9, 6), GPIO_OUT_LOW)
diff --git a/board/magolor/gpio.inc b/board/magolor/gpio.inc
index 2dd2f70b34..b7b692ca56 100644
--- a/board/magolor/gpio.inc
+++ b/board/magolor/gpio.inc
@@ -86,7 +86,7 @@ GPIO(EC_PROCHOT_ODL, PIN(F, 1), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
GPIO(EC_ENTERING_RW, PIN(E, 3), GPIO_OUT_LOW)
GPIO(ALL_SYS_PWRGD, PIN(A, 0), GPIO_OUT_LOW)
GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH)
-GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_ODR_HIGH)
/* USB pins */
GPIO(USB_C0_RST_ODL, PIN(9, 7), GPIO_OUT_HIGH) /* currently unused */
diff --git a/board/metaknight/gpio.inc b/board/metaknight/gpio.inc
index 6b88bf8f16..dee2e2dadf 100644
--- a/board/metaknight/gpio.inc
+++ b/board/metaknight/gpio.inc
@@ -83,7 +83,7 @@ GPIO(EC_PROCHOT_ODL, PIN(F, 1), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
GPIO(EC_ENTERING_RW, PIN(E, 3), GPIO_OUT_LOW)
GPIO(ALL_SYS_PWRGD, PIN(A, 0), GPIO_OUT_LOW)
GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH)
-GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_ODR_HIGH)
/* USB pins */
GPIO(USB_C0_RST_ODL, PIN(9, 7), GPIO_OUT_HIGH) /* currently unused */
diff --git a/board/pirika/gpio.inc b/board/pirika/gpio.inc
index e5b5f1543f..90e6de2607 100644
--- a/board/pirika/gpio.inc
+++ b/board/pirika/gpio.inc
@@ -92,7 +92,7 @@ GPIO(EC_AP_MKBP_INT_L, PIN(L, 5), GPIO_ODR_HIGH)
GPIO(EN_BL_OD, PIN(K, 4), GPIO_ODR_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
GPIO(EC_ENTERING_RW2, PIN(C, 7), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO(ECH1_PACKET_MODE, PIN(H, 1), GPIO_OUT_LOW)
diff --git a/board/sasuke/gpio.inc b/board/sasuke/gpio.inc
index d91becc5be..4b970f9798 100644
--- a/board/sasuke/gpio.inc
+++ b/board/sasuke/gpio.inc
@@ -80,7 +80,7 @@ GPIO(EC_PROCHOT_ODL, PIN(F, 1), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
GPIO(EC_ENTERING_RW, PIN(E, 3), GPIO_OUT_LOW)
GPIO(ALL_SYS_PWRGD, PIN(A, 0), GPIO_OUT_LOW)
GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH)
-GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_ODR_HIGH)
GPIO(EN_USB_A0_5V_SUB, PIN(9, 7), GPIO_OUT_LOW) /* Don't limit USB-A charging by default - all ports */
GPIO(EN_USB_A0_VBUS, PIN(4, 1), GPIO_OUT_LOW) /* Enable USB-A charging - all ports */
diff --git a/board/sasukette/gpio.inc b/board/sasukette/gpio.inc
index 6ac429dc2c..396a5595fa 100644
--- a/board/sasukette/gpio.inc
+++ b/board/sasukette/gpio.inc
@@ -80,7 +80,7 @@ GPIO(EC_AP_MKBP_INT_L, PIN(L, 5), GPIO_ODR_HIGH)
GPIO(EN_BL_OD, PIN(K, 4), GPIO_ODR_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
GPIO(EC_ENTERING_RW2, PIN(C, 7), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO(ECH1_PACKET_MODE, PIN(H, 1), GPIO_OUT_LOW)
GPIO(LTE_EN, PIN(C, 3), GPIO_OUT_LOW)
diff --git a/board/storo/gpio.inc b/board/storo/gpio.inc
index 74e7350b28..b7541c5259 100644
--- a/board/storo/gpio.inc
+++ b/board/storo/gpio.inc
@@ -90,7 +90,7 @@ GPIO(EC_AP_MKBP_INT_L, PIN(L, 5), GPIO_ODR_HIGH)
GPIO(EN_BL_OD, PIN(K, 4), GPIO_ODR_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
GPIO(EC_ENTERING_RW2, PIN(C, 7), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO(EN_PP3300_PEN, PIN(B, 5), GPIO_OUT_LOW)
GPIO(ECH1_PACKET_MODE, PIN(H, 1), GPIO_OUT_LOW)
diff --git a/board/waddledee/gpio.inc b/board/waddledee/gpio.inc
index c37959dc16..63e0055199 100644
--- a/board/waddledee/gpio.inc
+++ b/board/waddledee/gpio.inc
@@ -100,7 +100,7 @@ GPIO(EC_SUB_IO_2_2, PIN(L, 2), GPIO_INPUT)
/* Misc */
GPIO(EN_BL_OD, PIN(K, 4), GPIO_ODR_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO(PEN_DET_ODL, PIN(J, 1), GPIO_INPUT | GPIO_PULL_UP)
GPIO(EN_KB_BL, PIN(J, 3), GPIO_OUT_LOW) /* Currently unused */
diff --git a/board/waddledoo/gpio.inc b/board/waddledoo/gpio.inc
index e6bc32af1e..69f6bc6307 100644
--- a/board/waddledoo/gpio.inc
+++ b/board/waddledoo/gpio.inc
@@ -83,7 +83,7 @@ GPIO(EC_PROCHOT_ODL, PIN(F, 1), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
GPIO(EC_ENTERING_RW, PIN(E, 3), GPIO_OUT_LOW)
GPIO(ALL_SYS_PWRGD, PIN(A, 0), GPIO_OUT_LOW)
GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH)
-GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(E, 5), GPIO_ODR_HIGH)
GPIO(USB_C0_RST_ODL, PIN(9, 7), GPIO_OUT_HIGH) /* currently unused */
GPIO(EC_AP_USB_C1_HDMI_HPD, PIN(9, 6), GPIO_OUT_LOW)
diff --git a/board/wheelie/gpio.inc b/board/wheelie/gpio.inc
index ba47baaa86..8979ca6ab9 100644
--- a/board/wheelie/gpio.inc
+++ b/board/wheelie/gpio.inc
@@ -100,7 +100,7 @@ GPIO(EC_SUB_IO_2_2, PIN(L, 2), GPIO_INPUT)
/* Misc */
GPIO(EN_BL_OD, PIN(K, 4), GPIO_OUT_LOW)
GPIO(EC_ENTERING_RW, PIN(G, 0), GPIO_OUT_LOW)
-GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_INPUT)
+GPIO(CCD_MODE_ODL, PIN(H, 5), GPIO_ODR_HIGH)
GPIO(EC_BATTERY_PRES_ODL, PIN(I, 4), GPIO_INPUT)
GPIO(PEN_DET_ODL, PIN(J, 1), GPIO_INPUT | GPIO_PULL_UP)
GPIO(EN_KB_BL, PIN(J, 3), GPIO_OUT_LOW) /* Currently unused */
View Lorry Controller Status