From 0be219558010b9d00b8d45048046f7340d4fd086 Mon Sep 17 00:00:00 2001 From: Jonathan Brandmeyer Date: Mon, 30 Jul 2018 14:05:58 -0600 Subject: grunt family: Provide pu/pd for port 1 BC1.2 Port 1 is provided by a daughterboard. In the event that the daughterboard is disconnected, these pins are floating. Pull them in the appropriate direction for their logic when the board is disconnected. BUG=b:111942717 BRANCH=none TEST=make -j buildall; Test startup on Careena hardware both with and without port 1 connected to the mainboard. Signed-off-by: Jonathan Brandmeyer Change-Id: Ica06ea16c2c76c624c542ba9b803197a4fd852bd Reviewed-on: https://chromium-review.googlesource.com/1155713 Commit-Ready: Jonathan Brandmeyer Tested-by: Jonathan Brandmeyer Reviewed-by: Edward Hill --- board/aleena/gpio.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'board/aleena/gpio.inc') diff --git a/board/aleena/gpio.inc b/board/aleena/gpio.inc index 344d2d6774..9d7799ab8a 100644 --- a/board/aleena/gpio.inc +++ b/board/aleena/gpio.inc @@ -74,9 +74,9 @@ GPIO(USB_C1_OC_L, PIN(7, 2), GPIO_OUT_HIGH) /* C1 Over Current */ GPIO(USB_C0_PD_RST_L, PIN(3, 2), GPIO_OUT_HIGH) /* C0 PD Reset */ GPIO(USB_C1_PD_RST_L, PIN(D, 5), GPIO_OUT_HIGH) /* C1 PD Reset */ GPIO(USB_C0_BC12_VBUS_ON_L, PIN(4, 0), GPIO_ODR_HIGH) /* C0 BC1.2 Power */ -GPIO(USB_C1_BC12_VBUS_ON_L, PIN(B, 1), GPIO_ODR_HIGH) /* C1 BC1.2 Power */ +GPIO(USB_C1_BC12_VBUS_ON_L, PIN(B, 1), GPIO_ODR_HIGH | GPIO_PULL_UP) /* C1 BC1.2 Power */ GPIO(USB_C0_BC12_CHG_DET, PIN(6, 2), GPIO_INPUT) /* C0 BC1.2 Detect */ -GPIO(USB_C1_BC12_CHG_DET, PIN(8, 3), GPIO_INPUT) /* C1 BC1.2 Detect */ +GPIO(USB_C1_BC12_CHG_DET, PIN(8, 3), GPIO_INPUT | GPIO_PULL_DOWN) /* C1 BC1.2 Detect */ GPIO(USB_C0_DP_HPD, PIN(9, 5), GPIO_OUT_LOW) /* C0 DP Hotplug Detect */ GPIO(USB_C1_DP_HPD, PIN(9, 6), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */ -- cgit v1.2.1