summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/gale/boardid.c3
-rw-r--r--src/mainboard/google/gale/chromeos.c7
-rw-r--r--src/soc/qualcomm/ipq40xx/include/soc/cdp.h3
3 files changed, 9 insertions, 4 deletions
diff --git a/src/mainboard/google/gale/boardid.c b/src/mainboard/google/gale/boardid.c
index 3e6fd8a185..c8d42a9fda 100644
--- a/src/mainboard/google/gale/boardid.c
+++ b/src/mainboard/google/gale/boardid.c
@@ -30,7 +30,8 @@ static uint8_t get_board_id(void)
uint8_t bid;
gpio_t hw_rev_gpios[] = {[2] = 66, [1] = 65, [0] = 64}; /* 64 is LSB */
- bid = gpio_base3_value(hw_rev_gpios, ARRAY_SIZE(hw_rev_gpios));
+ bid = gpio_binary_first_base3_value(hw_rev_gpios,
+ ARRAY_SIZE(hw_rev_gpios));
printk(BIOS_INFO, "Board ID %d\n", bid);
return bid;
diff --git a/src/mainboard/google/gale/chromeos.c b/src/mainboard/google/gale/chromeos.c
index 01f1e03d9b..92a16b1cbe 100644
--- a/src/mainboard/google/gale/chromeos.c
+++ b/src/mainboard/google/gale/chromeos.c
@@ -33,10 +33,12 @@
static int get_rec_sw_gpio_pin(void)
{
uint8_t board_rev = board_id();
+
switch (board_rev) {
case BOARD_ID_GALE_PROTO:
case BOARD_ID_GALE_EVT:
- case BOARD_ID_GALE_EVT2:
+ case BOARD_ID_GALE_EVT2_0:
+ case BOARD_ID_GALE_EVT2_1:
return 7;
case BOARD_ID_GALE_EVT3:
default:
@@ -50,7 +52,8 @@ static int get_wp_status_gpio_pin(void)
switch (board_rev) {
case BOARD_ID_GALE_PROTO:
case BOARD_ID_GALE_EVT:
- case BOARD_ID_GALE_EVT2:
+ case BOARD_ID_GALE_EVT2_0:
+ case BOARD_ID_GALE_EVT2_1:
return 6;
case BOARD_ID_GALE_EVT3:
default:
diff --git a/src/soc/qualcomm/ipq40xx/include/soc/cdp.h b/src/soc/qualcomm/ipq40xx/include/soc/cdp.h
index 1b21273f36..1fa9fc45e3 100644
--- a/src/soc/qualcomm/ipq40xx/include/soc/cdp.h
+++ b/src/soc/qualcomm/ipq40xx/include/soc/cdp.h
@@ -136,7 +136,8 @@ typedef struct {
enum gale_board_id {
BOARD_ID_GALE_PROTO = 0,
BOARD_ID_GALE_EVT = 1,
- BOARD_ID_GALE_EVT2 = 2,
+ BOARD_ID_GALE_EVT2_0 = 2,
+ BOARD_ID_GALE_EVT2_1 = 6,
BOARD_ID_GALE_EVT3 = 5,
};