From ce12536c6926a1ae9bbb3cc2f8dfb69e4c66ceda Mon Sep 17 00:00:00 2001 From: Aseda Aboagye Date: Mon, 24 Jul 2017 15:36:51 -0700 Subject: [PATCH] zoombini: Add board ID GPIOs. This commit adds the GPIOs for determining the GPIOs. Additionally, this adds some alternate functions for the PWM and ADC pins. BUG=b:63508740 BRANCH=None TEST=Flash modified version on EVB and verify that it boots without any panics or assertions. Change-Id: I34161ad075ad88f940a21c2ee94219ea6a878d63 Signed-off-by: Aseda Aboagye Reviewed-on: https://chromium-review.googlesource.com/584052 Commit-Ready: Aseda Aboagye Tested-by: Aseda Aboagye Reviewed-by: Mulin Chao Reviewed-by: Shawn N --- board/zoombini/board.h | 2 ++ board/zoombini/gpio.inc | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/board/zoombini/board.h b/board/zoombini/board.h index 4a2447c1e5..0fffcb3ad0 100644 --- a/board/zoombini/board.h +++ b/board/zoombini/board.h @@ -32,6 +32,8 @@ #define CONFIG_BATTERY_SMART #define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_PRESENT_L +#define CONFIG_BOARD_VERSION + #define CONFIG_CHARGER #define CONFIG_CHARGER_V2 #define CONFIG_CHARGE_MANAGER diff --git a/board/zoombini/gpio.inc b/board/zoombini/gpio.inc index 882234eba2..b0b5ec6170 100644 --- a/board/zoombini/gpio.inc +++ b/board/zoombini/gpio.inc @@ -70,6 +70,10 @@ GPIO(USB_C0_CHARGE_EN_L, PIN(0, 3), GPIO_OUT_LOW) GPIO(USB_C1_CHARGE_EN_L, PIN(0, 4), GPIO_OUT_LOW) GPIO(USB_C2_CHARGE_EN_L, PIN(4, 0), GPIO_OUT_LOW) +GPIO(BOARD_VERSION1, PIN(9, 6), GPIO_INPUT) +GPIO(BOARD_VERSION2, PIN(9, 3), GPIO_INPUT) +GPIO(BOARD_VERSION3, PIN(F, 0), GPIO_INPUT) + /* UART Pins */ ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, GPIO_PULL_UP) /* I2C Ports */ @@ -92,3 +96,9 @@ GPIO(KBD_KSO2, PIN(1, 7), GPIO_ODR_LOW) ALTERNATE(PIN_MASK(1, 0x7F), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_10-12 */ ALTERNATE(PIN_MASK(0, 0xE0), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) + +/* PWMs. */ +ALTERNATE(PIN_MASK(C, 0x18), 1, MODULE_PWM, 0) /* LED 1 & 2 */ +ALTERNATE(PIN_MASK(8, 0x01), 1, MODULE_PWM, 0) /* KB Backlight */ +/* ADC */ +ALTERNATE(PIN_MASK(4, 0x30), 1, MODULE_ADC, 0) /* ADC0-1 */