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>

diff --git a/drivers/soc/mediatek/mtk-scpsys.c b/drivers/soc/mediatek/mtk-scpsys.c
index 435ce5ec648a08cd7a937171181fbebc1b249a9f..5346f33dd70b612eac93b385ab07fb8a954f702c 100644 (file)
--- a/drivers/soc/mediatek/mtk-scpsys.c
+++ b/drivers/soc/mediatek/mtk-scpsys.c
@@ -518,7 +518,8 @@ static const struct scp_domain_data scp_domain_data_mt2701[] = {
                .name = "conn",
                .sta_mask = PWR_STATUS_CONN,
                .ctl_offs = SPM_CONN_PWR_CON,
-               .bus_prot_mask = 0x0104,
+               .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_CONN_M |
+                                MT2701_TOP_AXI_PROT_EN_CONN_S,
                .clk_id = {CLK_NONE},
                .active_wakeup = true,
        },
@@ -528,7 +529,7 @@ static const struct scp_domain_data scp_domain_data_mt2701[] = {
                .ctl_offs = SPM_DIS_PWR_CON,
                .sram_pdn_bits = GENMASK(11, 8),
                .clk_id = {CLK_MM},
-               .bus_prot_mask = 0x0002,
+               .bus_prot_mask = MT2701_TOP_AXI_PROT_EN_MM_M0,
                .active_wakeup = true,
        },
        [MT2701_POWER_DOMAIN_MFG] = {

diff --git a/include/linux/soc/mediatek/infracfg.h b/include/linux/soc/mediatek/infracfg.h
index b0a507d356ef04465a2c390a30f58ddb0853756d..fd25f01485660e0401cb9a4be8dbc5ac8e3eecfa 100644 (file)
--- a/include/linux/soc/mediatek/infracfg.h
+++ b/include/linux/soc/mediatek/infracfg.h
@@ -21,6 +21,10 @@
 #define MT8173_TOP_AXI_PROT_EN_MFG_M1          BIT(22)
 #define MT8173_TOP_AXI_PROT_EN_MFG_SNOOP_OUT   BIT(23)
 
+#define MT2701_TOP_AXI_PROT_EN_MM_M0           BIT(1)
+#define MT2701_TOP_AXI_PROT_EN_CONN_M          BIT(2)
+#define MT2701_TOP_AXI_PROT_EN_CONN_S          BIT(8)
+
 #define MT7622_TOP_AXI_PROT_EN_ETHSYS          (BIT(3) | BIT(17))
 #define MT7622_TOP_AXI_PROT_EN_HIF0            (BIT(24) | BIT(25))
 #define MT7622_TOP_AXI_PROT_EN_HIF1            (BIT(26) | BIT(27) | \