mb/google: Remove blank lines before '}' and after '{'
Change-Id: If68303cd59b287c8a5c982063b2ab75fd74898d6 Signed-off-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/81477 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Eric Lai <ericllai@google.com> Reviewed-by: Yu-Ping Wu <yupingso@google.com> Reviewed-by: Jakub Czapiga <czapiga@google.com>
This commit is contained in:
@@ -191,7 +191,6 @@ static void mainboard_fill_ssdt(const struct device *dev)
|
|||||||
mainboard_generate_s0ix_hook();
|
mainboard_generate_s0ix_hook();
|
||||||
acpigen_write_method_end(); /* Method */
|
acpigen_write_method_end(); /* Method */
|
||||||
acpigen_write_scope_end(); /* Scope */
|
acpigen_write_scope_end(); /* Scope */
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void __weak variant_fill_ssdt(const struct device *dev)
|
void __weak variant_fill_ssdt(const struct device *dev)
|
||||||
|
@@ -191,7 +191,6 @@ static void mainboard_fill_ssdt(const struct device *dev)
|
|||||||
mainboard_generate_s0ix_hook();
|
mainboard_generate_s0ix_hook();
|
||||||
acpigen_write_method_end(); /* Method */
|
acpigen_write_method_end(); /* Method */
|
||||||
acpigen_write_scope_end(); /* Scope */
|
acpigen_write_scope_end(); /* Scope */
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void __weak variant_fill_ssdt(const struct device *dev)
|
void __weak variant_fill_ssdt(const struct device *dev)
|
||||||
|
@@ -39,6 +39,5 @@ static void fw_config_handle(void *unused)
|
|||||||
printk(BIOS_INFO, "BT offload enabled over I2S with NAU88L25B\n");
|
printk(BIOS_INFO, "BT offload enabled over I2S with NAU88L25B\n");
|
||||||
gpio_configure_pads(bt_i2s_enable_pads, ARRAY_SIZE(bt_i2s_enable_pads));
|
gpio_configure_pads(bt_i2s_enable_pads, ARRAY_SIZE(bt_i2s_enable_pads));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
|
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
|
||||||
|
@@ -39,6 +39,5 @@ static void fw_config_handle(void *unused)
|
|||||||
printk(BIOS_INFO, "BT offload enabled over I2S with NAU88L25B\n");
|
printk(BIOS_INFO, "BT offload enabled over I2S with NAU88L25B\n");
|
||||||
gpio_configure_pads(bt_i2s_enable_pads, ARRAY_SIZE(bt_i2s_enable_pads));
|
gpio_configure_pads(bt_i2s_enable_pads, ARRAY_SIZE(bt_i2s_enable_pads));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
|
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
|
||||||
|
@@ -40,6 +40,5 @@ static void fw_config_handle(void *unused)
|
|||||||
printk(BIOS_INFO, "BT offload enabled over I2S with MAX98360+RT5682VS\n");
|
printk(BIOS_INFO, "BT offload enabled over I2S with MAX98360+RT5682VS\n");
|
||||||
gpio_configure_pads(bt_i2s_enable_pads, ARRAY_SIZE(bt_i2s_enable_pads));
|
gpio_configure_pads(bt_i2s_enable_pads, ARRAY_SIZE(bt_i2s_enable_pads));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
|
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
|
||||||
|
@@ -39,6 +39,5 @@ static void fw_config_handle(void *unused)
|
|||||||
printk(BIOS_INFO, "BT offload enabled over I2S with NAU88L25B\n");
|
printk(BIOS_INFO, "BT offload enabled over I2S with NAU88L25B\n");
|
||||||
gpio_configure_pads(bt_i2s_enable_pads, ARRAY_SIZE(bt_i2s_enable_pads));
|
gpio_configure_pads(bt_i2s_enable_pads, ARRAY_SIZE(bt_i2s_enable_pads));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
|
BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL);
|
||||||
|
@@ -17,5 +17,4 @@ void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config)
|
|||||||
|
|
||||||
if (fw_config_probe(FW_CONFIG(FPMCU_MASK, FPMCU_DISABLED)))
|
if (fw_config_probe(FW_CONFIG(FPMCU_MASK, FPMCU_DISABLED)))
|
||||||
config->serial_io_gspi_mode[PchSerialIoIndexGSPI1] = PchSerialIoDisabled;
|
config->serial_io_gspi_mode[PchSerialIoIndexGSPI1] = PchSerialIoDisabled;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -24,5 +24,4 @@ void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
|
|||||||
gpio_padbased_override(padbased_table, wfc_disable_pads,
|
gpio_padbased_override(padbased_table, wfc_disable_pads,
|
||||||
ARRAY_SIZE(wfc_disable_pads));
|
ARRAY_SIZE(wfc_disable_pads));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -221,7 +221,6 @@ const struct pad_config *variant_gpio_override_table(size_t *num)
|
|||||||
{
|
{
|
||||||
*num = ARRAY_SIZE(gpio_overrides);
|
*num = ARRAY_SIZE(gpio_overrides);
|
||||||
return gpio_overrides;
|
return gpio_overrides;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const struct pad_config *variant_early_gpio_table(size_t *num)
|
const struct pad_config *variant_early_gpio_table(size_t *num)
|
||||||
|
@@ -18,5 +18,4 @@ void butterfly_ec_init(void)
|
|||||||
/* Disable wake on USB, LAN & RTC */
|
/* Disable wake on USB, LAN & RTC */
|
||||||
/* Enable Wake from Keyboard */
|
/* Enable Wake from Keyboard */
|
||||||
ec_mem_write(EC_EC_PSW, EC_PSW_IKB);
|
ec_mem_write(EC_EC_PSW, EC_PSW_IKB);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -126,7 +126,6 @@ static void program_keyboard_type(uintptr_t search_address, u32 search_length)
|
|||||||
char kbd_type = EC_KBD_EN; /* Default keyboard type is English */
|
char kbd_type = EC_KBD_EN; /* Default keyboard type is English */
|
||||||
|
|
||||||
if (search_length != -1) {
|
if (search_length != -1) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Search for keyboard_layout identifier
|
* Search for keyboard_layout identifier
|
||||||
* The only options in the EC are Japanese or English.
|
* The only options in the EC are Japanese or English.
|
||||||
|
@@ -21,7 +21,6 @@ void setup_chromeos_gpios(void)
|
|||||||
gpio_output(GPIO_BEEP_ON, 0);
|
gpio_output(GPIO_BEEP_ON, 0);
|
||||||
else if (CONFIG(CHERRY_USE_RT1011))
|
else if (CONFIG(CHERRY_USE_RT1011))
|
||||||
gpio_output(GPIO_RST_RT1011, 0);
|
gpio_output(GPIO_RST_RT1011, 0);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void fill_lb_gpios(struct lb_gpios *gpios)
|
void fill_lb_gpios(struct lb_gpios *gpios)
|
||||||
|
@@ -174,7 +174,6 @@ bool mainboard_regulator_is_enabled(enum mtk_regulator regulator)
|
|||||||
}
|
}
|
||||||
return !!enabled;
|
return !!enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
printk(BIOS_ERR, "Invalid regulator ID: %d\n; assuming disabled", regulator);
|
printk(BIOS_ERR, "Invalid regulator ID: %d\n; assuming disabled", regulator);
|
||||||
|
@@ -13,7 +13,6 @@ void variant_memory_init_params(MEMORY_INIT_UPD *memory_params)
|
|||||||
* RAMID = 12 - 2GiB Micron MT52L256M32D1PF
|
* RAMID = 12 - 2GiB Micron MT52L256M32D1PF
|
||||||
*/
|
*/
|
||||||
if (ram_id == 4 || ram_id == 12) {
|
if (ram_id == 4 || ram_id == 12) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For new micron part, it requires read/receive
|
* For new micron part, it requires read/receive
|
||||||
* enable training before sending cmds to get MR8.
|
* enable training before sending cmds to get MR8.
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
void board_silicon_USB2_override(SILICON_INIT_UPD *params)
|
void board_silicon_USB2_override(SILICON_INIT_UPD *params)
|
||||||
{
|
{
|
||||||
if (SocStepping() >= SocD0) {
|
if (SocStepping() >= SocD0) {
|
||||||
|
|
||||||
//Follow Intel recommendation to set
|
//Follow Intel recommendation to set
|
||||||
//BSW D-stepping PERPORTRXISET 2 (low strength)
|
//BSW D-stepping PERPORTRXISET 2 (low strength)
|
||||||
params->Usb2Port0PerPortPeTxiSet = 7;
|
params->Usb2Port0PerPortPeTxiSet = 7;
|
||||||
|
@@ -13,7 +13,6 @@ void variant_memory_init_params(MEMORY_INIT_UPD *memory_params)
|
|||||||
* RAMID = 7 - 2GiB Micron MT52L256M32D1PF-107
|
* RAMID = 7 - 2GiB Micron MT52L256M32D1PF-107
|
||||||
*/
|
*/
|
||||||
if (ram_id == 5 || ram_id == 7) {
|
if (ram_id == 5 || ram_id == 7) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For new micron part, it requires read/receive
|
* For new micron part, it requires read/receive
|
||||||
* enable training before sending cmds to get MR8.
|
* enable training before sending cmds to get MR8.
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
void board_silicon_USB2_override(SILICON_INIT_UPD *params)
|
void board_silicon_USB2_override(SILICON_INIT_UPD *params)
|
||||||
{
|
{
|
||||||
if (SocStepping() >= SocD0) {
|
if (SocStepping() >= SocD0) {
|
||||||
|
|
||||||
//Follow Intel recommendation to set
|
//Follow Intel recommendation to set
|
||||||
//BSW D-stepping PERPORTRXISET 2 (low strength)
|
//BSW D-stepping PERPORTRXISET 2 (low strength)
|
||||||
params->D0Usb2Port0PerPortRXISet = 2;
|
params->D0Usb2Port0PerPortRXISet = 2;
|
||||||
|
@@ -13,7 +13,6 @@ void variant_memory_init_params(MEMORY_INIT_UPD *memory_params)
|
|||||||
* RAMID = 3 - 2GiB Micron MT52L256M32D1PF-107
|
* RAMID = 3 - 2GiB Micron MT52L256M32D1PF-107
|
||||||
*/
|
*/
|
||||||
if (ram_id == 2 || ram_id == 3) {
|
if (ram_id == 2 || ram_id == 3) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For new micron part, it requires read/receive
|
* For new micron part, it requires read/receive
|
||||||
* enable training before sending cmds to get MR8.
|
* enable training before sending cmds to get MR8.
|
||||||
|
@@ -13,7 +13,6 @@ void variant_memory_init_params(MEMORY_INIT_UPD *memory_params)
|
|||||||
* RAMID = 2 - 2GiB Micron MT52L256M32D1PF-107
|
* RAMID = 2 - 2GiB Micron MT52L256M32D1PF-107
|
||||||
*/
|
*/
|
||||||
if (ram_id == 2 || ram_id == 0xA) {
|
if (ram_id == 2 || ram_id == 0xA) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For new micron part, it requires read/receive
|
* For new micron part, it requires read/receive
|
||||||
* enable training before sending cmds to get MR8.
|
* enable training before sending cmds to get MR8.
|
||||||
|
@@ -13,7 +13,6 @@ void variant_memory_init_params(MEMORY_INIT_UPD *memory_params)
|
|||||||
* RAMID = 2 - 2GiB Micron MT52L256M32D1PF-107
|
* RAMID = 2 - 2GiB Micron MT52L256M32D1PF-107
|
||||||
*/
|
*/
|
||||||
if (ram_id == 2 || ram_id == 0xA) {
|
if (ram_id == 2 || ram_id == 0xA) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For new micron part, it requires read/receive
|
* For new micron part, it requires read/receive
|
||||||
* enable training before sending cmds to get MR8.
|
* enable training before sending cmds to get MR8.
|
||||||
|
@@ -13,7 +13,6 @@ void variant_memory_init_params(MEMORY_INIT_UPD *memory_params)
|
|||||||
* RAMID = 5 - 2GiB Micron MT52L256M32D1PF-107
|
* RAMID = 5 - 2GiB Micron MT52L256M32D1PF-107
|
||||||
*/
|
*/
|
||||||
if (ram_id == 4 || ram_id == 5) {
|
if (ram_id == 4 || ram_id == 5) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For new micron part, it requires read/receive
|
* For new micron part, it requires read/receive
|
||||||
* enable training before sending cmds to get MR8.
|
* enable training before sending cmds to get MR8.
|
||||||
|
@@ -13,7 +13,6 @@ void variant_memory_init_params(MEMORY_INIT_UPD *memory_params)
|
|||||||
* RAMID = 11 - 4GiB Micron MT52L256M32D1PF-107
|
* RAMID = 11 - 4GiB Micron MT52L256M32D1PF-107
|
||||||
*/
|
*/
|
||||||
if (ram_id == 3 || ram_id == 11) {
|
if (ram_id == 3 || ram_id == 11) {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For new micron part, it requires read/receive
|
* For new micron part, it requires read/receive
|
||||||
* enable training before sending cmds to get MR8.
|
* enable training before sending cmds to get MR8.
|
||||||
|
@@ -237,5 +237,4 @@ static struct soc_gpio_config gpio_config = {
|
|||||||
struct soc_gpio_config *mainboard_get_gpios(void)
|
struct soc_gpio_config *mainboard_get_gpios(void)
|
||||||
{
|
{
|
||||||
return &gpio_config;
|
return &gpio_config;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -128,18 +128,15 @@ static void mainboard_generate_s0ix_hook(void)
|
|||||||
|
|
||||||
static void mainboard_fill_ssdt(const struct device *dev)
|
static void mainboard_fill_ssdt(const struct device *dev)
|
||||||
{
|
{
|
||||||
|
|
||||||
acpigen_write_scope("\\_SB");
|
acpigen_write_scope("\\_SB");
|
||||||
acpigen_write_method_serialized("MS0X", 1);
|
acpigen_write_method_serialized("MS0X", 1);
|
||||||
mainboard_generate_s0ix_hook();
|
mainboard_generate_s0ix_hook();
|
||||||
acpigen_write_method_end(); /* Method */
|
acpigen_write_method_end(); /* Method */
|
||||||
acpigen_write_scope_end(); /* Scope */
|
acpigen_write_scope_end(); /* Scope */
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void __weak variant_generate_s0ix_hook(enum s0ix_entry entry)
|
void __weak variant_generate_s0ix_hook(enum s0ix_entry entry)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* Add board-specific MS0X entries */
|
/* Add board-specific MS0X entries */
|
||||||
/*
|
/*
|
||||||
if (s0ix_entry == S0IX_ENTRY) {
|
if (s0ix_entry == S0IX_ENTRY) {
|
||||||
|
@@ -7,7 +7,6 @@
|
|||||||
#include <soc/romstage.h>
|
#include <soc/romstage.h>
|
||||||
|
|
||||||
static const struct mb_cfg baseboard_memcfg_cfg = {
|
static const struct mb_cfg baseboard_memcfg_cfg = {
|
||||||
|
|
||||||
.dq_map[DDR_CH0] = {
|
.dq_map[DDR_CH0] = {
|
||||||
{0xf, 0xf0},
|
{0xf, 0xf0},
|
||||||
{0xf, 0xf0},
|
{0xf, 0xf0},
|
||||||
|
@@ -7,7 +7,6 @@
|
|||||||
#include <soc/romstage.h>
|
#include <soc/romstage.h>
|
||||||
|
|
||||||
static const struct mb_cfg board_memcfg_cfg = {
|
static const struct mb_cfg board_memcfg_cfg = {
|
||||||
|
|
||||||
.dq_map[DDR_CH0] = {
|
.dq_map[DDR_CH0] = {
|
||||||
{0xf, 0xf0},
|
{0xf, 0xf0},
|
||||||
{0xf, 0xf0},
|
{0xf, 0xf0},
|
||||||
|
@@ -9,14 +9,12 @@
|
|||||||
|
|
||||||
/* Pad configuration in ramstage */
|
/* Pad configuration in ramstage */
|
||||||
static const struct pad_config not_board6or8_gpio_table[] = {
|
static const struct pad_config not_board6or8_gpio_table[] = {
|
||||||
|
|
||||||
/* C12 : AP_PEN_DET_ODL */
|
/* C12 : AP_PEN_DET_ODL */
|
||||||
PAD_CFG_GPI_GPIO_DRIVER(GPP_C12, UP_20K, DEEP),
|
PAD_CFG_GPI_GPIO_DRIVER(GPP_C12, UP_20K, DEEP),
|
||||||
};
|
};
|
||||||
|
|
||||||
/* bid6: Pad configuration for board version 6 or 8 in ramstage */
|
/* bid6: Pad configuration for board version 6 or 8 in ramstage */
|
||||||
static const struct pad_config board6or8_gpio_table[] = {
|
static const struct pad_config board6or8_gpio_table[] = {
|
||||||
|
|
||||||
/* A10 : WWAN_EN */
|
/* A10 : WWAN_EN */
|
||||||
PAD_CFG_GPO(GPP_A10, 1, PWROK),
|
PAD_CFG_GPO(GPP_A10, 1, PWROK),
|
||||||
|
|
||||||
|
@@ -19,7 +19,6 @@ const char *get_wifi_sar_cbfs_filename(void)
|
|||||||
uint32_t sku_id = google_chromeec_get_board_sku();
|
uint32_t sku_id = google_chromeec_get_board_sku();
|
||||||
|
|
||||||
if (fw_config_probe(FW_CONFIG(TABLETMODE, TABLETMODE_ENABLED))) {
|
if (fw_config_probe(FW_CONFIG(TABLETMODE, TABLETMODE_ENABLED))) {
|
||||||
|
|
||||||
if (sku_id >= OSCINO_SKU_START && sku_id <= OSCINO_SKU_END)
|
if (sku_id >= OSCINO_SKU_START && sku_id <= OSCINO_SKU_END)
|
||||||
return "wifi_sar-oscino.hex";
|
return "wifi_sar-oscino.hex";
|
||||||
else
|
else
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
/* Pad configuration in ramstage */
|
/* Pad configuration in ramstage */
|
||||||
static const struct pad_config gpio_table[] = {
|
static const struct pad_config gpio_table[] = {
|
||||||
|
|
||||||
/* A11 : TOUCH_RPT_EN */
|
/* A11 : TOUCH_RPT_EN */
|
||||||
PAD_NC(GPP_A11, NONE),
|
PAD_NC(GPP_A11, NONE),
|
||||||
|
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
/* Pad configuration in ramstage */
|
/* Pad configuration in ramstage */
|
||||||
static const struct pad_config gpio_table[] = {
|
static const struct pad_config gpio_table[] = {
|
||||||
|
|
||||||
/* A11 : TOUCH_RPT_EN */
|
/* A11 : TOUCH_RPT_EN */
|
||||||
PAD_NC(GPP_A11, NONE),
|
PAD_NC(GPP_A11, NONE),
|
||||||
|
|
||||||
|
@@ -6,11 +6,9 @@
|
|||||||
|
|
||||||
void __weak variant_nhlt_init(struct nhlt *nhlt)
|
void __weak variant_nhlt_init(struct nhlt *nhlt)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* RT5663 Headset codec */
|
/* RT5663 Headset codec */
|
||||||
if (nhlt_soc_add_rt5663(nhlt, AUDIO_LINK_SSP1))
|
if (nhlt_soc_add_rt5663(nhlt, AUDIO_LINK_SSP1))
|
||||||
printk(BIOS_ERR, "Couldn't add headset codec.\n");
|
printk(BIOS_ERR, "Couldn't add headset codec.\n");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void __weak variant_nhlt_oem_overrides(const char **oem_id,
|
void __weak variant_nhlt_oem_overrides(const char **oem_id,
|
||||||
|
@@ -15,5 +15,4 @@ void variant_nhlt_oem_overrides(const char **oem_id,
|
|||||||
|
|
||||||
void variant_chip_display_init(void)
|
void variant_chip_display_init(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -18,7 +18,6 @@ void variant_nhlt_init(struct nhlt *nhlt)
|
|||||||
/* MAXIM Smart Amps for left and right speakers. */
|
/* MAXIM Smart Amps for left and right speakers. */
|
||||||
if (nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP0))
|
if (nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP0))
|
||||||
printk(BIOS_ERR, "Couldn't add Maxim_98357 codec.\n");
|
printk(BIOS_ERR, "Couldn't add Maxim_98357 codec.\n");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void variant_nhlt_oem_overrides(const char **oem_id,
|
void variant_nhlt_oem_overrides(const char **oem_id,
|
||||||
|
@@ -39,7 +39,6 @@ void bootblock_mainboard_init(void)
|
|||||||
/* Is maskrom parameter address set to a sensible value? */
|
/* Is maskrom parameter address set to a sensible value? */
|
||||||
if ((maskrom_param->start_magic != UBER_SBL_SHARED_INFO_START_MAGIC) ||
|
if ((maskrom_param->start_magic != UBER_SBL_SHARED_INFO_START_MAGIC) ||
|
||||||
(maskrom_param->end_magic != UBER_SBL_SHARED_INFO_END_MAGIC)) {
|
(maskrom_param->end_magic != UBER_SBL_SHARED_INFO_END_MAGIC)) {
|
||||||
|
|
||||||
printk(BIOS_INFO, "Uber-sbl: invalid magic!\n");
|
printk(BIOS_INFO, "Uber-sbl: invalid magic!\n");
|
||||||
} else {
|
} else {
|
||||||
printk(BIOS_INFO, "Uber-sbl version: %s\n",
|
printk(BIOS_INFO, "Uber-sbl version: %s\n",
|
||||||
|
@@ -8,7 +8,6 @@
|
|||||||
|
|
||||||
static void ipq_setup_tpm(void)
|
static void ipq_setup_tpm(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (CONFIG(I2C_TPM)) {
|
if (CONFIG(I2C_TPM)) {
|
||||||
gpio_tlmm_config_set(TPM_RESET_GPIO, FUNC_SEL_GPIO,
|
gpio_tlmm_config_set(TPM_RESET_GPIO, FUNC_SEL_GPIO,
|
||||||
GPIO_PULL_UP, GPIO_6MA, 1);
|
GPIO_PULL_UP, GPIO_6MA, 1);
|
||||||
|
@@ -9,7 +9,6 @@
|
|||||||
#include <types.h>
|
#include <types.h>
|
||||||
|
|
||||||
static const char *sdram_configs[] = {
|
static const char *sdram_configs[] = {
|
||||||
|
|
||||||
/* Samsung K4E6E304EB-EGCE */
|
/* Samsung K4E6E304EB-EGCE */
|
||||||
[0] = "sdram-lpddr3-generic-4GB",
|
[0] = "sdram-lpddr3-generic-4GB",
|
||||||
|
|
||||||
|
@@ -14,5 +14,4 @@ void mb_pre_fspm(void)
|
|||||||
|
|
||||||
gpio_configure_pads_with_override(base_gpios, base_num_gpios,
|
gpio_configure_pads_with_override(base_gpios, base_num_gpios,
|
||||||
override_gpios, override_num_gpios);
|
override_gpios, override_num_gpios);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -153,7 +153,6 @@ const struct pad_config *variant_early_gpio_table(size_t *num)
|
|||||||
* See https://review.coreboot.org/c/coreboot/+/32111 .
|
* See https://review.coreboot.org/c/coreboot/+/32111 .
|
||||||
*/
|
*/
|
||||||
static const struct pad_config default_sleep_gpio_table[] = {
|
static const struct pad_config default_sleep_gpio_table[] = {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -161,7 +160,6 @@ static const struct pad_config default_sleep_gpio_table[] = {
|
|||||||
* default_sleep_gpio_table but also, turn off FPMCU.
|
* default_sleep_gpio_table but also, turn off FPMCU.
|
||||||
*/
|
*/
|
||||||
static const struct pad_config s5_sleep_gpio_table[] = {
|
static const struct pad_config s5_sleep_gpio_table[] = {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
|
const struct pad_config *variant_sleep_gpio_table(u8 slp_typ, size_t *num)
|
||||||
|
@@ -135,7 +135,6 @@ static void mainboard_enable(struct device *dev)
|
|||||||
{
|
{
|
||||||
/* Initialize the PIRQ data structures for consumption */
|
/* Initialize the PIRQ data structures for consumption */
|
||||||
pirq_setup();
|
pirq_setup();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int mainboard_get_xhci_oc_map(uint16_t *map)
|
int mainboard_get_xhci_oc_map(uint16_t *map)
|
||||||
|
@@ -12,5 +12,4 @@ void bootblock_mainboard_init(void)
|
|||||||
2);
|
2);
|
||||||
gpio_set_spi_driving(CONFIG_BOOT_DEVICE_SPI_FLASH_BUS, SPI_PAD0_MASK,
|
gpio_set_spi_driving(CONFIG_BOOT_DEVICE_SPI_FLASH_BUS, SPI_PAD0_MASK,
|
||||||
10);
|
10);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -4,5 +4,4 @@
|
|||||||
|
|
||||||
void bootblock_mainboard_init(void)
|
void bootblock_mainboard_init(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
void fill_lb_gpios(struct lb_gpios *gpios)
|
void fill_lb_gpios(struct lb_gpios *gpios)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int get_ec_is_trusted(void)
|
int get_ec_is_trusted(void)
|
||||||
|
@@ -50,7 +50,6 @@ static void set_clock_sources(void)
|
|||||||
clrsetbits32(&clk_rst->clk_src_disp1,
|
clrsetbits32(&clk_rst->clk_src_disp1,
|
||||||
CLK_SOURCE_MASK | CLK_DIVISOR_MASK,
|
CLK_SOURCE_MASK | CLK_DIVISOR_MASK,
|
||||||
2 /*PLLD_OUT0 */ << CLK_SOURCE_SHIFT);
|
2 /*PLLD_OUT0 */ << CLK_SOURCE_SHIFT);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setup_pinmux(void)
|
static void setup_pinmux(void)
|
||||||
|
@@ -50,7 +50,6 @@ static void set_clock_sources(void)
|
|||||||
clrsetbits32(&clk_rst->clk_src_disp1,
|
clrsetbits32(&clk_rst->clk_src_disp1,
|
||||||
CLK_SOURCE_MASK | CLK_DIVISOR_MASK,
|
CLK_SOURCE_MASK | CLK_DIVISOR_MASK,
|
||||||
2 /*PLLD_OUT0 */ << CLK_SOURCE_SHIFT);
|
2 /*PLLD_OUT0 */ << CLK_SOURCE_SHIFT);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setup_pinmux(void)
|
static void setup_pinmux(void)
|
||||||
|
@@ -50,7 +50,6 @@ static void set_clock_sources(void)
|
|||||||
clrsetbits32(&clk_rst->clk_src_disp1,
|
clrsetbits32(&clk_rst->clk_src_disp1,
|
||||||
CLK_SOURCE_MASK | CLK_DIVISOR_MASK,
|
CLK_SOURCE_MASK | CLK_DIVISOR_MASK,
|
||||||
2 /*PLLD_OUT0 */ << CLK_SOURCE_SHIFT);
|
2 /*PLLD_OUT0 */ << CLK_SOURCE_SHIFT);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void setup_pinmux(void)
|
static void setup_pinmux(void)
|
||||||
|
@@ -62,7 +62,6 @@ void __weak variant_smi_sleep(u8 slp_typ)
|
|||||||
|
|
||||||
void power_off_lte_module(void)
|
void power_off_lte_module(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
const struct gpio_with_delay lte_power_off_gpios[] = {
|
const struct gpio_with_delay lte_power_off_gpios[] = {
|
||||||
{
|
{
|
||||||
GPIO_161, /* AVS_I2S1_MCLK -- PLT_RST_LTE_L */
|
GPIO_161, /* AVS_I2S1_MCLK -- PLT_RST_LTE_L */
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
#include <gpio.h>
|
#include <gpio.h>
|
||||||
|
|
||||||
static const struct pad_config default_override_table[] = {
|
static const struct pad_config default_override_table[] = {
|
||||||
|
|
||||||
PAD_NC(GPIO_50, UP_20K), /* PCH_I2C_PEN_SDA -- unused */
|
PAD_NC(GPIO_50, UP_20K), /* PCH_I2C_PEN_SDA -- unused */
|
||||||
PAD_NC(GPIO_51, UP_20K), /* PCH_I2C_PEN_SCL -- unused */
|
PAD_NC(GPIO_51, UP_20K), /* PCH_I2C_PEN_SCL -- unused */
|
||||||
PAD_NC(GPIO_52, UP_20K), /* PCH_I2C_P_SENSOR_SDA -- unused */
|
PAD_NC(GPIO_52, UP_20K), /* PCH_I2C_P_SENSOR_SDA -- unused */
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
#include <gpio.h>
|
#include <gpio.h>
|
||||||
|
|
||||||
static const struct pad_config default_override_table[] = {
|
static const struct pad_config default_override_table[] = {
|
||||||
|
|
||||||
PAD_NC(GPIO_52, UP_20K),
|
PAD_NC(GPIO_52, UP_20K),
|
||||||
PAD_NC(GPIO_53, UP_20K),
|
PAD_NC(GPIO_53, UP_20K),
|
||||||
/* UART2-CTS_B -- EN_PP3300_DX_LTE_SOC */
|
/* UART2-CTS_B -- EN_PP3300_DX_LTE_SOC */
|
||||||
|
@@ -194,7 +194,6 @@ static void simple_spi_test(void)
|
|||||||
printk(BIOS_SPEW, "RTRY at %d(%p):\nRAM %08lx\nSPI %08lx\n",
|
printk(BIOS_SPEW, "RTRY at %d(%p):\nRAM %08lx\nSPI %08lx\n",
|
||||||
i, &data[i/4], (unsigned long)data[i/4], (unsigned long)in);
|
i, &data[i/4], (unsigned long)data[i/4], (unsigned long)in);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
printk(BIOS_SPEW, "%d errors\n", errors);
|
printk(BIOS_SPEW, "%d errors\n", errors);
|
||||||
}
|
}
|
||||||
@@ -219,7 +218,6 @@ void main(void)
|
|||||||
|
|
||||||
void __noreturn romstage_main(void)
|
void __noreturn romstage_main(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
extern struct mem_timings mem_timings;
|
extern struct mem_timings mem_timings;
|
||||||
int is_resume = (get_wakeup_state() != IS_NOT_WAKEUP);
|
int is_resume = (get_wakeup_state() != IS_NOT_WAKEUP);
|
||||||
int power_init_failed;
|
int power_init_failed;
|
||||||
|
@@ -18,7 +18,6 @@ void variant_nhlt_init(struct nhlt *nhlt)
|
|||||||
/* MAXIM Smart Amps for left and right speakers. */
|
/* MAXIM Smart Amps for left and right speakers. */
|
||||||
if (nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP0))
|
if (nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP0))
|
||||||
printk(BIOS_ERR, "Couldn't add Maxim_98357 codec.\n");
|
printk(BIOS_ERR, "Couldn't add Maxim_98357 codec.\n");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,
|
void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,
|
||||||
|
@@ -18,7 +18,6 @@ void variant_nhlt_init(struct nhlt *nhlt)
|
|||||||
/* MAXIM Smart Amps for left and right speakers. */
|
/* MAXIM Smart Amps for left and right speakers. */
|
||||||
if (nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP0))
|
if (nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP0))
|
||||||
printk(BIOS_ERR, "Couldn't add Maxim_98357 codec.\n");
|
printk(BIOS_ERR, "Couldn't add Maxim_98357 codec.\n");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,
|
void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,
|
||||||
|
@@ -19,7 +19,6 @@ void variant_nhlt_init(struct nhlt *nhlt)
|
|||||||
/* Render time_slot is 0 and feedback time_slot is 2 */
|
/* Render time_slot is 0 and feedback time_slot is 2 */
|
||||||
if (nhlt_soc_add_max98927(nhlt, AUDIO_LINK_SSP0, 0, 2))
|
if (nhlt_soc_add_max98927(nhlt, AUDIO_LINK_SSP0, 0, 2))
|
||||||
printk(BIOS_ERR, "Couldn't add Maxim MAX98927\n");
|
printk(BIOS_ERR, "Couldn't add Maxim MAX98927\n");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,
|
void variant_nhlt_oem_overrides(const char **oem_id, const char **oem_table_id,
|
||||||
|
@@ -409,7 +409,6 @@ static const struct pad_config romstage_gpio_table[] = {
|
|||||||
|
|
||||||
const struct pad_config *variant_gpio_table(size_t *num)
|
const struct pad_config *variant_gpio_table(size_t *num)
|
||||||
{
|
{
|
||||||
|
|
||||||
*num = ARRAY_SIZE(gpio_table);
|
*num = ARRAY_SIZE(gpio_table);
|
||||||
return gpio_table;
|
return gpio_table;
|
||||||
}
|
}
|
||||||
|
@@ -27,11 +27,9 @@ static void hynix_dram_cmos_check(void)
|
|||||||
cmos_bit_set = (byte_value & CMOS_BITMAP_SKIP_RESET_TOGGLE) != 0;
|
cmos_bit_set = (byte_value & CMOS_BITMAP_SKIP_RESET_TOGGLE) != 0;
|
||||||
|
|
||||||
if (CONFIG(BOARD_GOOGLE_FROSTFLOW)) {
|
if (CONFIG(BOARD_GOOGLE_FROSTFLOW)) {
|
||||||
|
|
||||||
printk(BIOS_SPEW, "Checking DRAM part #\n");
|
printk(BIOS_SPEW, "Checking DRAM part #\n");
|
||||||
if (google_chromeec_cbi_get_dram_part_num(
|
if (google_chromeec_cbi_get_dram_part_num(
|
||||||
cbi_part_number, sizeof(cbi_part_number)) == 0) {
|
cbi_part_number, sizeof(cbi_part_number)) == 0) {
|
||||||
|
|
||||||
skip_reset_toggle = strncmp(cbi_part_number, HYNIX_PART_NAME, HYNIX_PART_LEN) == 0;
|
skip_reset_toggle = strncmp(cbi_part_number, HYNIX_PART_NAME, HYNIX_PART_LEN) == 0;
|
||||||
if (skip_reset_toggle) {
|
if (skip_reset_toggle) {
|
||||||
printk(BIOS_SPEW, "SKIP_RESET_TOGGLE needed, checking CMOS bit is set\n");
|
printk(BIOS_SPEW, "SKIP_RESET_TOGGLE needed, checking CMOS bit is set\n");
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
/* GPIO configuration in ramstage */
|
/* GPIO configuration in ramstage */
|
||||||
static const struct soc_amd_gpio override_gpio_table[] = {
|
static const struct soc_amd_gpio override_gpio_table[] = {
|
||||||
|
|
||||||
/* SOC_PEN_DETECT_ODL => Unused */
|
/* SOC_PEN_DETECT_ODL => Unused */
|
||||||
PAD_NC(GPIO_3),
|
PAD_NC(GPIO_3),
|
||||||
/* EN_PWR_FP => Unused */
|
/* EN_PWR_FP => Unused */
|
||||||
|
@@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
/* GPIO configuration in ramstage */
|
/* GPIO configuration in ramstage */
|
||||||
static const struct soc_amd_gpio override_gpio_table[] = {
|
static const struct soc_amd_gpio override_gpio_table[] = {
|
||||||
|
|
||||||
/* SOC_PEN_DETECT_ODL */
|
/* SOC_PEN_DETECT_ODL */
|
||||||
PAD_NC(GPIO_3),
|
PAD_NC(GPIO_3),
|
||||||
|
|
||||||
|
@@ -39,7 +39,6 @@ void bootblock_mainboard_init(void)
|
|||||||
/* Is maskrom parameter address set to a sensible value? */
|
/* Is maskrom parameter address set to a sensible value? */
|
||||||
if ((maskrom_param->start_magic != UBER_SBL_SHARED_INFO_START_MAGIC) ||
|
if ((maskrom_param->start_magic != UBER_SBL_SHARED_INFO_START_MAGIC) ||
|
||||||
(maskrom_param->end_magic != UBER_SBL_SHARED_INFO_END_MAGIC)) {
|
(maskrom_param->end_magic != UBER_SBL_SHARED_INFO_END_MAGIC)) {
|
||||||
|
|
||||||
printk(BIOS_INFO, "Uber-sbl: invalid magic!\n");
|
printk(BIOS_INFO, "Uber-sbl: invalid magic!\n");
|
||||||
} else {
|
} else {
|
||||||
printk(BIOS_INFO, "Uber-sbl version: %s\n",
|
printk(BIOS_INFO, "Uber-sbl version: %s\n",
|
||||||
|
@@ -63,7 +63,6 @@ static void early_ec_init(void)
|
|||||||
|
|
||||||
if (((ec_status & 0x3) == EC_IN_RO_MODE) ||
|
if (((ec_status & 0x3) == EC_IN_RO_MODE) ||
|
||||||
((ec_status & 0x3) == EC_IN_RECOVERY_MODE)) {
|
((ec_status & 0x3) == EC_IN_RECOVERY_MODE)) {
|
||||||
|
|
||||||
printk(BIOS_DEBUG, "EC Cold Boot Detected\n");
|
printk(BIOS_DEBUG, "EC Cold Boot Detected\n");
|
||||||
if (!rec_mode) {
|
if (!rec_mode) {
|
||||||
/*
|
/*
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
void stout_ec_init(void)
|
void stout_ec_init(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
printk(BIOS_DEBUG,"%s: EC FW version %x%x\n", __func__,
|
printk(BIOS_DEBUG,"%s: EC FW version %x%x\n", __func__,
|
||||||
ec_read(EC_FW_VER), ec_read(EC_FW_VER + 1));
|
ec_read(EC_FW_VER), ec_read(EC_FW_VER + 1));
|
||||||
|
|
||||||
|
@@ -57,7 +57,6 @@ static void update_dmic_gpio(void)
|
|||||||
gpio->pins[0] = GPIO_13;
|
gpio->pins[0] = GPIO_13;
|
||||||
else
|
else
|
||||||
gpio->pins[0] = GPIO_6;
|
gpio->pins[0] = GPIO_6;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void variant_audio_update(void)
|
void variant_audio_update(void)
|
||||||
@@ -73,7 +72,6 @@ void variant_audio_update(void)
|
|||||||
*/
|
*/
|
||||||
static void remove_usb_device_reset_gpio(const struct device *usb_dev)
|
static void remove_usb_device_reset_gpio(const struct device *usb_dev)
|
||||||
{
|
{
|
||||||
|
|
||||||
struct drivers_usb_acpi_config *usb_cfg;
|
struct drivers_usb_acpi_config *usb_cfg;
|
||||||
/* config_of dies on failure, so a NULL check is not required */
|
/* config_of dies on failure, so a NULL check is not required */
|
||||||
usb_cfg = config_of(usb_dev);
|
usb_cfg = config_of(usb_dev);
|
||||||
|
@@ -119,7 +119,6 @@ const fsp_dxio_descriptor *baseboard_get_dxio_descriptors(size_t *num)
|
|||||||
*num = ARRAY_SIZE(pco_dxio_descriptors);
|
*num = ARRAY_SIZE(pco_dxio_descriptors);
|
||||||
return pco_dxio_descriptors;
|
return pco_dxio_descriptors;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const fsp_ddi_descriptor pco_ddi_descriptors[] = {
|
static const fsp_ddi_descriptor pco_ddi_descriptors[] = {
|
||||||
|
@@ -193,7 +193,6 @@ static void wifi_power_reset_configure_active_low_power(void)
|
|||||||
PAD_GPO(GPIO_42, LOW),
|
PAD_GPO(GPIO_42, LOW),
|
||||||
};
|
};
|
||||||
gpio_configure_pads(v3_wifi_table, ARRAY_SIZE(v3_wifi_table));
|
gpio_configure_pads(v3_wifi_table, ARRAY_SIZE(v3_wifi_table));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void wifi_power_reset_configure_active_high_power(void)
|
static void wifi_power_reset_configure_active_high_power(void)
|
||||||
@@ -283,7 +282,6 @@ void baseboard_pcie_gpio_configure(void)
|
|||||||
__weak void finalize_gpios(int slp_typ)
|
__weak void finalize_gpios(int slp_typ)
|
||||||
{
|
{
|
||||||
if (variant_has_fingerprint() && slp_typ != ACPI_S3) {
|
if (variant_has_fingerprint() && slp_typ != ACPI_S3) {
|
||||||
|
|
||||||
if (fpmcu_needs_delay())
|
if (fpmcu_needs_delay())
|
||||||
mdelay(550);
|
mdelay(550);
|
||||||
|
|
||||||
|
@@ -35,7 +35,6 @@ void variant_get_dxio_ddi_descriptors(const fsp_dxio_descriptor **dxio_descs,
|
|||||||
const fsp_ddi_descriptor **ddi_descs,
|
const fsp_ddi_descriptor **ddi_descs,
|
||||||
size_t *ddi_num)
|
size_t *ddi_num)
|
||||||
{
|
{
|
||||||
|
|
||||||
*dxio_descs = baseboard_get_dxio_descriptors(dxio_num);
|
*dxio_descs = baseboard_get_dxio_descriptors(dxio_num);
|
||||||
*ddi_descs = &non_hdmi_ddi_descriptors[0];
|
*ddi_descs = &non_hdmi_ddi_descriptors[0];
|
||||||
*ddi_num = ARRAY_SIZE(non_hdmi_ddi_descriptors);
|
*ddi_num = ARRAY_SIZE(non_hdmi_ddi_descriptors);
|
||||||
|
@@ -35,7 +35,6 @@ void variant_get_dxio_ddi_descriptors(const fsp_dxio_descriptor **dxio_descs,
|
|||||||
const fsp_ddi_descriptor **ddi_descs,
|
const fsp_ddi_descriptor **ddi_descs,
|
||||||
size_t *ddi_num)
|
size_t *ddi_num)
|
||||||
{
|
{
|
||||||
|
|
||||||
*dxio_descs = baseboard_get_dxio_descriptors(dxio_num);
|
*dxio_descs = baseboard_get_dxio_descriptors(dxio_num);
|
||||||
*ddi_descs = &non_hdmi_ddi_descriptors[0];
|
*ddi_descs = &non_hdmi_ddi_descriptors[0];
|
||||||
*ddi_num = ARRAY_SIZE(non_hdmi_ddi_descriptors);
|
*ddi_num = ARRAY_SIZE(non_hdmi_ddi_descriptors);
|
||||||
|
Reference in New Issue
Block a user