From d678f655647f9f378eea35e116e97df12d2cc020 Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Mon, 26 Jul 2021 16:23:14 -0600 Subject: [PATCH] Revert "mb/google/dedede: Program VCCIO selection for EN_SPKR GPIO" This reverts commit ce79ceec86a38145b3a27aa4c78cf83a76cd51d0. This has introduced a regression in mainboards using JSL SoC such that it overrides the soft straps for all the GPIOs. This in turn has led to some of the peripherals not working. Change-Id: Ifea5d4d0f474873f8bf4818ec1986e534f455216 Signed-off-by: Karthikeyan Ramasubramanian Reviewed-on: https://review.coreboot.org/c/coreboot/+/56615 Reviewed-by: Evan Green Reviewed-by: Furquan Shaikh Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) --- src/mainboard/google/dedede/Makefile.inc | 1 - src/mainboard/google/dedede/fw_config.c | 17 ----------------- 2 files changed, 18 deletions(-) delete mode 100644 src/mainboard/google/dedede/fw_config.c diff --git a/src/mainboard/google/dedede/Makefile.inc b/src/mainboard/google/dedede/Makefile.inc index cc815d857b..1b5503d40f 100644 --- a/src/mainboard/google/dedede/Makefile.inc +++ b/src/mainboard/google/dedede/Makefile.inc @@ -9,7 +9,6 @@ ramstage-$(CONFIG_CHROMEOS) += chromeos.c ramstage-y += mainboard.c ramstage-y += ec.c ramstage-y += board_info.c -ramstage-$(CONFIG_FW_CONFIG) += fw_config.c VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR)) diff --git a/src/mainboard/google/dedede/fw_config.c b/src/mainboard/google/dedede/fw_config.c deleted file mode 100644 index 178f0e1679..0000000000 --- a/src/mainboard/google/dedede/fw_config.c +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include - -static const struct pad_config spkr_pads[] = { - PAD_CFG_GPO_VCCIOSEL(GPP_D17, 0, PLTRST, 1V8), -}; - -static void fw_config_handle(void *unused) -{ - if (fw_config_probe(FW_CONFIG(AUDIO_AMP, RT1015P_AUTO))) { - gpio_configure_pads(spkr_pads, ARRAY_SIZE(spkr_pads)); - } -} -BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);