From 7571110d785a047cbb3617b0dc034971880d68fd Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 16 Jul 2020 11:26:10 -0700 Subject: mb/google/zork: Drop unnecessary PULL_UPs for trembyle reference This change drops internal pulls for trembyle 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_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 PP3300_A GPIO_22(EC_FCH_SCI_ODL): Pulled up to PP3300_A GPIO_31(EC_AP_INT_ODL): Pulled up to PP1800_A GPIO_90: 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_130(EC_IN_RW_OD): Pulled up to PP3300_S0 GPIO_92(CLK_REQ0_L): Pulled up to PP3300_S0 GPIO_115(CLK_REQ1_L): Pulled up to PP3300_S0 GPIO_132(CLK_REQ4_L): Pulled up to PP3300_S0 BUG=b:154351731 Change-Id: Id84b801e019eede7ef543c24aac968f3ef99b3fd Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/43526 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- .../variants/baseboard/gpio_baseboard_trembyle.c | 35 +++++++++++----------- 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'src/mainboard/google/zork/variants/baseboard') diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c index a998cd710c..c2d290ad91 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.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,31 +29,31 @@ 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), /* FPMCU_RST_L */ PAD_GPO(GPIO_11, HIGH), /* USI_INT_ODL */ - PAD_GPI(GPIO_12, PULL_UP), + PAD_GPI(GPIO_12, PULL_NONE), /* EN_PWR_TOUCHPAD_PS2 */ PAD_GPO(GPIO_13, HIGH), /* BT_DISABLE */ PAD_GPO(GPIO_14, LOW), /* USB_OC0_L - USB C0 + USB A0 */ - PAD_NF(GPIO_16, USB_OC0_L, PULL_UP), + PAD_NF(GPIO_16, USB_OC0_L, PULL_NONE), /* USB_OC1_L - USB C1 + USB A1 */ - 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_31, PULL_NONE), /* EN_PWR_FP */ PAD_GPO(GPIO_32, HIGH), /* DMIC SEL */ @@ -84,7 +83,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = { /* EN_DEV_BEEP_L */ PAD_GPO(GPIO_89, HIGH), /* Testpoint */ - PAD_GPI(GPIO_90, PULL_UP), + PAD_NC(GPIO_90), /* EN_SPKR TODO: Verify driver enables this (add to ACPI) */ PAD_GPO(GPIO_91, LOW), /* EMMC_DATA0 */ @@ -98,13 +97,13 @@ 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), /* EC_IN_RW_OD */ - PAD_GPI(GPIO_130, PULL_UP), + PAD_GPI(GPIO_130, PULL_NONE), /* DEV_BEEP_CODEC_IN (Dev beep Data out) */ PAD_GPI(GPIO_135, PULL_NONE), /* BIOS_FLASH_WP_ODL */ @@ -229,11 +228,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_REQ4_L - SSD */ - PAD_NF(GPIO_132, CLK_REQ4_L, PULL_UP), + PAD_NF(GPIO_132, CLK_REQ4_L, PULL_NONE), /* SD_AUX_RESET_L */ PAD_GPO(GPIO_142, HIGH), }; -- cgit v1.2.3