On Fri, 2020-10-30 at 12:36 +0100, Enric Balletbo i Serra wrote: > From: Weiyi Lu <[email protected]> > > Add the needed board data to support mt8192 SoC. > > Signed-off-by: Weiyi Lu <[email protected]> > Signed-off-by: Enric Balletbo i Serra <[email protected]> > --- >
Hi Enric, I've verified with my dts v3[1] on MT8192 EVB, so Tested-by: Weiyi Lu <[email protected]> [1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=387453 > Changes in v4: > - Adapt scpsys_soc_data struct to the changes done in previous patches. > > Changes in v3: None > Changes in v2: None > > drivers/soc/mediatek/mt8192-pm-domains.h | 292 +++++++++++++++++++++++ > drivers/soc/mediatek/mtk-pm-domains.c | 5 + > include/linux/soc/mediatek/infracfg.h | 56 +++++ > 3 files changed, 353 insertions(+) > create mode 100644 drivers/soc/mediatek/mt8192-pm-domains.h > > diff --git a/drivers/soc/mediatek/mt8192-pm-domains.h > b/drivers/soc/mediatek/mt8192-pm-domains.h > new file mode 100644 > index 000000000000..0fdf6dc6231f > --- /dev/null > +++ b/drivers/soc/mediatek/mt8192-pm-domains.h > @@ -0,0 +1,292 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > + > +#ifndef __SOC_MEDIATEK_MT8192_PM_DOMAINS_H > +#define __SOC_MEDIATEK_MT8192_PM_DOMAINS_H > + > +#include "mtk-pm-domains.h" > +#include <dt-bindings/power/mt8192-power.h> > + > +/* > + * MT8192 power domain support > + */ > + > +static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { > + [MT8192_POWER_DOMAIN_AUDIO] = { > + .sta_mask = BIT(21), > + .ctl_offs = 0x0354, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_2_AUDIO, > + MT8192_TOP_AXI_PROT_EN_2_SET, > + MT8192_TOP_AXI_PROT_EN_2_CLR, > + MT8192_TOP_AXI_PROT_EN_2_STA1), > + }, > + }, > + [MT8192_POWER_DOMAIN_CONN] = { > + .sta_mask = PWR_STATUS_CONN, > + .ctl_offs = 0x0304, > + .sram_pdn_bits = 0, > + .sram_pdn_ack_bits = 0, > + .bp_infracfg = { > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_CONN, > + MT8192_TOP_AXI_PROT_EN_SET, > + MT8192_TOP_AXI_PROT_EN_CLR, > + MT8192_TOP_AXI_PROT_EN_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_CONN_2ND, > + MT8192_TOP_AXI_PROT_EN_SET, > + MT8192_TOP_AXI_PROT_EN_CLR, > + MT8192_TOP_AXI_PROT_EN_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_1_CONN, > + MT8192_TOP_AXI_PROT_EN_1_SET, > + MT8192_TOP_AXI_PROT_EN_1_CLR, > + MT8192_TOP_AXI_PROT_EN_1_STA1), > + }, > + .caps = MTK_SCPD_KEEP_DEFAULT_OFF, > + }, > + [MT8192_POWER_DOMAIN_MFG0] = { > + .sta_mask = BIT(2), > + .ctl_offs = 0x0308, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8192_POWER_DOMAIN_MFG1] = { > + .sta_mask = BIT(3), > + .ctl_offs = 0x030c, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_1_MFG1, > + MT8192_TOP_AXI_PROT_EN_1_SET, > + MT8192_TOP_AXI_PROT_EN_1_CLR, > + MT8192_TOP_AXI_PROT_EN_1_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_2_MFG1, > + MT8192_TOP_AXI_PROT_EN_2_SET, > + MT8192_TOP_AXI_PROT_EN_2_CLR, > + MT8192_TOP_AXI_PROT_EN_2_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MFG1, > + MT8192_TOP_AXI_PROT_EN_SET, > + MT8192_TOP_AXI_PROT_EN_CLR, > + MT8192_TOP_AXI_PROT_EN_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_2_MFG1_2ND, > + MT8192_TOP_AXI_PROT_EN_2_SET, > + MT8192_TOP_AXI_PROT_EN_2_CLR, > + MT8192_TOP_AXI_PROT_EN_2_STA1), > + }, > + }, > + [MT8192_POWER_DOMAIN_MFG2] = { > + .sta_mask = BIT(4), > + .ctl_offs = 0x0310, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8192_POWER_DOMAIN_MFG3] = { > + .sta_mask = BIT(5), > + .ctl_offs = 0x0314, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8192_POWER_DOMAIN_MFG4] = { > + .sta_mask = BIT(6), > + .ctl_offs = 0x0318, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8192_POWER_DOMAIN_MFG5] = { > + .sta_mask = BIT(7), > + .ctl_offs = 0x031c, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8192_POWER_DOMAIN_MFG6] = { > + .sta_mask = BIT(8), > + .ctl_offs = 0x0320, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8192_POWER_DOMAIN_DISP] = { > + .sta_mask = BIT(20), > + .ctl_offs = 0x0350, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR_IGN(MT8192_TOP_AXI_PROT_EN_MM_DISP, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + BUS_PROT_WR_IGN(MT8192_TOP_AXI_PROT_EN_MM_2_DISP, > + MT8192_TOP_AXI_PROT_EN_MM_2_SET, > + MT8192_TOP_AXI_PROT_EN_MM_2_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_2_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_DISP, > + MT8192_TOP_AXI_PROT_EN_SET, > + MT8192_TOP_AXI_PROT_EN_CLR, > + MT8192_TOP_AXI_PROT_EN_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_DISP_2ND, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_2_DISP_2ND, > + MT8192_TOP_AXI_PROT_EN_MM_2_SET, > + MT8192_TOP_AXI_PROT_EN_MM_2_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_2_STA1), > + }, > + }, > + [MT8192_POWER_DOMAIN_IPE] = { > + .sta_mask = BIT(14), > + .ctl_offs = 0x0338, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_IPE, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_IPE_2ND, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + }, > + }, > + [MT8192_POWER_DOMAIN_ISP] = { > + .sta_mask = BIT(12), > + .ctl_offs = 0x0330, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_2_ISP, > + MT8192_TOP_AXI_PROT_EN_MM_2_SET, > + MT8192_TOP_AXI_PROT_EN_MM_2_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_2_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_2_ISP_2ND, > + MT8192_TOP_AXI_PROT_EN_MM_2_SET, > + MT8192_TOP_AXI_PROT_EN_MM_2_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_2_STA1), > + }, > + }, > + [MT8192_POWER_DOMAIN_ISP2] = { > + .sta_mask = BIT(13), > + .ctl_offs = 0x0334, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_ISP2, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_ISP2_2ND, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + }, > + }, > + [MT8192_POWER_DOMAIN_MDP] = { > + .sta_mask = BIT(19), > + .ctl_offs = 0x034c, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_2_MDP, > + MT8192_TOP_AXI_PROT_EN_MM_2_SET, > + MT8192_TOP_AXI_PROT_EN_MM_2_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_2_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_2_MDP_2ND, > + MT8192_TOP_AXI_PROT_EN_MM_2_SET, > + MT8192_TOP_AXI_PROT_EN_MM_2_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_2_STA1), > + }, > + }, > + [MT8192_POWER_DOMAIN_VENC] = { > + .sta_mask = BIT(17), > + .ctl_offs = 0x0344, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_VENC, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_VENC_2ND, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + }, > + }, > + [MT8192_POWER_DOMAIN_VDEC] = { > + .sta_mask = BIT(15), > + .ctl_offs = 0x033c, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_VDEC, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_VDEC_2ND, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + }, > + }, > + [MT8192_POWER_DOMAIN_VDEC2] = { > + .sta_mask = BIT(16), > + .ctl_offs = 0x0340, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8192_POWER_DOMAIN_CAM] = { > + .sta_mask = BIT(23), > + .ctl_offs = 0x035c, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + .bp_infracfg = { > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_2_CAM, > + MT8192_TOP_AXI_PROT_EN_2_SET, > + MT8192_TOP_AXI_PROT_EN_2_CLR, > + MT8192_TOP_AXI_PROT_EN_2_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_CAM, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_1_CAM, > + MT8192_TOP_AXI_PROT_EN_1_SET, > + MT8192_TOP_AXI_PROT_EN_1_CLR, > + MT8192_TOP_AXI_PROT_EN_1_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_MM_CAM_2ND, > + MT8192_TOP_AXI_PROT_EN_MM_SET, > + MT8192_TOP_AXI_PROT_EN_MM_CLR, > + MT8192_TOP_AXI_PROT_EN_MM_STA1), > + BUS_PROT_WR(MT8192_TOP_AXI_PROT_EN_VDNR_CAM, > + MT8192_TOP_AXI_PROT_EN_VDNR_SET, > + MT8192_TOP_AXI_PROT_EN_VDNR_CLR, > + MT8192_TOP_AXI_PROT_EN_VDNR_STA1), > + }, > + }, > + [MT8192_POWER_DOMAIN_CAM_RAWA] = { > + .sta_mask = BIT(24), > + .ctl_offs = 0x0360, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8192_POWER_DOMAIN_CAM_RAWB] = { > + .sta_mask = BIT(25), > + .ctl_offs = 0x0364, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > + [MT8192_POWER_DOMAIN_CAM_RAWC] = { > + .sta_mask = BIT(26), > + .ctl_offs = 0x0368, > + .sram_pdn_bits = GENMASK(8, 8), > + .sram_pdn_ack_bits = GENMASK(12, 12), > + }, > +}; > + > +static const struct scpsys_soc_data mt8192_scpsys_data = { > + .domains_data = scpsys_domain_data_mt8192, > + .num_domains = ARRAY_SIZE(scpsys_domain_data_mt8192), > + .pwr_sta_offs = 0x016c, > + .pwr_sta2nd_offs = 0x0170, > +}; > + > +#endif /* __SOC_MEDIATEK_MT8192_PM_DOMAINS_H */ > diff --git a/drivers/soc/mediatek/mtk-pm-domains.c > b/drivers/soc/mediatek/mtk-pm-domains.c > index c3b85b69f2f7..fb70cb3b07b3 100644 > --- a/drivers/soc/mediatek/mtk-pm-domains.c > +++ b/drivers/soc/mediatek/mtk-pm-domains.c > @@ -17,6 +17,7 @@ > > #include "mt8173-pm-domains.h" > #include "mt8183-pm-domains.h" > +#include "mt8192-pm-domains.h" > > #define MTK_POLL_DELAY_US 10 > #define MTK_POLL_TIMEOUT USEC_PER_SEC > @@ -521,6 +522,10 @@ static const struct of_device_id scpsys_of_match[] = { > .compatible = "mediatek,mt8183-power-controller", > .data = &mt8183_scpsys_data, > }, > + { > + .compatible = "mediatek,mt8192-power-controller", > + .data = &mt8192_scpsys_data, > + }, > { } > }; > > diff --git a/include/linux/soc/mediatek/infracfg.h > b/include/linux/soc/mediatek/infracfg.h > index 9d01e32e19bc..e7842debc05d 100644 > --- a/include/linux/soc/mediatek/infracfg.h > +++ b/include/linux/soc/mediatek/infracfg.h > @@ -2,6 +2,62 @@ > #ifndef __SOC_MEDIATEK_INFRACFG_H > #define __SOC_MEDIATEK_INFRACFG_H > > +#define MT8192_TOP_AXI_PROT_EN_STA1 0x228 > +#define MT8192_TOP_AXI_PROT_EN_1_STA1 0x258 > +#define MT8192_TOP_AXI_PROT_EN_SET 0x2a0 > +#define MT8192_TOP_AXI_PROT_EN_CLR 0x2a4 > +#define MT8192_TOP_AXI_PROT_EN_1_SET 0x2a8 > +#define MT8192_TOP_AXI_PROT_EN_1_CLR 0x2ac > +#define MT8192_TOP_AXI_PROT_EN_MM_SET 0x2d4 > +#define MT8192_TOP_AXI_PROT_EN_MM_CLR 0x2d8 > +#define MT8192_TOP_AXI_PROT_EN_MM_STA1 0x2ec > +#define MT8192_TOP_AXI_PROT_EN_2_SET 0x714 > +#define MT8192_TOP_AXI_PROT_EN_2_CLR 0x718 > +#define MT8192_TOP_AXI_PROT_EN_2_STA1 0x724 > +#define MT8192_TOP_AXI_PROT_EN_VDNR_SET 0xb84 > +#define MT8192_TOP_AXI_PROT_EN_VDNR_CLR 0xb88 > +#define MT8192_TOP_AXI_PROT_EN_VDNR_STA1 0xb90 > +#define MT8192_TOP_AXI_PROT_EN_MM_2_SET 0xdcc > +#define MT8192_TOP_AXI_PROT_EN_MM_2_CLR 0xdd0 > +#define MT8192_TOP_AXI_PROT_EN_MM_2_STA1 0xdd8 > + > +#define MT8192_TOP_AXI_PROT_EN_DISP (BIT(6) | BIT(23)) > +#define MT8192_TOP_AXI_PROT_EN_CONN (BIT(13) | BIT(18)) > +#define MT8192_TOP_AXI_PROT_EN_CONN_2ND BIT(14) > +#define MT8192_TOP_AXI_PROT_EN_MFG1 GENMASK(22, 21) > +#define MT8192_TOP_AXI_PROT_EN_1_CONN BIT(10) > +#define MT8192_TOP_AXI_PROT_EN_1_MFG1 BIT(21) > +#define MT8192_TOP_AXI_PROT_EN_1_CAM BIT(22) > +#define MT8192_TOP_AXI_PROT_EN_2_CAM BIT(0) > +#define MT8192_TOP_AXI_PROT_EN_2_ADSP BIT(3) > +#define MT8192_TOP_AXI_PROT_EN_2_AUDIO BIT(4) > +#define MT8192_TOP_AXI_PROT_EN_2_MFG1 GENMASK(6, 5) > +#define MT8192_TOP_AXI_PROT_EN_2_MFG1_2ND BIT(7) > +#define MT8192_TOP_AXI_PROT_EN_MM_CAM (BIT(0) | > BIT(2)) > +#define MT8192_TOP_AXI_PROT_EN_MM_DISP (BIT(0) | > BIT(2) | \ > + BIT(10) | BIT(12) | \ > + BIT(14) | BIT(16) | \ > + BIT(24) | BIT(26)) > +#define MT8192_TOP_AXI_PROT_EN_MM_CAM_2ND (BIT(1) | BIT(3)) > +#define MT8192_TOP_AXI_PROT_EN_MM_DISP_2ND (BIT(1) | BIT(3) | \ > + BIT(15) | BIT(17) | \ > + BIT(25) | BIT(27)) > +#define MT8192_TOP_AXI_PROT_EN_MM_ISP2 BIT(14) > +#define MT8192_TOP_AXI_PROT_EN_MM_ISP2_2ND BIT(15) > +#define MT8192_TOP_AXI_PROT_EN_MM_IPE BIT(16) > +#define MT8192_TOP_AXI_PROT_EN_MM_IPE_2ND BIT(17) > +#define MT8192_TOP_AXI_PROT_EN_MM_VDEC BIT(24) > +#define MT8192_TOP_AXI_PROT_EN_MM_VDEC_2ND BIT(25) > +#define MT8192_TOP_AXI_PROT_EN_MM_VENC BIT(26) > +#define MT8192_TOP_AXI_PROT_EN_MM_VENC_2ND BIT(27) > +#define MT8192_TOP_AXI_PROT_EN_MM_2_ISP BIT(8) > +#define MT8192_TOP_AXI_PROT_EN_MM_2_DISP (BIT(8) | BIT(12)) > +#define MT8192_TOP_AXI_PROT_EN_MM_2_ISP_2ND BIT(9) > +#define MT8192_TOP_AXI_PROT_EN_MM_2_DISP_2ND (BIT(9) | BIT(13)) > +#define MT8192_TOP_AXI_PROT_EN_MM_2_MDP BIT(12) > +#define MT8192_TOP_AXI_PROT_EN_MM_2_MDP_2ND BIT(13) > +#define MT8192_TOP_AXI_PROT_EN_VDNR_CAM BIT(21) > + > #define MT8183_TOP_AXI_PROT_EN_STA1 0x228 > #define MT8183_TOP_AXI_PROT_EN_STA1_1 0x258 > #define MT8183_TOP_AXI_PROT_EN_SET 0x2a0
