Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

soc: mediatek: avoid hardcoded value with bus_prot_mask

use a meaningful definition for bus_prot_mask instead of just hardcoded
for it.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

authored by

Sean Wang and committed by
Matthias Brugger
c59c9c85 0c1a2c17

+7 -2
+3 -2
drivers/soc/mediatek/mtk-scpsys.c
··· 518 518 .name = "conn", 519 519 .sta_mask = PWR_STATUS_CONN, 520 520 .ctl_offs = SPM_CONN_PWR_CON, 521 - .bus_prot_mask = 0x0104, 521 + .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_CONN_M | 522 + MT2701_TOP_AXI_PROT_EN_CONN_S, 522 523 .clk_id = {CLK_NONE}, 523 524 .active_wakeup = true, 524 525 }, ··· 529 528 .ctl_offs = SPM_DIS_PWR_CON, 530 529 .sram_pdn_bits = GENMASK(11, 8), 531 530 .clk_id = {CLK_MM}, 532 - .bus_prot_mask = 0x0002, 531 + .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0, 533 532 .active_wakeup = true, 534 533 }, 535 534 [MT2701_POWER_DOMAIN_MFG] = {
+4
include/linux/soc/mediatek/infracfg.h
··· 21 21 #define MT8173_TOP_AXI_PROT_EN_MFG_M1 BIT(22) 22 22 #define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT BIT(23) 23 23 24 + #define MT2701_TOP_AXI_PROT_EN_MM_M0 BIT(1) 25 + #define MT2701_TOP_AXI_PROT_EN_CONN_M BIT(2) 26 + #define MT2701_TOP_AXI_PROT_EN_CONN_S BIT(8) 27 + 24 28 #define MT7622_TOP_AXI_PROT_EN_ETHSYS (BIT(3) | BIT(17)) 25 29 #define MT7622_TOP_AXI_PROT_EN_HIF0 (BIT(24) | BIT(25)) 26 30 #define MT7622_TOP_AXI_PROT_EN_HIF1 (BIT(26) | BIT(27) | \