From 1543252e5fcc0de821a5f6de38b10ed31b0cb920 Mon Sep 17 00:00:00 2001 From: Rex-BC Chen Date: Wed, 19 Oct 2022 19:00:22 +0800 Subject: [PATCH] soc/mediatek/mt8186: Add PMIF_SPMI_IOCFG_DEFAULT_SETTING Kconfig option For MT8186, PMIF_SPMI mode is the hardware default setting, so we don't need to configure PMIF SPMI IO pins. Add a config to control that. BUG=b:249436110 TEST=build pass. BRANCH=corsola Signed-off-by: Bo-Chen Chen Change-Id: I92b54e8379a5dec55ef95cbd72ce03abd3a4954b Reviewed-on: https://review.coreboot.org/c/coreboot/+/68578 Reviewed-by: Yu-Ping Wu Reviewed-by: Yidi Lin Tested-by: build bot (Jenkins) --- src/soc/mediatek/common/Kconfig | 7 +++++++ src/soc/mediatek/common/pmif_spmi.c | 3 ++- src/soc/mediatek/mt8186/Kconfig | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/soc/mediatek/common/Kconfig b/src/soc/mediatek/common/Kconfig index ce9f883356..62934dab05 100644 --- a/src/soc/mediatek/common/Kconfig +++ b/src/soc/mediatek/common/Kconfig @@ -70,4 +70,11 @@ config PWRAP_WITH_PMIF_SPMI When this option is enabled, the PMIC interface only supports PWRAP and PMIF_SPMI. +config PMIF_SPMI_IOCFG_DEFAULT_SETTING + bool + default n + help + For SoCs where IO pins default to PMIF_SPMI mode, enable this option + to skip software PMIF_SPMI IO pins configuration. + endif diff --git a/src/soc/mediatek/common/pmif_spmi.c b/src/soc/mediatek/common/pmif_spmi.c index 8ff7c1e82d..afeeddf515 100644 --- a/src/soc/mediatek/common/pmif_spmi.c +++ b/src/soc/mediatek/common/pmif_spmi.c @@ -82,7 +82,8 @@ static int spmi_mst_init(struct pmif *pmif_arb) return -E_INVAL; } - pmif_spmi_iocfg(); + if (!CONFIG(PMIF_SPMI_IOCFG_DEFAULT_SETTING)) + pmif_spmi_iocfg(); spmi_config_master(); for (i = 0; i < spmi_dev_cnt; i++) diff --git a/src/soc/mediatek/mt8186/Kconfig b/src/soc/mediatek/mt8186/Kconfig index bac220e89e..e6cdb00bfe 100644 --- a/src/soc/mediatek/mt8186/Kconfig +++ b/src/soc/mediatek/mt8186/Kconfig @@ -13,6 +13,7 @@ config SOC_MEDIATEK_MT8186 select USE_CBMEM_DRAM_INFO select FLASH_DUAL_IO_READ select PWRAP_WITH_PMIF_SPMI + select PMIF_SPMI_IOCFG_DEFAULT_SETTING if SOC_MEDIATEK_MT8186