diff options
author | Kevin K Wong <kevin.k.wong@intel.com> | 2015-05-20 19:12:37 -0700 |
---|---|---|
committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-27 21:30:30 +0000 |
commit | dc065dcb318fcdb2683eac76326d4e6dca94139d (patch) | |
tree | 3a8ff2c33fa4e29dc7f84d03e73624234830dc00 | |
parent | 245ee9f8d97e9eea8b99ab3c56ac8249cc256fec (diff) | |
download | chrome-ec-dc065dcb318fcdb2683eac76326d4e6dca94139d.tar.gz |
strago: Added board version support.
BUG=none
TEST=Verified correct board version is returned via "version" console command.
BRANCH=none
Change-Id: I85a21fc7afe5fb918541e3196ce5a8bd24b09b7d
Signed-off-by: Kevin K Wong <kevin.k.wong@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/272986
Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r-- | board/strago/board.h | 2 | ||||
-rw-r--r-- | board/strago/gpio.inc | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/board/strago/board.h b/board/strago/board.h index 45d49ddf0c..36ef364d91 100644 --- a/board/strago/board.h +++ b/board/strago/board.h @@ -15,6 +15,8 @@ #define CONFIG_CHIPSET_BRASWELL #define CONFIG_SCI_GPIO GPIO_PCH_SCI_L +#define CONFIG_BOARD_VERSION + #define CONFIG_KEYBOARD_COL2_INVERTED #define CONFIG_KEYBOARD_IRQ_GPIO GPIO_KBD_IRQ_L #undef CONFIG_KEYBOARD_KSO_BASE diff --git a/board/strago/gpio.inc b/board/strago/gpio.inc index 80482d5171..5b1059f365 100644 --- a/board/strago/gpio.inc +++ b/board/strago/gpio.inc @@ -16,10 +16,9 @@ GPIO_INT(PCH_SLP_S3_L, PIN(206), GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, GPIO(KBD_KSO2, PIN(1), GPIO_KB_OUTPUT_COL2) /* Negative edge triggered irq. */ GPIO(USB_ILIM_SEL, PIN(13), GPIO_OUT_HIGH) /* USB current control */ - GPIO(I2C_PORT0_SCL, PIN(15), GPIO_ODR_HIGH) GPIO(I2C_PORT0_SDA, PIN(16), GPIO_ODR_HIGH) -GPIO(BOARD_ID2, PIN(17), GPIO_INPUT | GPIO_PULL_UP) /* NC */ +GPIO(BOARD_VERSION3, PIN(17), GPIO_INPUT) /* BOARD_ID2 */ GPIO(I2C_PORT1_SCL, PIN(22), GPIO_ODR_HIGH) GPIO(I2C_PORT1_SDA, PIN(23), GPIO_ODR_HIGH) GPIO(I2C_PORT2_SCL, PIN(20), GPIO_ODR_HIGH) @@ -66,7 +65,7 @@ GPIO(PERICOM_INT, PIN(124), GPIO_INT_BOTH) /* */ GPIO(GYRO_INT2, PIN(127), GPIO_INT_FALLING) /* Gyro sensor interrupt 2 to EC */ GPIO(EC_PLUG_DETECT, PIN(132), GPIO_INT_BOTH) -GPIO(BOARD_ID1, PIN(154), GPIO_INPUT | GPIO_PULL_UP) /* Board Id 1 */ +GPIO(BOARD_VERSION2, PIN(134), GPIO_INPUT) /* BOARD_ID1 */ GPIO(NC_135, PIN(135), GPIO_INPUT | GPIO_PULL_UP) /* NC */ GPIO(THERMAL_PROBE_EN_L,PIN(140), GPIO_OUT_HIGH) @@ -78,7 +77,7 @@ GPIO(ALS_INT, PIN(147), GPIO_INT_FALLING) /* ALS sensor i GPIO(WLAN_OFF_L, PIN(150), GPIO_ODR_HIGH) /* Wireless LAN */ GPIO(CPU_PROCHOT, PIN(151), GPIO_OUT_LOW) GPIO(KBD_IRQ_L, PIN(152), GPIO_ODR_HIGH) /* Negative edge triggered irq. */ -GPIO(BOARD_ID0, PIN(154), GPIO_INPUT | GPIO_PULL_UP) /* NC */ +GPIO(BOARD_VERSION1, PIN(154), GPIO_INPUT) /* BOARD_ID0 */ GPIO(CORE_PWROK, PIN(155), GPIO_ODR_HIGH) /* CORE_PWR_OK_R */ GPIO(LID_OPEN2, PIN(156), GPIO_INT_BOTH_DSLEEP) /* LID_OPEN_OUT2_R */ GPIO(PCH_SUSPWRDNACK, PIN(157), GPIO_INT_FALLING) /* PMC SUSPWRDNACK signal from SOC to EC */ |