summaryrefslogtreecommitdiff
path: root/src/mainboard/google/brya
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google/brya')
-rw-r--r--src/mainboard/google/brya/variants/xivu/gpio.c14
-rw-r--r--src/mainboard/google/brya/variants/xivu/overridetree.cb6
2 files changed, 18 insertions, 2 deletions
diff --git a/src/mainboard/google/brya/variants/xivu/gpio.c b/src/mainboard/google/brya/variants/xivu/gpio.c
index 72526e41a1..12fb39d59f 100644
--- a/src/mainboard/google/brya/variants/xivu/gpio.c
+++ b/src/mainboard/google/brya/variants/xivu/gpio.c
@@ -13,6 +13,18 @@ static const struct pad_config override_gpio_table[] = {
PAD_NC(GPP_E20, NONE),
/* E21 : DDP2_CTRLDATA ==> NC */
PAD_NC(GPP_E21, NONE),
+ /* F0 : CNV_BRI_DT ==> NC*/
+ PAD_NC(GPP_F0, NONE),
+ /* F1 : CNV_BRI_RSP ==> NC */
+ PAD_NC(GPP_F1, NONE),
+ /* F2 : CNV_RGI_DT ==> NC */
+ PAD_NC(GPP_F2, NONE),
+ /* F3 : CNV_RGI_RSP ==> NC */
+ PAD_NC(GPP_F3, NONE),
+ /* F4 : CNV_RF_RESET# ==> NC */
+ PAD_NC(GPP_F4, NONE),
+ /* F5 : CRF_XTAL_CLKREQ ==> NC */
+ PAD_NC(GPP_F5, NONE),
};
/* Early pad configuration in bootblock */
@@ -35,8 +47,6 @@ static const struct pad_config early_gpio_table[] = {
PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),
/* H11 : UART0_TXD ==> UART_SOC_TX_DBG_RX */
PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),
- /* B11 : PMCALERT# ==> EN_PP3300_WLAN_X */
- PAD_CFG_GPO(GPP_B11, 1, DEEP),
/* H13 : UART0_CTS# ==> EN_PP3300_SD_X */
PAD_CFG_GPO(GPP_H13, 1, DEEP),
};
diff --git a/src/mainboard/google/brya/variants/xivu/overridetree.cb b/src/mainboard/google/brya/variants/xivu/overridetree.cb
index 1df43a3983..609f468f73 100644
--- a/src/mainboard/google/brya/variants/xivu/overridetree.cb
+++ b/src/mainboard/google/brya/variants/xivu/overridetree.cb
@@ -12,6 +12,9 @@ end
chip soc/intel/alderlake
register "sagv" = "SaGv_Enabled"
+ # Disable CNVi BT
+ register "cnvi_bt_core" = "false"
+
# SOC Aux orientation override:
# This is a bitfield that corresponds to up to 4 TCSS ports.
# Bits (0,1) allocated for TCSS Port1 configuration and Bits (2,3)for TCSS Port2.
@@ -209,6 +212,9 @@ chip soc/intel/alderlake
device pci 00.0 on end
end
end
+
+ device ref cnvi_wifi off end
+
device ref pch_espi on
chip ec/google/chromeec
use conn0 as mux_conn[0]