Change in coreboot[master]: soc/mediatek: move bustracker_init before watchdog reset again

[Rex-BC Chen (Code Review)]

Rex-BC Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59667 )

Change subject: soc/mediatek: move bustracker_init before watchdog reset again
......................................................................

soc/mediatek: move bustracker_init before watchdog reset again

The checking register will be cleared after resetting, so we move
bustracker dump before resetting again.

TEST=bustracker shows status before wdt reset
BUG=b:207450135

Signed-off-by: Rex-BC Chen 
Change-Id: Ic18dc9742cd9f657a035a374e28371dfc5f04ac3
---
M src/soc/mediatek/mt8192/Makefile.inc
M src/soc/mediatek/mt8192/bootblock.c
M src/soc/mediatek/mt8192/soc.c
M src/soc/mediatek/mt8195/Makefile.inc
M src/soc/mediatek/mt8195/bootblock.c
M src/soc/mediatek/mt8195/soc.c
6 files changed, 7 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/59667/1

diff --git a/src/soc/mediatek/mt8192/Makefile.inc b/src/soc/mediatek/mt8192/Makefile.inc
index a75ac28..b04acb5 100644
--- a/src/soc/mediatek/mt8192/Makefile.inc
+++ b/src/soc/mediatek/mt8192/Makefile.inc
@@ -10,6 +10,7 @@
 bootblock-y += ../common/pll.c pll.c
 bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
 bootblock-y += ../common/timer.c
+bootblock-y += ../common/tracker.c
 bootblock-y += ../common/uart.c
 bootblock-y += ../common/wdt.c

@@ -63,7 +64,6 @@
 ramstage-y += soc.c
 ramstage-y += ../common/spm.c spm.c
 ramstage-y += ../common/sspm.c
-ramstage-y += ../common/tracker.c
 ramstage-y += ../common/timer.c
 ramstage-y += ../common/uart.c
 ramstage-y += ../common/ufs.c
diff --git a/src/soc/mediatek/mt8192/bootblock.c b/src/soc/mediatek/mt8192/bootblock.c
index 17fd27e..3adf5c1 100644
--- a/src/soc/mediatek/mt8192/bootblock.c
+++ b/src/soc/mediatek/mt8192/bootblock.c
@@ -4,11 +4,13 @@
 #include <soc/eint_event.h>
 #include <soc/mmu_operations.h>
 #include <soc/pll.h>
+#include <soc/tracker_common.h>
 #include <soc/wdt.h>

void bootblock_soc_init(void)
 {
    mtk_mmu_init();
+	bustracker_init();
    mtk_wdt_init();
    mt_pll_init();
    unmask_eint_event_mask();
diff --git a/src/soc/mediatek/mt8192/soc.c b/src/soc/mediatek/mt8192/soc.c
index 355827a..006a212 100644
--- a/src/soc/mediatek/mt8192/soc.c
+++ b/src/soc/mediatek/mt8192/soc.c
@@ -9,7 +9,6 @@
 #include <soc/mcupm.h>
 #include <soc/mmu_operations.h>
 #include <soc/sspm.h>
-#include <soc/tracker_common.h>
 #include <soc/ufs.h>
 #include <symbols.h>

@@ -34,7 +33,6 @@
    if (CONFIG(MTK_DFD))
    	dfd_init();
    ufs_disable_refclk();
-	bustracker_init();
 }

static struct device_operations soc_ops = {
diff --git a/src/soc/mediatek/mt8195/Makefile.inc b/src/soc/mediatek/mt8195/Makefile.inc
index c6f4226..a7ada28 100644
--- a/src/soc/mediatek/mt8195/Makefile.inc
+++ b/src/soc/mediatek/mt8195/Makefile.inc
@@ -7,6 +7,7 @@
 bootblock-y += ../common/gpio.c gpio.c
 bootblock-y += ../common/i2c.c i2c.c
 bootblock-y += ../common/mmu_operations.c
+bootblock-y += ../common/tracker.c
 bootblock-y += ../common/pll.c pll.c
 bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
 bootblock-y += ../common/timer.c timer.c
@@ -50,7 +51,7 @@
 romstage-y += mt6691.c
 romstage-y += mt6360.c
 romstage-y += ../common/rtc.c ../common/rtc_osc_init.c ../common/rtc_mt6359p.c
-ramstage-y += ../common/tracker.c
+
 ramstage-y += ../common/auxadc.c
 ramstage-y += ../common/ddp.c ddp.c
 ramstage-y += devapc.c
diff --git a/src/soc/mediatek/mt8195/bootblock.c b/src/soc/mediatek/mt8195/bootblock.c
index 17fd27e..3adf5c1 100644
--- a/src/soc/mediatek/mt8195/bootblock.c
+++ b/src/soc/mediatek/mt8195/bootblock.c
@@ -4,11 +4,13 @@
 #include <soc/eint_event.h>
 #include <soc/mmu_operations.h>
 #include <soc/pll.h>
+#include <soc/tracker_common.h>
 #include <soc/wdt.h>

void bootblock_soc_init(void)
 {
    mtk_mmu_init();
+	bustracker_init();
    mtk_wdt_init();
    mt_pll_init();
    unmask_eint_event_mask();
diff --git a/src/soc/mediatek/mt8195/soc.c b/src/soc/mediatek/mt8195/soc.c
index 80ca3d9..d28f668 100644
--- a/src/soc/mediatek/mt8195/soc.c
+++ b/src/soc/mediatek/mt8195/soc.c
@@ -10,7 +10,6 @@
 #include <soc/mcupm.h>
 #include <soc/mmu_operations.h>
 #include <soc/sspm.h>
-#include <soc/tracker_common.h>
 #include <soc/ufs.h>
 #include <symbols.h>

@@ -38,7 +37,6 @@

ufs_disable_refclk();
    hdmi_low_power_setting();
-	bustracker_init();
 }

static struct device_operations soc_ops = {