sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "mb/clevo/cml-u: drop duplicated configuration of UART pads"

Browse Source 
This reverts commit 1a0071c7115819302c7df3fa2c07b1ca971e515d.

Reason for revert:
UART pad configuration should not be done in common code, since it
could cause short circuits if the user configures a wrong UART index.

Change-Id: I6022935eaab748f82c6330be0729ff72f4880493
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48328
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
This commit is contained in:
Felix Singer 2020-12-21 03:58:13 +00:00 committed by Michael Niewöhner
parent 6c0aba2059
commit b2a749d4ac
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mainboard/clevo/cml-u/Makefile.inc
View File

@ -1,5 +1,8 @@
CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/include
bootblock-y += bootblock.c
bootblock-y += variants/$(VARIANT_DIR)/gpio_early.c
ramstage-y += ramstage.c ramstage-y += ramstage.c
ramstage-y += variants/$(VARIANT_DIR)/gpio.c ramstage-y += variants/$(VARIANT_DIR)/gpio.c
ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c

10
src/mainboard/clevo/cml-u/bootblock.c Normal file
View File

@ -0,0 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h>
#include <gpio.h>
#include <variant/gpio.h>
void bootblock_mainboard_init(void)
{
variant_configure_early_gpios();
}

1
src/mainboard/clevo/cml-u/include/variant/gpio.h
View File

@ -3,6 +3,7 @@
#ifndef VARIANT_GPIO_H #ifndef VARIANT_GPIO_H
#define VARIANT_GPIO_H #define VARIANT_GPIO_H
void variant_configure_early_gpios(void);
void variant_configure_gpios(void); void variant_configure_gpios(void);
#endif #endif

17
src/mainboard/clevo/cml-u/variants/l140cu/gpio_early.c Normal file
View File

@ -0,0 +1,17 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <soc/gpio.h>
#include <variant/gpio.h>
/* Name format: <pad name> / <net/pin name in schematics> */
static const struct pad_config early_gpio_table[] = {
PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), /* UART2_RXD */
PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), /* UART2_TXD */
PAD_NC(GPP_C22, UP_20K),
PAD_NC(GPP_C23, UP_20K),
};
void variant_configure_early_gpios(void)
{
gpio_configure_pads(early_gpio_table, ARRAY_SIZE(early_gpio_table));
}