summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorFrank Wu <frank_wu@compal.corp-partner.google.com>2020-08-11 16:04:45 +0800
committerTim Wawrzynczak <twawrzynczak@chromium.org>2020-08-12 19:42:48 +0000
commit1d7ba15aa2e3a3ee9130101977405ef866bd7f79 (patch)
tree4415c24df0319fa9a145897bbbac5fa569adde1a /src/mainboard
parente915cfc0d8b803a9034a4d7e3fb4d8ca76556ab3 (diff)
mb/google/volteer/halvor: Update settings for WiFi/BT functions
Configure gpio/overridetree settings for WiFi/BT functions. Then WiFi/BT functions are enabled on Halvor. BUG=b:153680359, b:163004808 TEST=FW_NAME=halvor emerge-volteer coreboot chromeos-bootimage Verify that WiFi/BT can scan devices successfully. Signed-off-by: Frank Wu <frank_wu@compal.corp-partner.google.com> Change-Id: I085b192bb768c2c1238f3f857d315502ac10857e Reviewed-on: https://review.coreboot.org/c/coreboot/+/44372 Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com> Reviewed-by: Caveh Jalali <caveh@chromium.org> Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/volteer/variants/halvor/gpio.c4
-rw-r--r--src/mainboard/google/volteer/variants/halvor/overridetree.cb2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mainboard/google/volteer/variants/halvor/gpio.c b/src/mainboard/google/volteer/variants/halvor/gpio.c
index 2a986882e6..1cbe62d9ad 100644
--- a/src/mainboard/google/volteer/variants/halvor/gpio.c
+++ b/src/mainboard/google/volteer/variants/halvor/gpio.c
@@ -23,6 +23,8 @@ static const struct pad_config gpio_table[] = {
PAD_CFG_NF(GPP_A9, NONE, DEEP, NF1),
/* A10 : I2S2_RXD ==> I2S1_RXD */
PAD_CFG_NF(GPP_A10, NONE, DEEP, NF1),
+ /* A13 : PMC_I2C_SCL ==> BT_DISABLE_L */
+ PAD_CFG_GPO(GPP_A13, 1, DEEP),
/* A18 : DDSP_HPDB ==> NC */
PAD_NC(GPP_A18, NONE),
/* A22 : DDPC_CTRLDATA ==> NC */
@@ -96,6 +98,8 @@ static const struct pad_config gpio_table[] = {
PAD_NC(GPP_F11, NONE),
/* F12 : GSXDOUT ==> EN_PP3300_TRACKPAD */
PAD_CFG_GPO(GPP_F12, 1, DEEP),
+ /* F13 : GSXDOUT ==> WiFi_DISABLE_L */
+ PAD_CFG_GPO(GPP_F13, 1, DEEP),
/* F14 : GSXDIN ==> NC */
PAD_NC(GPP_F14, NONE),
/* F15 : GSXSRESET# ==> NC */
diff --git a/src/mainboard/google/volteer/variants/halvor/overridetree.cb b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
index 12e059c100..c6ac1b7173 100644
--- a/src/mainboard/google/volteer/variants/halvor/overridetree.cb
+++ b/src/mainboard/google/volteer/variants/halvor/overridetree.cb
@@ -8,7 +8,7 @@ chip soc/intel/tigerlake
register "usb2_ports[6]" = "USB2_PORT_EMPTY" # Type-A / Type-C Not Used
register "usb2_ports[7]" = "USB2_PORT_EMPTY" # Type-A / Type-C Not Used
register "usb2_ports[8]" = "USB2_PORT_EMPTY" # Type-A / Type-C Not Used
- register "usb2_ports[9]" = "USB2_PORT_EMPTY" # Type-A / Type-C Not Used
+ register "usb2_ports[9]" = "USB2_PORT_MID(OC_SKIP)" # Reserve for CNVi BT
register "usb3_ports[0]" = "USB3_PORT_DEFAULT(OC0)" # Type-A / Type-C Port 0
register "usb3_ports[1]" = "USB3_PORT_DEFAULT(OC1)" # Type-A / Type-C Port 1