diff options
| -rw-r--r-- | src/soc/mediatek/common/include/soc/pmif_spmi.h | 8 | ||||
| -rw-r--r-- | src/soc/mediatek/common/mt6315.c | 9 | ||||
| -rw-r--r-- | src/soc/mediatek/common/pmif_spmi.c | 17 | ||||
| -rw-r--r-- | src/soc/mediatek/mt8192/include/soc/pmif.h | 4 | ||||
| -rw-r--r-- | src/soc/mediatek/mt8192/pmif_spmi.c | 15 | ||||
| -rw-r--r-- | src/soc/mediatek/mt8195/include/soc/pmif.h | 4 | ||||
| -rw-r--r-- | src/soc/mediatek/mt8195/pmif_spmi.c | 15 |
7 files changed, 51 insertions, 21 deletions
diff --git a/src/soc/mediatek/common/include/soc/pmif_spmi.h b/src/soc/mediatek/common/include/soc/pmif_spmi.h index b6088b8e9b96..0f79ad4eb968 100644 --- a/src/soc/mediatek/common/include/soc/pmif_spmi.h +++ b/src/soc/mediatek/common/include/soc/pmif_spmi.h @@ -5,14 +5,11 @@ #include <soc/addressmap.h> #include <soc/pmif.h> +#include <soc/spmi.h> #define DEFAULT_VALUE_READ_TEST (0x5a) #define DEFAULT_VALUE_WRITE_TEST (0xa5) -/* indicate which number SW channel start, by project */ -#define PMIF_SPMI_SW_CHAN BIT(6) -#define PMIF_SPMI_INF 0x2F7 - struct mtk_rgu_regs { u32 reserved[36]; u32 wdt_swsysrst2; @@ -82,6 +79,9 @@ enum { #define MT6315_DEFAULT_VALUE_READ 0x15 +extern const struct spmi_device spmi_dev[]; +extern const size_t spmi_dev_cnt; + int pmif_spmi_init(struct pmif *arb); int spmi_config_master(void); void pmif_spmi_iocfg(void); diff --git a/src/soc/mediatek/common/mt6315.c b/src/soc/mediatek/common/mt6315.c index 928d5499be07..aebbd4c8a50a 100644 --- a/src/soc/mediatek/common/mt6315.c +++ b/src/soc/mediatek/common/mt6315.c @@ -4,6 +4,7 @@ #include <delay.h> #include <soc/mt6315.h> #include <soc/pmif.h> +#include <soc/pmif_spmi.h> static struct pmif *pmif_arb = NULL; @@ -95,8 +96,12 @@ static void init_pmif_arb(void) void mt6315_init(void) { + size_t i; + init_pmif_arb(); - mt6315_wdt_enable(MT6315_CPU); - mt6315_wdt_enable(MT6315_GPU); + + for (i = 0; i < spmi_dev_cnt; i++) + mt6315_wdt_enable(spmi_dev[i].slvid); + mt6315_init_setting(); } diff --git a/src/soc/mediatek/common/pmif_spmi.c b/src/soc/mediatek/common/pmif_spmi.c index b9e70b3c2379..8ff7c1e82dc6 100644 --- a/src/soc/mediatek/common/pmif_spmi.c +++ b/src/soc/mediatek/common/pmif_spmi.c @@ -25,19 +25,6 @@ DEFINE_BIT(SPI_EINT_MODE_GATING_EN, 13) DEFINE_BITFIELD(SPM_SLEEP_REQ_SEL, 1, 0) DEFINE_BITFIELD(SCP_SLEEP_REQ_SEL, 10, 9) -static const struct spmi_device spmi_dev[] = { - { - .slvid = SPMI_SLAVE_6, - .type = BUCK_CPU, - .type_id = BUCK_CPU_ID, - }, - { - .slvid = SPMI_SLAVE_7, - .type = BUCK_GPU, - .type_id = BUCK_GPU_ID, - }, -}; - static int spmi_read_check(struct pmif *pmif_arb, int slvid) { u32 rdata = 0; @@ -88,7 +75,7 @@ static int spmi_cali_rd_clock_polarity(struct pmif *pmif_arb, const struct spmi_ static int spmi_mst_init(struct pmif *pmif_arb) { - int i; + size_t i; if (!pmif_arb) { printk(BIOS_ERR, "%s: null pointer for pmif dev.\n", __func__); @@ -98,7 +85,7 @@ static int spmi_mst_init(struct pmif *pmif_arb) pmif_spmi_iocfg(); spmi_config_master(); - for (i = 0; i < ARRAY_SIZE(spmi_dev); i++) + for (i = 0; i < spmi_dev_cnt; i++) spmi_cali_rd_clock_polarity(pmif_arb, &spmi_dev[i]); return 0; diff --git a/src/soc/mediatek/mt8192/include/soc/pmif.h b/src/soc/mediatek/mt8192/include/soc/pmif.h index 6c92f67733bd..d8d01015241a 100644 --- a/src/soc/mediatek/mt8192/include/soc/pmif.h +++ b/src/soc/mediatek/mt8192/include/soc/pmif.h @@ -7,6 +7,10 @@ #include <soc/pmif_common.h> #include <types.h> +/* indicate which number SW channel start, by project */ +#define PMIF_SPMI_SW_CHAN BIT(6) +#define PMIF_SPMI_INF 0x2F7 + struct mtk_pmif_regs { u32 init_done; u32 reserved1[5]; diff --git a/src/soc/mediatek/mt8192/pmif_spmi.c b/src/soc/mediatek/mt8192/pmif_spmi.c index a68f235382d8..1862af5408c1 100644 --- a/src/soc/mediatek/mt8192/pmif_spmi.c +++ b/src/soc/mediatek/mt8192/pmif_spmi.c @@ -21,6 +21,21 @@ DEFINE_BIT(PDN_SPMI_MST, 15) /* TOPCKGEN, CLK_CFG_UPDATE2 */ DEFINE_BIT(SPMI_MST_CK_UPDATE, 30) +const struct spmi_device spmi_dev[] = { + { + .slvid = SPMI_SLAVE_6, + .type = BUCK_CPU, + .type_id = BUCK_CPU_ID, + }, + { + .slvid = SPMI_SLAVE_7, + .type = BUCK_GPU, + .type_id = BUCK_GPU_ID, + }, +}; + +const size_t spmi_dev_cnt = ARRAY_SIZE(spmi_dev); + int spmi_config_master(void) { /* Software reset */ diff --git a/src/soc/mediatek/mt8195/include/soc/pmif.h b/src/soc/mediatek/mt8195/include/soc/pmif.h index 992549f094ee..94ea6c8c920c 100644 --- a/src/soc/mediatek/mt8195/include/soc/pmif.h +++ b/src/soc/mediatek/mt8195/include/soc/pmif.h @@ -7,6 +7,10 @@ #include <soc/pmif_common.h> #include <types.h> +/* indicate which number SW channel start, by project */ +#define PMIF_SPMI_SW_CHAN BIT(6) +#define PMIF_SPMI_INF 0x2F7 + struct mtk_pmif_regs { u32 init_done; u32 reserved1[5]; diff --git a/src/soc/mediatek/mt8195/pmif_spmi.c b/src/soc/mediatek/mt8195/pmif_spmi.c index 7323d056f963..6883dd2f3a31 100644 --- a/src/soc/mediatek/mt8195/pmif_spmi.c +++ b/src/soc/mediatek/mt8195/pmif_spmi.c @@ -30,6 +30,21 @@ DEFINE_BIT(PDN_SPMI_MST, 15) /* TOPCKGEN, CLK_CFG_UPDATE2 */ DEFINE_BIT(SPMI_MST_CK_UPDATE, 5) +const struct spmi_device spmi_dev[] = { + { + .slvid = SPMI_SLAVE_6, + .type = BUCK_CPU, + .type_id = BUCK_CPU_ID, + }, + { + .slvid = SPMI_SLAVE_7, + .type = BUCK_GPU, + .type_id = BUCK_GPU_ID, + }, +}; + +const size_t spmi_dev_cnt = ARRAY_SIZE(spmi_dev); + int spmi_config_master(void) { /* Software reset */ |