soc/mediatek: Rename is_pmif_init_done to check_init_done
TEST=emerge-geralt coreboot && emerge-rauru coreboot Change-Id: Ib4b9a7969f5af6e001c5b491ec09a43e1289a6ae Signed-off-by: Yidi Lin <yidilin@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/85968 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Yu-Ping Wu <yupingso@google.com>
This commit is contained in:
parent
cb4c52d620
commit
f51c279d7c
11 changed files with 17 additions and 17 deletions
|
|
@ -34,7 +34,7 @@ struct pmif {
|
|||
void (*write16)(struct pmif *arb, u32 slvid, u32 reg, u16 data);
|
||||
u32 (*read_field)(struct pmif *arb, u32 slvid, u32 reg, u32 mask, u32 shift);
|
||||
void (*write_field)(struct pmif *arb, u32 slvid, u32 reg, u32 val, u32 mask, u32 shift);
|
||||
int (*is_pmif_init_done)(struct pmif *arb);
|
||||
int (*check_init_done)(struct pmif *arb);
|
||||
};
|
||||
|
||||
enum {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ static void init_pmif_arb(void)
|
|||
pmif_arb = get_pmif_controller(PMIF_SPMI, 0);
|
||||
assert(pmif_arb);
|
||||
|
||||
if (pmif_arb->is_pmif_init_done(pmif_arb))
|
||||
if (pmif_arb->check_init_done(pmif_arb))
|
||||
die("ERROR - Failed to initialize pmif spmi");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ static void init_pmif_arb(void)
|
|||
pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_0);
|
||||
assert(pmif_arb);
|
||||
|
||||
if (pmif_arb->is_pmif_init_done(pmif_arb))
|
||||
if (pmif_arb->check_init_done(pmif_arb))
|
||||
die("ERROR - Failed to initialize pmif spmi");
|
||||
|
||||
for (int i = 0; i < ARRAY_SIZE(mt6316_slave_id); i++)
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@ void mt6359p_init_pmif_arb(void)
|
|||
pmif_arb = get_pmif_controller(PMIF_SPI, 0);
|
||||
assert(pmif_arb);
|
||||
|
||||
if (pmif_arb->is_pmif_init_done(pmif_arb))
|
||||
if (pmif_arb->check_init_done(pmif_arb))
|
||||
die("ERROR - Failed to initialize pmif spi");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@ void mt6363_init_pmif_arb(void)
|
|||
pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_1);
|
||||
assert(pmif_arb);
|
||||
|
||||
if (pmif_arb->is_pmif_init_done(pmif_arb))
|
||||
if (pmif_arb->check_init_done(pmif_arb))
|
||||
die("ERROR - Failed to initialize pmif spi");
|
||||
|
||||
printk(BIOS_INFO, "[%s][MT6363]CHIP ID = 0x%x\n", __func__,
|
||||
|
|
|
|||
|
|
@ -247,7 +247,7 @@ void mt6373_init_pmif_arb(void)
|
|||
pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_1);
|
||||
assert(pmif_arb);
|
||||
|
||||
if (pmif_arb->is_pmif_init_done(pmif_arb))
|
||||
if (pmif_arb->check_init_done(pmif_arb))
|
||||
die("%s: initialization failed", __func__);
|
||||
|
||||
printk(BIOS_INFO, "[%s][MT6373]CHIP ID = 0x%x\n",
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ void mt6685_init_pmif_arb(void)
|
|||
pmif_arb = get_pmif_controller(PMIF_SPMI, SPMI_MASTER_1);
|
||||
assert(pmif_arb);
|
||||
|
||||
if (pmif_arb->is_pmif_init_done(pmif_arb))
|
||||
if (pmif_arb->check_init_done(pmif_arb))
|
||||
die("ERROR - Failed to initialize pmif spi");
|
||||
|
||||
printk(BIOS_INFO, "[%s]CHIP ID = %#x\n", __func__, mt6685_read_field(0xb, 0xFF, 0));
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ const struct pmif pmif_spmi_arb[] = {
|
|||
.read = pmif_spmi_read,
|
||||
.write_field = pmif_spmi_write_field,
|
||||
.read_field = pmif_spmi_read_field,
|
||||
.is_pmif_init_done = pmif_check_init_done,
|
||||
.check_init_done = pmif_check_init_done,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ const struct pmif pmif_spi_arb[] = {
|
|||
.read = pmif_spi_read,
|
||||
.write_field = pmif_spi_write_field,
|
||||
.read_field = pmif_spi_read_field,
|
||||
.is_pmif_init_done = pmif_check_init_done,
|
||||
.check_init_done = pmif_check_init_done,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -152,12 +152,12 @@ static void pmif_spmi_enable(struct pmif *arb)
|
|||
|
||||
int pmif_spmi_init(struct pmif *arb)
|
||||
{
|
||||
if (arb->is_pmif_init_done(arb) != 0) {
|
||||
if (arb->check_init_done(arb) != 0) {
|
||||
pmif_spmi_force_normal_mode(arb);
|
||||
pmif_spmi_enable_swinf(arb);
|
||||
pmif_spmi_enable_cmdIssue(arb, true);
|
||||
pmif_spmi_enable(arb);
|
||||
if (arb->is_pmif_init_done(arb))
|
||||
if (arb->check_init_done(arb))
|
||||
return -E_NODEV;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ const struct pmif pmif_spmi_arb[] = {
|
|||
.read16 = pmif_spmi_read16,
|
||||
.write_field = pmif_spmi_write_field,
|
||||
.read_field = pmif_spmi_read_field,
|
||||
.is_pmif_init_done = pmif_check_init_done,
|
||||
.check_init_done = pmif_check_init_done,
|
||||
}, {
|
||||
.mtk_pmif = (struct mtk_pmif_regs *)PMIF_SPMI_BASE,
|
||||
.ch = (struct chan_regs *)PMIF_SPMI_AP_CHAN,
|
||||
|
|
@ -36,7 +36,7 @@ const struct pmif pmif_spmi_arb[] = {
|
|||
.read16 = pmif_spmi_read16,
|
||||
.write_field = pmif_spmi_write_field,
|
||||
.read_field = pmif_spmi_read_field,
|
||||
.is_pmif_init_done = pmif_check_init_done,
|
||||
.check_init_done = pmif_check_init_done,
|
||||
}, {
|
||||
.mtk_pmif = (struct mtk_pmif_regs *)PMIF_SPMI_P_BASE,
|
||||
.ch = (struct chan_regs *)PMIF_SPMI_AP_CHAN_P,
|
||||
|
|
@ -48,7 +48,7 @@ const struct pmif pmif_spmi_arb[] = {
|
|||
.read16 = pmif_spmi_read16,
|
||||
.write_field = pmif_spmi_write_field,
|
||||
.read_field = pmif_spmi_read_field,
|
||||
.is_pmif_init_done = pmif_check_init_done,
|
||||
.check_init_done = pmif_check_init_done,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -63,7 +63,7 @@ const struct pmif pmif_spi_arb[] = {
|
|||
.read = pmif_spi_read,
|
||||
.write_field = pmif_spi_write_field,
|
||||
.read_field = pmif_spi_read_field,
|
||||
.is_pmif_init_done = pmif_check_init_done,
|
||||
.check_init_done = pmif_check_init_done,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -337,12 +337,12 @@ static void pmif_spmi_enable(struct pmif *arb)
|
|||
|
||||
int pmif_spmi_init(struct pmif *arb)
|
||||
{
|
||||
if (arb->is_pmif_init_done(arb) != 0) {
|
||||
if (arb->check_init_done(arb) != 0) {
|
||||
pmif_spmi_force_normal_mode(arb);
|
||||
pmif_spmi_enable_swinf(arb);
|
||||
pmif_spmi_enable_cmd_issue(arb, true);
|
||||
pmif_spmi_enable(arb);
|
||||
if (arb->is_pmif_init_done(arb))
|
||||
if (arb->check_init_done(arb))
|
||||
return -E_NODEV;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue