GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42842
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Felix Held 2020-06-27 01:41:21 +02:00 committed by Felix Held
parent 664ba9767d
commit 346f391642
5 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/amd/mandolin/Makefile.inc
View File

@ -6,6 +6,10 @@ bootblock-y += early_gpio.c
ramstage-y += gpio.c ramstage-y += gpio.c
ramstage-y += port_descriptors.c ramstage-y += port_descriptors.c
ifneq ($(CONFIG_PICASSO_LPC_IOMUX),y)
ramstage-y += emmc_gpio.c
endif
# APCB_mandolin.bin # APCB_mandolin.bin
APCB_SOURCES = mandolin APCB_SOURCES = mandolin

27
src/mainboard/amd/mandolin/emmc_gpio.c Normal file
View File

@ -0,0 +1,27 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <soc/gpio.h>
#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));
}

25
src/mainboard/amd/mandolin/gpio.c
View File

@ -1,8 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <console/console.h>
#include <soc/gpio.h> #include <soc/gpio.h>
#include "gpio.h" #include "gpio.h"
/* /*
@ -32,30 +30,7 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
PAD_GPO(GPIO_89, HIGH), 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) void mainboard_program_gpios(void)
{ {
program_gpios(gpio_set_stage_ram, ARRAY_SIZE(gpio_set_stage_ram)); 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));
} }

1
src/mainboard/amd/mandolin/gpio.h
View File

@ -5,5 +5,6 @@
void mainboard_program_early_gpios(void); /* bootblock GPIO configuration */ void mainboard_program_early_gpios(void); /* bootblock GPIO configuration */
void mainboard_program_gpios(void); /* ramstage 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 */ #endif /* MAINBOARD_GPIO_H */

6
src/mainboard/amd/mandolin/mainboard.c
View File

@ -115,6 +115,12 @@ static void mainboard_init(void *chip_info)
cfg->sd_emmc_config = SD_EMMC_EMMC_HS400; cfg->sd_emmc_config = SD_EMMC_EMMC_HS400;
mainboard_program_gpios(); 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) static void mandolin_enable(struct device *dev)