From 346f391642623a132a539edeabbe8a638015b1f9 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Sat, 27 Jun 2020 01:41:21 +0200 Subject: mb/amd/mandolin: factor out eMMC GPIO pin mux setup This also makes the calling of the eMMC GPIO mux setup function conditional on PICASSO_LPC_IOMUX instead of AMD_LPC_DEBUG_CARD which only makes the selection of PICASSO_LPC_IOMUX user-configurable. Change-Id: Ic49a668f82fbc1b851c07d312b543d2889fe4734 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/42842 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/amd/mandolin/Makefile.inc | 4 ++++ src/mainboard/amd/mandolin/emmc_gpio.c | 27 +++++++++++++++++++++++++++ src/mainboard/amd/mandolin/gpio.c | 25 ------------------------- src/mainboard/amd/mandolin/gpio.h | 1 + src/mainboard/amd/mandolin/mainboard.c | 6 ++++++ 5 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 src/mainboard/amd/mandolin/emmc_gpio.c (limited to 'src/mainboard/amd') diff --git a/src/mainboard/amd/mandolin/Makefile.inc b/src/mainboard/amd/mandolin/Makefile.inc index 56dd5e2454..de850b2c0a 100644 --- a/src/mainboard/amd/mandolin/Makefile.inc +++ b/src/mainboard/amd/mandolin/Makefile.inc @@ -6,6 +6,10 @@ bootblock-y += early_gpio.c ramstage-y += gpio.c ramstage-y += port_descriptors.c +ifneq ($(CONFIG_PICASSO_LPC_IOMUX),y) +ramstage-y += emmc_gpio.c +endif + # APCB_mandolin.bin APCB_SOURCES = mandolin diff --git a/src/mainboard/amd/mandolin/emmc_gpio.c b/src/mainboard/amd/mandolin/emmc_gpio.c new file mode 100644 index 0000000000..2ae72a6ec7 --- /dev/null +++ b/src/mainboard/amd/mandolin/emmc_gpio.c @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include "gpio.h" + +/* eMMC controller driving either an SD card or eMMC device. */ +static const struct soc_amd_gpio emmc_gpios[] = { + PAD_NF(GPIO_21, EMMC_CMD, PULL_UP), + PAD_NF(GPIO_22, EMMC_PRW_CTRL, PULL_UP), + PAD_NF(GPIO_68, EMMC_CD, PULL_UP), + PAD_NF(GPIO_70, EMMC_CLK, PULL_NONE), + PAD_NF(GPIO_104, EMMC_DATA0, PULL_UP), + PAD_NF(GPIO_105, EMMC_DATA1, PULL_UP), + PAD_NF(GPIO_106, EMMC_DATA2, PULL_UP), + PAD_NF(GPIO_107, EMMC_DATA3, PULL_NONE), + PAD_NF(GPIO_74, EMMC_DATA4, PULL_UP), + PAD_NF(GPIO_75, EMMC_DATA6, PULL_UP), + PAD_NF(GPIO_87, EMMC_DATA7, PULL_UP), + PAD_NF(GPIO_88, EMMC_DATA5, PULL_UP), + PAD_NF(GPIO_109, EMMC_DS, PULL_UP), +}; + +/* Don't call this if the board uses the LPC bus. */ +void mainboard_program_emmc_gpios(void) +{ + program_gpios(emmc_gpios, ARRAY_SIZE(emmc_gpios)); +} diff --git a/src/mainboard/amd/mandolin/gpio.c b/src/mainboard/amd/mandolin/gpio.c index a60f00e03a..0d2e2faa47 100644 --- a/src/mainboard/amd/mandolin/gpio.c +++ b/src/mainboard/amd/mandolin/gpio.c @@ -1,8 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include #include - #include "gpio.h" /* @@ -32,30 +30,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = { PAD_GPO(GPIO_89, HIGH), }; -/* eMMC controller driving either an SD card or eMMC device. */ -static const struct soc_amd_gpio emmc_gpios[] = { - PAD_NF(GPIO_21, EMMC_CMD, PULL_UP), - PAD_NF(GPIO_22, EMMC_PRW_CTRL, PULL_UP), - PAD_NF(GPIO_68, EMMC_CD, PULL_UP), - PAD_NF(GPIO_70, EMMC_CLK, PULL_NONE), - PAD_NF(GPIO_104, EMMC_DATA0, PULL_UP), - PAD_NF(GPIO_105, EMMC_DATA1, PULL_UP), - PAD_NF(GPIO_106, EMMC_DATA2, PULL_UP), - PAD_NF(GPIO_107, EMMC_DATA3, PULL_NONE), - PAD_NF(GPIO_74, EMMC_DATA4, PULL_UP), - PAD_NF(GPIO_75, EMMC_DATA6, PULL_UP), - PAD_NF(GPIO_87, EMMC_DATA7, PULL_UP), - PAD_NF(GPIO_88, EMMC_DATA5, PULL_UP), - PAD_NF(GPIO_109, EMMC_DS, PULL_UP), -}; - void mainboard_program_gpios(void) { program_gpios(gpio_set_stage_ram, ARRAY_SIZE(gpio_set_stage_ram)); - - /* Re-muxing LPCCLK0 can hang the system if LPC is in use. */ - if (CONFIG(AMD_LPC_DEBUG_CARD)) - printk(BIOS_INFO, "eMMC not available due to LPC requirement\n"); - else - program_gpios(emmc_gpios, ARRAY_SIZE(emmc_gpios)); } diff --git a/src/mainboard/amd/mandolin/gpio.h b/src/mainboard/amd/mandolin/gpio.h index 04c98c50df..1881fe0ee2 100644 --- a/src/mainboard/amd/mandolin/gpio.h +++ b/src/mainboard/amd/mandolin/gpio.h @@ -5,5 +5,6 @@ void mainboard_program_early_gpios(void); /* bootblock GPIO configuration */ void mainboard_program_gpios(void); /* ramstage GPIO configuration */ +void mainboard_program_emmc_gpios(void); /* ramstage eMMC pin mux configuration */ #endif /* MAINBOARD_GPIO_H */ diff --git a/src/mainboard/amd/mandolin/mainboard.c b/src/mainboard/amd/mandolin/mainboard.c index c0b9dac7ba..c22ed34849 100644 --- a/src/mainboard/amd/mandolin/mainboard.c +++ b/src/mainboard/amd/mandolin/mainboard.c @@ -115,6 +115,12 @@ static void mainboard_init(void *chip_info) cfg->sd_emmc_config = SD_EMMC_EMMC_HS400; mainboard_program_gpios(); + + /* Re-muxing LPCCLK0 can hang the system if LPC is in use. */ + if (CONFIG(PICASSO_LPC_IOMUX)) + printk(BIOS_INFO, "eMMC not available due to LPC requirement\n"); + else + mainboard_program_emmc_gpios(); } static void mandolin_enable(struct device *dev) -- cgit v1.2.3