diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainboard/google/geralt/mainboard.c | 3 | ||||
| -rw-r--r-- | src/soc/mediatek/common/include/soc/mt6359p.h | 1 | ||||
| -rw-r--r-- | src/soc/mediatek/common/mt6359p.c | 4 | ||||
| -rw-r--r-- | src/soc/mediatek/mt8188/msdc.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/mainboard/google/geralt/mainboard.c b/src/mainboard/google/geralt/mainboard.c index ff893e0aaa..ee8b005d3e 100644 --- a/src/mainboard/google/geralt/mainboard.c +++ b/src/mainboard/google/geralt/mainboard.c @@ -4,6 +4,7 @@ #include <device/device.h> #include <soc/bl31.h> #include <soc/msdc.h> +#include <soc/mt6359p.h> #include <soc/usb.h> #include "display.h" @@ -11,6 +12,8 @@ static void mainboard_init(struct device *dev) { + mt6359p_init_pmif_arb(); + if (display_init_required()) { if (configure_display() < 0) printk(BIOS_ERR, "%s: Failed to init display\n", __func__); diff --git a/src/soc/mediatek/common/include/soc/mt6359p.h b/src/soc/mediatek/common/include/soc/mt6359p.h index 4bb62496aa..55a1a4d835 100644 --- a/src/soc/mediatek/common/include/soc/mt6359p.h +++ b/src/soc/mediatek/common/include/soc/mt6359p.h @@ -87,6 +87,7 @@ u32 mt6359p_get_vsim1_voltage(void); void mt6359p_enable_vpa(bool enable); void mt6359p_enable_vsim1(bool enable); void mt6359p_enable_vm18(bool enable); +void mt6359p_init_pmif_arb(void); void mt6359p_write_field(u32 reg, u32 val, u32 mask, u32 shift); void pmic_init_setting(void); void pmic_lp_setting(void); diff --git a/src/soc/mediatek/common/mt6359p.c b/src/soc/mediatek/common/mt6359p.c index 78af34e1eb..47c46d0579 100644 --- a/src/soc/mediatek/common/mt6359p.c +++ b/src/soc/mediatek/common/mt6359p.c @@ -329,7 +329,7 @@ void mt6359p_enable_vm18(bool enable) mt6359p_write_field(PMIC_VM18_CON0, enable, 0x1, 0); } -static void init_pmif_arb(void) +void mt6359p_init_pmif_arb(void) { if (!pmif_arb) { pmif_arb = get_pmif_controller(PMIF_SPI, 0); @@ -343,7 +343,7 @@ static void init_pmif_arb(void) void mt6359p_init(void) { - init_pmif_arb(); + mt6359p_init_pmif_arb(); pmic_set_power_hold(); pmic_wdt_set(); pmic_protect_key_setting(false); diff --git a/src/soc/mediatek/mt8188/msdc.c b/src/soc/mediatek/mt8188/msdc.c index 37a96a736c..3aff5e9340 100644 --- a/src/soc/mediatek/mt8188/msdc.c +++ b/src/soc/mediatek/mt8188/msdc.c @@ -10,7 +10,6 @@ #include <soc/addressmap.h> #include <soc/regulator.h> #include <soc/msdc.h> -#include <soc/mt6359p.h> DEFINE_BITFIELD(MSDC0_DRV_0, 29, 18) DEFINE_BITFIELD(MSDC0_DRV_1, 17, 0) @@ -107,7 +106,6 @@ void mtk_msdc_configure_sdcard(void) MSDC1_GPIO_MODE1_0, MSDC1_GPIO_MODE1_VALUE); /* enable SD card power */ - mt6359p_init(); mainboard_enable_regulator(MTK_REGULATOR_VMCH, true); mainboard_enable_regulator(MTK_REGULATOR_VMC, true); mainboard_set_regulator_voltage(MTK_REGULATOR_VMCH, 3000000); |