Yidi Lin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85968?usp=email )
(
2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: soc/mediatek: Rename is_pmif_init_done to check_init_done ......................................................................
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 --- M src/soc/mediatek/common/include/soc/pmif_common.h M src/soc/mediatek/common/mt6315.c M src/soc/mediatek/common/mt6316.c M src/soc/mediatek/common/mt6359p.c M src/soc/mediatek/common/mt6363.c M src/soc/mediatek/common/mt6373.c M src/soc/mediatek/common/mt6685.c M src/soc/mediatek/common/pmif_init.c M src/soc/mediatek/common/pmif_spmi.c M src/soc/mediatek/mt8196/pmif_init.c M src/soc/mediatek/mt8196/pmif_spmi.c 11 files changed, 17 insertions(+), 17 deletions(-)
Approvals: build bot (Jenkins): Verified Yu-Ping Wu: Looks good to me, approved
diff --git a/src/soc/mediatek/common/include/soc/pmif_common.h b/src/soc/mediatek/common/include/soc/pmif_common.h index 949b34f..b9cee91 100644 --- a/src/soc/mediatek/common/include/soc/pmif_common.h +++ b/src/soc/mediatek/common/include/soc/pmif_common.h @@ -34,7 +34,7 @@ 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 { diff --git a/src/soc/mediatek/common/mt6315.c b/src/soc/mediatek/common/mt6315.c index 7862c59..35567d1 100644 --- a/src/soc/mediatek/common/mt6315.c +++ b/src/soc/mediatek/common/mt6315.c @@ -91,7 +91,7 @@ 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"); }
diff --git a/src/soc/mediatek/common/mt6316.c b/src/soc/mediatek/common/mt6316.c index b7242fd..89c8c83 100644 --- a/src/soc/mediatek/common/mt6316.c +++ b/src/soc/mediatek/common/mt6316.c @@ -177,7 +177,7 @@ 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++) diff --git a/src/soc/mediatek/common/mt6359p.c b/src/soc/mediatek/common/mt6359p.c index fc7c677..530f4d1 100644 --- a/src/soc/mediatek/common/mt6359p.c +++ b/src/soc/mediatek/common/mt6359p.c @@ -337,7 +337,7 @@ 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"); }
diff --git a/src/soc/mediatek/common/mt6363.c b/src/soc/mediatek/common/mt6363.c index ba96163..220a7ce 100644 --- a/src/soc/mediatek/common/mt6363.c +++ b/src/soc/mediatek/common/mt6363.c @@ -267,7 +267,7 @@ 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__, diff --git a/src/soc/mediatek/common/mt6373.c b/src/soc/mediatek/common/mt6373.c index 8dca0a0..315f19b 100644 --- a/src/soc/mediatek/common/mt6373.c +++ b/src/soc/mediatek/common/mt6373.c @@ -247,7 +247,7 @@ 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", diff --git a/src/soc/mediatek/common/mt6685.c b/src/soc/mediatek/common/mt6685.c index 81ee6c6..7d17556 100644 --- a/src/soc/mediatek/common/mt6685.c +++ b/src/soc/mediatek/common/mt6685.c @@ -86,7 +86,7 @@ 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)); diff --git a/src/soc/mediatek/common/pmif_init.c b/src/soc/mediatek/common/pmif_init.c index 73b22cf..1425081 100644 --- a/src/soc/mediatek/common/pmif_init.c +++ b/src/soc/mediatek/common/pmif_init.c @@ -17,7 +17,7 @@ .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 @@ .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, }, };
diff --git a/src/soc/mediatek/common/pmif_spmi.c b/src/soc/mediatek/common/pmif_spmi.c index 7263ff2..0de4df0 100644 --- a/src/soc/mediatek/common/pmif_spmi.c +++ b/src/soc/mediatek/common/pmif_spmi.c @@ -152,12 +152,12 @@
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; }
diff --git a/src/soc/mediatek/mt8196/pmif_init.c b/src/soc/mediatek/mt8196/pmif_init.c index 0baf720..a6151bb 100644 --- a/src/soc/mediatek/mt8196/pmif_init.c +++ b/src/soc/mediatek/mt8196/pmif_init.c @@ -24,7 +24,7 @@ .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 @@ .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 @@ .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 @@ .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, }, };
diff --git a/src/soc/mediatek/mt8196/pmif_spmi.c b/src/soc/mediatek/mt8196/pmif_spmi.c index e646816..c4a984f 100644 --- a/src/soc/mediatek/mt8196/pmif_spmi.c +++ b/src/soc/mediatek/mt8196/pmif_spmi.c @@ -337,12 +337,12 @@
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; }
-
Yidi Lin (Code Review)