From dce0ce954fa215bad99f7523e6767eb4cd5f7332 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 17 Jul 2020 11:16:50 -0700 Subject: [PATCH] mb/google/zork: Drop unnecessary PULL_UPs for dalboz reference This change drops internal pulls for dalboz reference configured on pads which already have external pull-ups in hardware. GPIO_0(PWR_BTN_L): Pulled up to PP3300_A GPIO_2(WAKE_L): Pulled up to PP3300_A GPIO_10: Unused. Changed to PAD_NC. GPIO_11(EC_IN_RW_OD): Pulled up to PP3300_A GPIO_12(USI_INT_ODL): Pulled up to PP3300_A GPIO_16(USB_OC0_L): Pulled up to PP3300_A GPIO_17(USB_OC1_L): Pulled up to PP3300_A GPIO_21(EMMC_CMD): Pulled up to PP1800_S0 GPIO_22(EC_FCH_SCI_ODL): Pulled up to PP3300_A GPIO_31(EC_AP_INT_ODL): Pulled up to PP1800_A GPIO_32: Unused. Changed to PAD_NC. GPIO_113(I2C2_SCL): Pulled up to PP3300_S0 GPIO_114(I2C2_SDA): Pulled up to PP3300_S0 GPIO_129(KBRST_L): Pulled up to PP1800_S0 GPIO_92(CLK_REQ0_L): Pulled up to PP3300_S0 GPIO_115(CLK_REQ1_L): Pulled up to PP3300_S0 GPIO_116(CLK_REQ2_L): Pulled up to PP3300_S0 BUG=b:154351731 Change-Id: I62e9dbac7a55efa1e055983a7c126168ee516151 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/43555 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- .../baseboard/gpio_baseboard_dalboz.c | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c index 3f1da0396a..3ab3e10add 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c @@ -10,13 +10,12 @@ #include static const struct soc_amd_gpio gpio_set_stage_ram[] = { - /* PWR_BTN_L */ - PAD_NF(GPIO_0, PWR_BTN_L, PULL_UP), + PAD_NF(GPIO_0, PWR_BTN_L, PULL_NONE), /* SYS_RESET_L */ PAD_NF(GPIO_1, SYS_RESET_L, PULL_NONE), /* PCIE_WAKE_L */ - PAD_NF(GPIO_2, WAKE_L, PULL_UP), + PAD_NF(GPIO_2, WAKE_L, PULL_NONE), /* PEN_DETECT_ODL */ PAD_WAKE(GPIO_4, PULL_NONE, EDGE_HIGH, S3), /* PEN_POWER_EN - Enabled*/ @@ -30,29 +29,29 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = { /* TOUCHPAD_INT_ODL */ PAD_SCI(GPIO_9, PULL_NONE, EDGE_LOW), /* S0iX SLP - (unused - goes to EC & FPMCU */ - PAD_GPI(GPIO_10, PULL_UP), + PAD_NC(GPIO_10), /* EC_IN_RW_OD */ - PAD_GPI(GPIO_11, PULL_UP), + PAD_GPI(GPIO_11, PULL_NONE), /* USI_INT_ODL */ - PAD_GPI(GPIO_12, PULL_UP), - /* DMIC_SEL */ - PAD_NF(GPIO_16, USB_OC0_L, PULL_UP), + PAD_GPI(GPIO_12, PULL_NONE), + /* USB_OC0_L - USB C0/A0 */ + PAD_NF(GPIO_16, USB_OC0_L, PULL_NONE), /* USB_OC1_L - USB C1 */ - PAD_NF(GPIO_17, USB_OC1_L, PULL_UP), + PAD_NF(GPIO_17, USB_OC1_L, PULL_NONE), /* WIFI_DISABLE */ PAD_GPO(GPIO_18, LOW), /* EMMC_CMD */ - PAD_NF(GPIO_21, EMMC_CMD, PULL_UP), + PAD_NF(GPIO_21, EMMC_CMD, PULL_NONE), /* EC_FCH_SCI_ODL */ - PAD_SCI(GPIO_22, PULL_UP, EDGE_LOW), + PAD_SCI(GPIO_22, PULL_NONE, EDGE_LOW), /* AC_PRES */ PAD_NF(GPIO_23, AC_PRES, PULL_UP), /* EC_FCH_WAKE_L */ PAD_SCI(GPIO_24, PULL_NONE, EDGE_LOW), - /* EC_AP_INT_ODL (Sensor Framesync) */ - PAD_GPI(GPIO_31, PULL_UP), - /* */ - PAD_GPI(GPIO_32, PULL_DOWN), + /* EC_AP_INT_ODL (Sensor Framesync) */ + PAD_GPI(GPIO_31, PULL_NONE), + /* TP */ + PAD_NC(GPIO_32), /* DMIC_SEL */ /* * Make sure Ext ROM Sharing is disabled before using this GPIO. Otherwise SPI flash @@ -98,11 +97,11 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = { /* EMMC_DS */ PAD_NF(GPIO_109, EMMC_DS, PULL_NONE), /* I2C2_SCL - USI/Touchpad */ - PAD_NF(GPIO_113, I2C2_SCL, PULL_UP), + PAD_NF(GPIO_113, I2C2_SCL, PULL_NONE), /* I2C2_SDA - USI/Touchpad */ - PAD_NF(GPIO_114, I2C2_SDA, PULL_UP), + PAD_NF(GPIO_114, I2C2_SDA, PULL_NONE), /* KBRST_L */ - PAD_NF(GPIO_129, KBRST_L, PULL_UP), + PAD_NF(GPIO_129, KBRST_L, PULL_NONE), /* RAM ID 0 */ PAD_GPI(GPIO_132, PULL_NONE), /* DEV_BEEP_CODEC_IN (Dev beep Data out) */ @@ -233,11 +232,11 @@ __weak void variant_pcie_gpio_configure(void) /* NVME_AUX_RESET_L */ PAD_GPO(GPIO_40, HIGH), /* CLK_REQ0_L - WIFI */ - PAD_NF(GPIO_92, CLK_REQ0_L, PULL_UP), + PAD_NF(GPIO_92, CLK_REQ0_L, PULL_NONE), /* CLK_REQ1_L - SD Card */ - PAD_NF(GPIO_115, CLK_REQ1_L, PULL_UP), + PAD_NF(GPIO_115, CLK_REQ1_L, PULL_NONE), /* CLK_REQ2_L - NVMe */ - PAD_NF(GPIO_116, CLK_REQ2_L, PULL_UP), + PAD_NF(GPIO_116, CLK_REQ2_L, PULL_NONE), /* SD_AUX_RESET_L */ PAD_GPO(GPIO_142, HIGH), };