summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/mediatek/common/Kconfig7
-rw-r--r--src/soc/mediatek/common/pmif_spmi.c3
-rw-r--r--src/soc/mediatek/mt8186/Kconfig1
3 files changed, 10 insertions, 1 deletions
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