On 03/12/2018 08:03 AM, Weiyi Lu wrote:
> 1. split MFG power domain into MFG/MFG_SC1/MFG_SC2/MFG_SC3
> according to MT2712 ECO design change
> 2. add subdomain support for MT2712
>
> Signed-off-by: Weiyi Lu <weiyi...@mediatek.com>
Pushed to v4.16-next/soc
Thanks!
> ---
> drivers/soc/mediatek/mtk-scpsys.c | 42
> +++++++++++++++++++++++++++++++++++++--
> 1 file changed, 40 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soc/mediatek/mtk-scpsys.c
> b/drivers/soc/mediatek/mtk-scpsys.c
> index 59bd749c2f25..edf8fd6c2c85 100644
> --- a/drivers/soc/mediatek/mtk-scpsys.c
> +++ b/drivers/soc/mediatek/mtk-scpsys.c
> @@ -664,12 +664,48 @@ static const struct scp_domain_data
> scp_domain_data_mt2712[] = {
> .name = "mfg",
> .sta_mask = PWR_STATUS_MFG,
> .ctl_offs = SPM_MFG_PWR_CON,
> - .sram_pdn_bits = GENMASK(11, 8),
> - .sram_pdn_ack_bits = GENMASK(19, 16),
> + .sram_pdn_bits = GENMASK(8, 8),
> + .sram_pdn_ack_bits = GENMASK(16, 16),
> .clk_id = {CLK_MFG},
> .bus_prot_mask = BIT(14) | BIT(21) | BIT(23),
> .active_wakeup = true,
> },
> + [MT2712_POWER_DOMAIN_MFG_SC1] = {
> + .name = "mfg_sc1",
> + .sta_mask = BIT(22),
> + .ctl_offs = 0x02c0,
> + .sram_pdn_bits = GENMASK(8, 8),
> + .sram_pdn_ack_bits = GENMASK(16, 16),
> + .clk_id = {CLK_NONE},
> + .active_wakeup = true,
> + },
> + [MT2712_POWER_DOMAIN_MFG_SC2] = {
> + .name = "mfg_sc2",
> + .sta_mask = BIT(23),
> + .ctl_offs = 0x02c4,
> + .sram_pdn_bits = GENMASK(8, 8),
> + .sram_pdn_ack_bits = GENMASK(16, 16),
> + .clk_id = {CLK_NONE},
> + .active_wakeup = true,
> + },
> + [MT2712_POWER_DOMAIN_MFG_SC3] = {
> + .name = "mfg_sc3",
> + .sta_mask = BIT(30),
> + .ctl_offs = 0x01f8,
> + .sram_pdn_bits = GENMASK(8, 8),
> + .sram_pdn_ack_bits = GENMASK(16, 16),
> + .clk_id = {CLK_NONE},
> + .active_wakeup = true,
> + },
> +};
> +
> +static const struct scp_subdomain scp_subdomain_mt2712[] = {
> + {MT2712_POWER_DOMAIN_MM, MT2712_POWER_DOMAIN_VDEC},
> + {MT2712_POWER_DOMAIN_MM, MT2712_POWER_DOMAIN_VENC},
> + {MT2712_POWER_DOMAIN_MM, MT2712_POWER_DOMAIN_ISP},
> + {MT2712_POWER_DOMAIN_MFG, MT2712_POWER_DOMAIN_MFG_SC1},
> + {MT2712_POWER_DOMAIN_MFG_SC1, MT2712_POWER_DOMAIN_MFG_SC2},
> + {MT2712_POWER_DOMAIN_MFG_SC2, MT2712_POWER_DOMAIN_MFG_SC3},
> };
>
> /*
> @@ -905,6 +941,8 @@ static const struct scp_soc_data mt2701_data = {
> static const struct scp_soc_data mt2712_data = {
> .domains = scp_domain_data_mt2712,
> .num_domains = ARRAY_SIZE(scp_domain_data_mt2712),
> + .subdomains = scp_subdomain_mt2712,
> + .num_subdomains = ARRAY_SIZE(scp_subdomain_mt2712),
> .regs = {
> .pwr_sta_offs = SPM_PWR_STATUS,
> .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND
>
