[Feature][T8TSK-304] merge mtk official patch 5th AP patch release
--bsp,kernel part
Only Configure: No
Affected branch: N/A
Affected module: N/A
Is it affected on both ZXIC and MTK: only MTK
Self-test: Yes
Doc Update: No
Change-Id: I178a62705346db5188af3159e31f660d27c6df35
diff --git a/src/kernel/linux/v4.19/drivers/soc/mediatek/mtk-scpsys.c b/src/kernel/linux/v4.19/drivers/soc/mediatek/mtk-scpsys.c
index 6846443..92ead56 100755
--- a/src/kernel/linux/v4.19/drivers/soc/mediatek/mtk-scpsys.c
+++ b/src/kernel/linux/v4.19/drivers/soc/mediatek/mtk-scpsys.c
@@ -1398,7 +1398,7 @@
for (i = 0; i < num; i++) {
struct scp_domain *scpd = &scp->domains[i];
struct generic_pm_domain *genpd = &scpd->genpd;
- bool on;//jb.qi change for reboot after sleep on 20230417
+ bool on;
/*
* Initially turn on the domains to make the domains usable
* with !CONFIG_PM and to get the hardware in sync with the
@@ -1407,7 +1407,6 @@
* Power on the ssusb/netsys/connectivity by default to let each driver
* disable the clock in case of no usage.
*/
- /*jb.qi change for reboot after sleep on 20230417 start*/
if (strcmp(genpd->name, "ssusb_phy") == 0 ||
strcmp(genpd->name, "netsys") == 0 ||
strcmp(genpd->name, "conn") == 0) {
@@ -1424,7 +1423,6 @@
}
pm_genpd_init(genpd, NULL, !on);
- /*jb.qi change for reboot after sleep on 20230417 end*/
}
/*
@@ -1727,12 +1725,10 @@
.sram_pdn_ack_bits = GENMASK(12, 12),
.basic_clk_name = {"audio"},
.caps = MTK_SCPD_STRICT_BUSP,
- /*jb.qi change for reboot after sleep on 20230417 start*/
.bp_table = {
BUS_PROT(IFR_TYPE, MT6779_IFR_SET, MT6779_IFR_CLR,
0, MT6779_IFR_STA1, BIT(31), BIT(31), 0),
},
- /*jb.qi change for reboot after sleep on 20230417 end*/
},
[MT6779_POWER_DOMAIN_MM] = {