Mediatek MT8195 power domain support
Subsystems (2)
v6 cover Mediatek MT8195 power domain support
This patch series adds power domain support for MT8195 and is based on 5.16-rc1.
change since v5:
- rebase to 5.16-rc1
- add domain capacity in mfg power domain
change since v4:
- rebase to 5.15-rc1 (fix conflict at patch 4 in this series)
- change license
change since v3:
- remove redundant bus protection steps
- remove unused power domain
change since v2:
- move modification of wakeup capacity to single patch
reason for resend v2:
- miss patch version in series
changes since v1:
- fix signed-off name
- describe more detail in patch 3
- move modification of removing redundant macro to single patch
Chun-Jie Chen (5):
dt-bindings: power: Add MT8195 power domains
soc: mediatek: pm-domains: Add wakeup capacity support in power domain
soc: mediatek: pm-domains: Remove unused macro
soc: mediatek: pm-domains: Move power status offset to power domain
data
soc: mediatek: pm-domains: Add support for mt8195
.../power/mediatek,power-controller.yaml | 2 + drivers/soc/mediatek/mt8167-pm-domains.h | 16 +- drivers/soc/mediatek/mt8173-pm-domains.h | 22 +- drivers/soc/mediatek/mt8183-pm-domains.h | 32 +- drivers/soc/mediatek/mt8192-pm-domains.h | 44 +- drivers/soc/mediatek/mt8195-pm-domains.h | 613 ++++++++++++++++++ drivers/soc/mediatek/mtk-pm-domains.c | 12 +- drivers/soc/mediatek/mtk-pm-domains.h | 8 +- include/dt-bindings/power/mt8195-power.h | 46 ++ include/linux/soc/mediatek/infracfg.h | 82 +++ 10 files changed, 862 insertions(+), 15 deletions(-) create mode 100644 drivers/soc/mediatek/mt8195-pm-domains.h create mode 100644 include/dt-bindings/power/mt8195-power.h
--
2.18.0
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v6 1/5 dt-bindings: power: Add MT8195 power domains
Add power domains dt-bindings for MT8195.
---
no change
--- .../power/mediatek,power-controller.yaml | 2 + include/dt-bindings/power/mt8195-power.h | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 include/dt-bindings/power/mt8195-power.h
Documentation/devicetree/bindings/power/mediatek,power-controller.yaml +2 -0
@@ -27,6 +27,7 @@ properties: - mediatek,mt8173-power-controller - mediatek,mt8183-power-controller - mediatek,mt8192-power-controller + - mediatek,mt8195-power-controller '#power-domain-cells': const: 1
@@ -64,6 +65,7 @@ patternProperties: "include/dt-bindings/power/mt8173-power.h" - for MT8173 type power domain. "include/dt-bindings/power/mt8183-power.h" - for MT8183 type power domain. "include/dt-bindings/power/mt8192-power.h" - for MT8192 type power domain. + "include/dt-bindings/power/mt8195-power.h" - for MT8195 type power domain. maxItems: 1 clocks:
include/dt-bindings/power/mt8195-power.h new file +46 -0
46 lines not on this page · raw message
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [v6 1/5] dt-bindings: power: Add MT8195 power domains
Il 16/11/21 03:50, Chun-Jie Chen ha scritto:
Quoted 5 lines
Add power domains dt-bindings for MT8195.
Signed-off-by Chun-Jie Chen <[email protected]>Acked-by Rob Herring <[email protected]>Reviewed-by Enric Balletbo i Serra <[email protected]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v6 2/5 soc: mediatek: pm-domains: Add wakeup capacity support in power domain
In reply to Chun-Jie ChenDue to some power domain needs to keep on for wakeup in system suspend, so add GENPD_FLAG_ACTIVE_WAKEUP support in Mediatek power domain driver.
---
no change
--- drivers/soc/mediatek/mtk-pm-domains.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/soc/mediatek/mtk-pm-domains.c +3 -0
@@ -443,6 +443,9 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no pd->genpd.power_off = scpsys_power_off; pd->genpd.power_on = scpsys_power_on; +if (MTK_SCPD_CAPS (pd,MTK_SCPD_ACTIVE_WAKEUP )) + pd->genpd.flags |=GENPD_FLAG_ACTIVE_WAKEUP ; +if (MTK_SCPD_CAPS (pd,MTK_SCPD_KEEP_DEFAULT_OFF ))pm_genpd_init (&pd->genpd,NULL , true);else
Signature · 7 lines
2.18.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [v6 2/5] soc: mediatek: pm-domains: Add wakeup capacity support in power domain
Il 16/11/21 03:50, Chun-Jie Chen ha scritto:
Quoted 6 lines
Due to some power domain needs to keep on for wakeup in system suspend, so add
GENPD_FLAG_ACTIVE_WAKEUPsupport in Mediatek power domain driver.Fixes 59b644b01cf4 ("soc: mediatek: Add MediaTek SCPSYS power domains")Signed-off-by Chun-Jie Chen <[email protected]>Reviewed-by Chen-Yu Tsai <[email protected]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v6 3/5 soc: mediatek: pm-domains: Remove unused macro
In reply to Chun-Jie ChenDue to clk resource data will be allocated dynamically by searching parent count of clk in power domain node, so remove the unused marco MAX_SUBSYS_CLKS for static allocation.
---
no change
--- drivers/soc/mediatek/mtk-pm-domains.h | 2 -- 1 file changed, 2 deletions(-)
drivers/soc/mediatek/mtk-pm-domains.h +0 -2
@@ -72,8 +72,6 @@ struct scpsys_bus_prot_data {bool ignore_clr_ack; }; -#define MAX_SUBSYS_CLKS 10 -/** * struct scpsys_domain_data - scp domain data for power on/off flow * @name: The name of the power domain.
Signature · 1 line
2.18.0
Re: [v6 3/5] soc: mediatek: pm-domains: Remove unused macro
Il 16/11/21 03:50, Chun-Jie Chen ha scritto:
Quoted 6 lines
Due to clk resource data will be allocated dynamically by searching parent count of clk in power domain node, so remove the unused marco
MAX_SUBSYS_CLKSfor static allocation.Signed-off-by Chun-Jie Chen <[email protected]>Reviewed-by Enric Balletbo i Serra <[email protected]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v6 4/5 soc: mediatek: pm-domains: Move power status offset to power domain data
In reply to Chun-Jie ChenMT8195 has more than 32 power domains so it needs
two set of pwr_sta and pwr_sta2nd registers,
so move the register offset from soc data into power domain data.
---
no change
--- drivers/soc/mediatek/mt8167-pm-domains.h | 16 +++++++-- drivers/soc/mediatek/mt8173-pm-domains.h | 22 ++++++++++-- drivers/soc/mediatek/mt8183-pm-domains.h | 32 +++++++++++++++-- drivers/soc/mediatek/mt8192-pm-domains.h | 44 ++++++++++++++++++++++-- drivers/soc/mediatek/mtk-pm-domains.c | 4 +-- drivers/soc/mediatek/mtk-pm-domains.h | 4 +-- 6 files changed, 110 insertions(+), 12 deletions(-)
drivers/soc/mediatek/mt8167-pm-domains.h +14 -2
@@ -18,6 +18,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "mm", .sta_mask = PWR_STATUS_DISP, .ctl_offs = SPM_DIS_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {
@@ -30,6 +32,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "vdec", .sta_mask = PWR_STATUS_VDEC, .ctl_offs = SPM_VDE_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .caps = MTK_SCPD_ACTIVE_WAKEUP,
@@ -38,6 +42,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "isp", .sta_mask = PWR_STATUS_ISP, .ctl_offs = SPM_ISP_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), .caps = MTK_SCPD_ACTIVE_WAKEUP,
@@ -46,6 +52,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "mfg_async", .sta_mask = MT8167_PWR_STATUS_MFG_ASYNC, .ctl_offs = SPM_MFG_ASYNC_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, .bp_infracfg = {
@@ -57,6 +65,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "mfg_2d", .sta_mask = MT8167_PWR_STATUS_MFG_2D, .ctl_offs = SPM_MFG_2D_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },
@@ -64,6 +74,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "mfg", .sta_mask = PWR_STATUS_MFG, .ctl_offs = SPM_MFG_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },
@@ -71,6 +83,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = SPM_CONN_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = 0, .caps = MTK_SCPD_ACTIVE_WAKEUP,
@@ -85,8 +99,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = {static const struct scpsys_soc_data mt8167_scpsys_data = { .domains_data = scpsys_domain_data_mt8167, .num_domains =ARRAY_SIZE (scpsys_domain_data_mt8167), - .pwr_sta_offs =SPM_PWR_STATUS , - .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND , };#endif /* __SOC_MEDIATEK_MT8167_PM_DOMAINS_H */
drivers/soc/mediatek/mt8173-pm-domains.h +20 -2
@@ -15,6 +15,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "vdec", .sta_mask = PWR_STATUS_VDEC, .ctl_offs = SPM_VDE_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },
@@ -22,6 +24,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "venc", .sta_mask = PWR_STATUS_VENC, .ctl_offs = SPM_VEN_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },
@@ -29,6 +33,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "isp", .sta_mask = PWR_STATUS_ISP, .ctl_offs = SPM_ISP_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), },
@@ -36,6 +42,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "mm", .sta_mask = PWR_STATUS_DISP, .ctl_offs = SPM_DIS_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {
@@ -47,6 +55,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "venc_lt", .sta_mask = PWR_STATUS_VENC_LT, .ctl_offs = SPM_VEN2_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },
@@ -54,6 +64,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "audio", .sta_mask = PWR_STATUS_AUDIO, .ctl_offs = SPM_AUDIO_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },
@@ -61,6 +73,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "usb", .sta_mask = PWR_STATUS_USB, .ctl_offs = SPM_USB_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), .caps = MTK_SCPD_ACTIVE_WAKEUP,
@@ -69,6 +83,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "mfg_async", .sta_mask = PWR_STATUS_MFG_ASYNC, .ctl_offs = SPM_MFG_ASYNC_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = 0, .caps = MTK_SCPD_DOMAIN_SUPPLY,
@@ -77,6 +93,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "mfg_2d", .sta_mask = PWR_STATUS_MFG_2D, .ctl_offs = SPM_MFG_2D_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), },
@@ -84,6 +102,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "mfg", .sta_mask = PWR_STATUS_MFG, .ctl_offs = SPM_MFG_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(13, 8), .sram_pdn_ack_bits = GENMASK(21, 16), .bp_infracfg = {
@@ -98,8 +118,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = {static const struct scpsys_soc_data mt8173_scpsys_data = { .domains_data = scpsys_domain_data_mt8173, .num_domains =ARRAY_SIZE (scpsys_domain_data_mt8173), - .pwr_sta_offs =SPM_PWR_STATUS , - .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND , };#endif /* __SOC_MEDIATEK_MT8173_PM_DOMAINS_H */
drivers/soc/mediatek/mt8183-pm-domains.h +30 -2
@@ -15,6 +15,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "audio", .sta_mask = PWR_STATUS_AUDIO, .ctl_offs = 0x0314, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },
@@ -22,6 +24,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = 0x032c, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, .bp_infracfg = {
@@ -33,6 +37,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "mfg_async", .sta_mask = PWR_STATUS_MFG_ASYNC, .ctl_offs = 0x0334, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, },
@@ -40,6 +46,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "mfg", .sta_mask = PWR_STATUS_MFG, .ctl_offs = 0x0338, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .caps = MTK_SCPD_DOMAIN_SUPPLY,
@@ -48,6 +56,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "mfg_core0", .sta_mask = BIT(7), .ctl_offs = 0x034c, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },
@@ -55,6 +65,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "mfg_core1", .sta_mask = BIT(20), .ctl_offs = 0x0310, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },
@@ -62,6 +74,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "mfg_2d", .sta_mask = PWR_STATUS_MFG_2D, .ctl_offs = 0x0348, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {
@@ -75,6 +89,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "disp", .sta_mask = PWR_STATUS_DISP, .ctl_offs = 0x030c, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {
@@ -94,6 +110,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "cam", .sta_mask = BIT(25), .ctl_offs = 0x0344, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), .bp_infracfg = {
@@ -117,6 +135,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "isp", .sta_mask = PWR_STATUS_ISP, .ctl_offs = 0x0308, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), .bp_infracfg = {
@@ -140,6 +160,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "vdec", .sta_mask = BIT(31), .ctl_offs = 0x0300, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_smi = {
@@ -153,6 +175,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "venc", .sta_mask = PWR_STATUS_VENC, .ctl_offs = 0x0304, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), .bp_smi = {
@@ -166,6 +190,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "vpu_top", .sta_mask = BIT(26), .ctl_offs = 0x0324, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {
@@ -193,6 +219,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "vpu_core0", .sta_mask = BIT(27), .ctl_offs = 0x33c, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), .bp_infracfg = {
@@ -211,6 +239,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "vpu_core1", .sta_mask = BIT(28), .ctl_offs = 0x0340, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), .bp_infracfg = {
@@ -230,8 +260,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = {static const struct scpsys_soc_data mt8183_scpsys_data = { .domains_data = scpsys_domain_data_mt8183, .num_domains =ARRAY_SIZE (scpsys_domain_data_mt8183), - .pwr_sta_offs =0x0180 , - .pwr_sta2nd_offs =0x0184 };#endif /* __SOC_MEDIATEK_MT8183_PM_DOMAINS_H */
drivers/soc/mediatek/mt8192-pm-domains.h +42 -2
176 lines not on this page · raw message
drivers/soc/mediatek/mtk-pm-domains.c +2 -2
@@ -60,10 +60,10 @@ static bool scpsys_domain_is_on(struct scpsys_domain *pd)struct scpsys *scpsys = pd->scpsys;u32 status, status2; -regmap_read (scpsys->base, scpsys->soc_data->pwr_sta_offs, &status); +regmap_read (scpsys->base, pd->data->pwr_sta_offs, &status); status &= pd->data->sta_mask; -regmap_read (scpsys->base, scpsys->soc_data->pwr_sta2nd_offs, &status2); +regmap_read (scpsys->base, pd->data->pwr_sta2nd_offs, &status2); status2 &= pd->data->sta_mask;/* A domain is on when both status bits are set. */
drivers/soc/mediatek/mtk-pm-domains.h +2 -2
@@ -92,13 +92,13 @@ struct scpsys_domain_data {u8 caps;const struct scpsys_bus_prot_data bp_infracfg[SPM_MAX_BUS_PROT_DATA ];const struct scpsys_bus_prot_data bp_smi[SPM_MAX_BUS_PROT_DATA ]; +int pwr_sta_offs; + int pwr_sta2nd_offs; };struct scpsys_soc_data {const struct scpsys_domain_data *domains_data;int num_domains; -int pwr_sta_offs; -int pwr_sta2nd_offs; };#endif /* __SOC_MEDIATEK_MTK_PM_DOMAINS_H */
Signature · 1 line
2.18.0
Re: [v6 4/5] soc: mediatek: pm-domains: Move power status offset to power domain data
Il 16/11/21 03:50, Chun-Jie Chen ha scritto:
Quoted 6 lines
MT8195 has more than 32 power domains so it needs
two set ofpwr_staandpwr_sta2ndregisters,
so move the register offset from soc data into power domain data.Signed-off-by Chun-Jie Chen <[email protected]>Reviewed-by Enric Balletbo i Serra <[email protected]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Matthias Brugger
maintainerRe: [v6 4/5] soc: mediatek: pm-domains: Move power status offset to power domain data
In reply to Chun-Jie ChenQuoted 568 lines · Chun-Jie Chen
MT8195 has more than 32 power domains so it needs
two set ofpwr_staandpwr_sta2ndregisters,
so move the register offset from soc data into power domain data.Signed-off-by Chun-Jie Chen <[email protected]>Reviewed-by Enric Balletbo i Serra <[email protected]>---
no change--- drivers/soc/mediatek/mt8167-pm-domains.h | 16 +++++++-- drivers/soc/mediatek/mt8173-pm-domains.h | 22 ++++++++++-- drivers/soc/mediatek/mt8183-pm-domains.h | 32 +++++++++++++++-- drivers/soc/mediatek/mt8192-pm-domains.h | 44 ++++++++++++++++++++++-- drivers/soc/mediatek/mtk-pm-domains.c | 4 +-- drivers/soc/mediatek/mtk-pm-domains.h | 4 +-- 6 files changed, 110 insertions(+), 12 deletions(-)drivers/soc/mediatek/mt8167-pm-domains.h +14
-2@@ -18,6 +18,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "mm", .sta_mask = PWR_STATUS_DISP, .ctl_offs = SPM_DIS_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -30,6 +32,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "vdec", .sta_mask = PWR_STATUS_VDEC, .ctl_offs = SPM_VDE_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .caps = MTK_SCPD_ACTIVE_WAKEUP,@@ -38,6 +42,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "isp", .sta_mask = PWR_STATUS_ISP, .ctl_offs = SPM_ISP_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), .caps = MTK_SCPD_ACTIVE_WAKEUP,@@ -46,6 +52,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "mfg_async", .sta_mask = MT8167_PWR_STATUS_MFG_ASYNC, .ctl_offs = SPM_MFG_ASYNC_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, .bp_infracfg = {@@ -57,6 +65,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "mfg_2d", .sta_mask = MT8167_PWR_STATUS_MFG_2D, .ctl_offs = SPM_MFG_2D_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },@@ -64,6 +74,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "mfg", .sta_mask = PWR_STATUS_MFG, .ctl_offs = SPM_MFG_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },@@ -71,6 +83,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = { .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = SPM_CONN_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = 0, .caps = MTK_SCPD_ACTIVE_WAKEUP,@@ -85,8 +99,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8167[] = {static const struct scpsys_soc_data mt8167_scpsys_data = { .domains_data = scpsys_domain_data_mt8167, .num_domains =ARRAY_SIZE (scpsys_domain_data_mt8167), - .pwr_sta_offs =SPM_PWR_STATUS , - .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND , };#endif /* __SOC_MEDIATEK_MT8167_PM_DOMAINS_H */ drivers/soc/mediatek/mt8173-pm-domains.h +20
-2@@ -15,6 +15,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "vdec", .sta_mask = PWR_STATUS_VDEC, .ctl_offs = SPM_VDE_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -22,6 +24,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "venc", .sta_mask = PWR_STATUS_VENC, .ctl_offs = SPM_VEN_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },@@ -29,6 +33,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "isp", .sta_mask = PWR_STATUS_ISP, .ctl_offs = SPM_ISP_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), },@@ -36,6 +42,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "mm", .sta_mask = PWR_STATUS_DISP, .ctl_offs = SPM_DIS_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -47,6 +55,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "venc_lt", .sta_mask = PWR_STATUS_VENC_LT, .ctl_offs = SPM_VEN2_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },@@ -54,6 +64,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "audio", .sta_mask = PWR_STATUS_AUDIO, .ctl_offs = SPM_AUDIO_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },@@ -61,6 +73,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "usb", .sta_mask = PWR_STATUS_USB, .ctl_offs = SPM_USB_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), .caps = MTK_SCPD_ACTIVE_WAKEUP,@@ -69,6 +83,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "mfg_async", .sta_mask = PWR_STATUS_MFG_ASYNC, .ctl_offs = SPM_MFG_ASYNC_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = 0, .caps = MTK_SCPD_DOMAIN_SUPPLY,@@ -77,6 +93,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "mfg_2d", .sta_mask = PWR_STATUS_MFG_2D, .ctl_offs = SPM_MFG_2D_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), },@@ -84,6 +102,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { .name = "mfg", .sta_mask = PWR_STATUS_MFG, .ctl_offs = SPM_MFG_PWR_CON, + .pwr_sta_offs = SPM_PWR_STATUS, + .pwr_sta2nd_offs = SPM_PWR_STATUS_2ND, .sram_pdn_bits = GENMASK(13, 8), .sram_pdn_ack_bits = GENMASK(21, 16), .bp_infracfg = {@@ -98,8 +118,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = {static const struct scpsys_soc_data mt8173_scpsys_data = { .domains_data = scpsys_domain_data_mt8173, .num_domains =ARRAY_SIZE (scpsys_domain_data_mt8173), - .pwr_sta_offs =SPM_PWR_STATUS , - .pwr_sta2nd_offs =SPM_PWR_STATUS_2ND , };#endif /* __SOC_MEDIATEK_MT8173_PM_DOMAINS_H */ drivers/soc/mediatek/mt8183-pm-domains.h +30
-2@@ -15,6 +15,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "audio", .sta_mask = PWR_STATUS_AUDIO, .ctl_offs = 0x0314, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), },@@ -22,6 +24,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = 0x032c, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, .bp_infracfg = {@@ -33,6 +37,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "mfg_async", .sta_mask = PWR_STATUS_MFG_ASYNC, .ctl_offs = 0x0334, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, },@@ -40,6 +46,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "mfg", .sta_mask = PWR_STATUS_MFG, .ctl_offs = 0x0338, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .caps = MTK_SCPD_DOMAIN_SUPPLY,@@ -48,6 +56,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "mfg_core0", .sta_mask = BIT(7), .ctl_offs = 0x034c, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -55,6 +65,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "mfg_core1", .sta_mask = BIT(20), .ctl_offs = 0x0310, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -62,6 +74,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "mfg_2d", .sta_mask = PWR_STATUS_MFG_2D, .ctl_offs = 0x0348, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -75,6 +89,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "disp", .sta_mask = PWR_STATUS_DISP, .ctl_offs = 0x030c, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -94,6 +110,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "cam", .sta_mask = BIT(25), .ctl_offs = 0x0344, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), .bp_infracfg = {@@ -117,6 +135,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "isp", .sta_mask = PWR_STATUS_ISP, .ctl_offs = 0x0308, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(9, 8), .sram_pdn_ack_bits = GENMASK(13, 12), .bp_infracfg = {@@ -140,6 +160,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "vdec", .sta_mask = BIT(31), .ctl_offs = 0x0300, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_smi = {@@ -153,6 +175,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "venc", .sta_mask = PWR_STATUS_VENC, .ctl_offs = 0x0304, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(15, 12), .bp_smi = {@@ -166,6 +190,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "vpu_top", .sta_mask = BIT(26), .ctl_offs = 0x0324, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -193,6 +219,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "vpu_core0", .sta_mask = BIT(27), .ctl_offs = 0x33c, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), .bp_infracfg = {@@ -211,6 +239,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = { .name = "vpu_core1", .sta_mask = BIT(28), .ctl_offs = 0x0340, + .pwr_sta_offs = 0x0180, + .pwr_sta2nd_offs = 0x0184, .sram_pdn_bits = GENMASK(11, 8), .sram_pdn_ack_bits = GENMASK(13, 12), .bp_infracfg = {@@ -230,8 +260,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8183[] = {static const struct scpsys_soc_data mt8183_scpsys_data = { .domains_data = scpsys_domain_data_mt8183, .num_domains =ARRAY_SIZE (scpsys_domain_data_mt8183), - .pwr_sta_offs =0x0180 , - .pwr_sta2nd_offs =0x0184 };#endif /* __SOC_MEDIATEK_MT8183_PM_DOMAINS_H */ drivers/soc/mediatek/mt8192-pm-domains.h +42
-2@@ -15,6 +15,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "audio", .sta_mask = BIT(21), .ctl_offs = 0x0354, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -28,6 +30,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "conn", .sta_mask = PWR_STATUS_CONN, .ctl_offs = 0x0304, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = 0, .sram_pdn_ack_bits = 0, .bp_infracfg = {@@ -50,6 +54,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "mfg0", .sta_mask = BIT(2), .ctl_offs = 0x0308, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -57,6 +63,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "mfg1", .sta_mask = BIT(3), .ctl_offs = 0x030c, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -82,6 +90,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "mfg2", .sta_mask = BIT(4), .ctl_offs = 0x0310, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -89,6 +99,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "mfg3", .sta_mask = BIT(5), .ctl_offs = 0x0314, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -96,6 +108,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "mfg4", .sta_mask = BIT(6), .ctl_offs = 0x0318, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -103,6 +117,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "mfg5", .sta_mask = BIT(7), .ctl_offs = 0x031c, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -110,6 +126,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "mfg6", .sta_mask = BIT(8), .ctl_offs = 0x0320, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -117,6 +135,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "disp", .sta_mask = BIT(20), .ctl_offs = 0x0350, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -146,6 +166,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "ipe", .sta_mask = BIT(14), .ctl_offs = 0x0338, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -163,6 +185,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "isp", .sta_mask = BIT(12), .ctl_offs = 0x0330, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -180,6 +204,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "isp2", .sta_mask = BIT(13), .ctl_offs = 0x0334, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -197,6 +223,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "mdp", .sta_mask = BIT(19), .ctl_offs = 0x034c, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -214,6 +242,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "venc", .sta_mask = BIT(17), .ctl_offs = 0x0344, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -231,6 +261,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "vdec", .sta_mask = BIT(15), .ctl_offs = 0x033c, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -248,6 +280,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "vdec2", .sta_mask = BIT(16), .ctl_offs = 0x0340, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -255,6 +289,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "cam", .sta_mask = BIT(23), .ctl_offs = 0x035c, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), .bp_infracfg = {@@ -284,6 +320,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "cam_rawa", .sta_mask = BIT(24), .ctl_offs = 0x0360, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -291,6 +329,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "cam_rawb", .sta_mask = BIT(25), .ctl_offs = 0x0364, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -298,6 +338,8 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = { .name = "cam_rawc", .sta_mask = BIT(26), .ctl_offs = 0x0368, + .pwr_sta_offs = 0x016c, + .pwr_sta2nd_offs = 0x0170, .sram_pdn_bits = GENMASK(8, 8), .sram_pdn_ack_bits = GENMASK(12, 12), },@@ -306,8 +348,6 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8192[] = {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 */ drivers/soc/mediatek/mtk-pm-domains.c +2
-2@@ -60,10 +60,10 @@ static bool scpsys_domain_is_on(struct scpsys_domain *pd)struct scpsys *scpsys = pd->scpsys;u32 status, status2; -regmap_read (scpsys->base, scpsys->soc_data->pwr_sta_offs, &status); +regmap_read (scpsys->base, pd->data->pwr_sta_offs, &status); status &= pd->data->sta_mask; -regmap_read (scpsys->base, scpsys->soc_data->pwr_sta2nd_offs, &status2); +regmap_read (scpsys->base, pd->data->pwr_sta2nd_offs, &status2); status2 &= pd->data->sta_mask;/* A domain is on when both status bits are set. */ drivers/soc/mediatek/mtk-pm-domains.h +0
-0
drivers/soc/mediatek/mtk-pm-domains.h struct scpsys_domain_data { · line 96
Quoted 5 lines
drivers/soc/mediatek/mtk-pm-domains.h +2
-0@@ -92,13 +92,13 @@ struct scpsys_domain_data {u8 caps;const struct scpsys_bus_prot_data bp_infracfg[SPM_MAX_BUS_PROT_DATA ];const struct scpsys_bus_prot_data bp_smi[SPM_MAX_BUS_PROT_DATA ]; +int pwr_sta_offs; +int pwr_sta2nd_offs;
Please add the documentation to struct scpsys_domain_data for these two new fields.
Also please put the values in the struct after ctl_offs, to align the order of the struct members with the declaration of the struct.
Other then that series looks good.
Regards,
Matthias
Quoted 11 lines
drivers/soc/mediatek/mtk-pm-domains.h +0
-2};struct scpsys_soc_data {const struct scpsys_domain_data *domains_data;int num_domains; -int pwr_sta_offs; -int pwr_sta2nd_offs; };#endif /* __SOC_MEDIATEK_MTK_PM_DOMAINS_H */
PATCH v6 5/5 soc: mediatek: pm-domains: Add support for mt8195
In reply to Chun-Jie ChenAdd domain control data including bus protection data size change due to more protection steps in mt8195.
---
The gpu mtcmos needs to have extra pmic buck support, so add domain supply capacity in mfg0 power domain to enable regulator control when power on and off.
--- drivers/soc/mediatek/mt8195-pm-domains.h | 613 +++++++++++++++++++++++ drivers/soc/mediatek/mtk-pm-domains.c | 5 + drivers/soc/mediatek/mtk-pm-domains.h | 2 +- include/linux/soc/mediatek/infracfg.h | 82 +++ 4 files changed, 701 insertions(+), 1 deletion(-) create mode 100644 drivers/soc/mediatek/mt8195-pm-domains.h
drivers/soc/mediatek/mt8195-pm-domains.h new file +613 -0
@@ -0,0 +1,613 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2021 MediaTek Inc. +* Author: Chun-Jie Chen <[email protected]> +*/ + +#ifndef __SOC_MEDIATEK_MT8195_PM_DOMAINS_H +#define __SOC_MEDIATEK_MT8195_PM_DOMAINS_H + +#include "mtk-pm-domains.h" +#include <dt-bindings/power/mt8195-power.h> + +/* +* MT8195 power domain support +*/ + +static const struct scpsys_domain_data scpsys_domain_data_mt8195[] = { + [MT8195_POWER_DOMAIN_PCIE_MAC_P0 ] = { + .name ="pcie_mac_p0" , + .sta_mask =BIT (11 ), + .ctl_offs =0x328 , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_VDNR_PCIE_MAC_P0 , +MT8195_TOP_AXI_PROT_EN_VDNR_SET , +MT8195_TOP_AXI_PROT_EN_VDNR_CLR , +MT8195_TOP_AXI_PROT_EN_VDNR_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_VDNR_1_PCIE_MAC_P0 , +MT8195_TOP_AXI_PROT_EN_VDNR_1_SET , +MT8195_TOP_AXI_PROT_EN_VDNR_1_CLR , +MT8195_TOP_AXI_PROT_EN_VDNR_1_STA1 ), + }, + }, + [MT8195_POWER_DOMAIN_PCIE_MAC_P1 ] = { + .name ="pcie_mac_p1" , + .sta_mask =BIT (12 ), + .ctl_offs =0x32C , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_VDNR_PCIE_MAC_P1 , +MT8195_TOP_AXI_PROT_EN_VDNR_SET , +MT8195_TOP_AXI_PROT_EN_VDNR_CLR , +MT8195_TOP_AXI_PROT_EN_VDNR_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_VDNR_1_PCIE_MAC_P1 , +MT8195_TOP_AXI_PROT_EN_VDNR_1_SET , +MT8195_TOP_AXI_PROT_EN_VDNR_1_CLR , +MT8195_TOP_AXI_PROT_EN_VDNR_1_STA1 ), + }, + }, + [MT8195_POWER_DOMAIN_PCIE_PHY ] = { + .name ="pcie_phy" , + .sta_mask =BIT (13 ), + .ctl_offs =0x330 , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .caps =MTK_SCPD_ACTIVE_WAKEUP , + }, + [MT8195_POWER_DOMAIN_SSUSB_PCIE_PHY ] = { + .name ="ssusb_pcie_phy" , + .sta_mask =BIT (14 ), + .ctl_offs =0x334 , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .caps =MTK_SCPD_ACTIVE_WAKEUP , + }, + [MT8195_POWER_DOMAIN_CSI_RX_TOP ] = { + .name ="csi_rx_top" , + .sta_mask =BIT (18 ), + .ctl_offs =0x3C4 , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_ETHER ] = { + .name ="ether" , + .sta_mask =BIT (3 ), + .ctl_offs =0x344 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_ACTIVE_WAKEUP , + }, + [MT8195_POWER_DOMAIN_ADSP ] = { + .name ="adsp" , + .sta_mask =BIT (10 ), + .ctl_offs =0x360 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_2_ADSP , +MT8195_TOP_AXI_PROT_EN_2_SET , +MT8195_TOP_AXI_PROT_EN_2_CLR , +MT8195_TOP_AXI_PROT_EN_2_STA1 ), + }, + .caps =MTK_SCPD_SRAM_ISO |MTK_SCPD_ACTIVE_WAKEUP , + }, + [MT8195_POWER_DOMAIN_AUDIO ] = { + .name ="audio" , + .sta_mask =BIT (8 ), + .ctl_offs =0x358 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_2_AUDIO , +MT8195_TOP_AXI_PROT_EN_2_SET , +MT8195_TOP_AXI_PROT_EN_2_CLR , +MT8195_TOP_AXI_PROT_EN_2_STA1 ), + }, + }, + [MT8195_POWER_DOMAIN_MFG0 ] = { + .name ="mfg0" , + .sta_mask =BIT (1 ), + .ctl_offs =0x300 , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF |MTK_SCPD_DOMAIN_SUPPLY , + }, + [MT8195_POWER_DOMAIN_MFG1 ] = { + .name ="mfg1" , + .sta_mask =BIT (2 ), + .ctl_offs =0x304 , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MFG1 , +MT8195_TOP_AXI_PROT_EN_SET , +MT8195_TOP_AXI_PROT_EN_CLR , +MT8195_TOP_AXI_PROT_EN_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_2_MFG1 , +MT8195_TOP_AXI_PROT_EN_2_SET , +MT8195_TOP_AXI_PROT_EN_2_CLR , +MT8195_TOP_AXI_PROT_EN_2_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_1_MFG1 , +MT8195_TOP_AXI_PROT_EN_1_SET , +MT8195_TOP_AXI_PROT_EN_1_CLR , +MT8195_TOP_AXI_PROT_EN_1_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_2_MFG1_2ND , +MT8195_TOP_AXI_PROT_EN_2_SET , +MT8195_TOP_AXI_PROT_EN_2_CLR , +MT8195_TOP_AXI_PROT_EN_2_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MFG1_2ND , +MT8195_TOP_AXI_PROT_EN_SET , +MT8195_TOP_AXI_PROT_EN_CLR , +MT8195_TOP_AXI_PROT_EN_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_MFG1 , +MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_SET , +MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_CLR , +MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_MFG2 ] = { + .name ="mfg2" , + .sta_mask =BIT (3 ), + .ctl_offs =0x308 , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_MFG3 ] = { + .name ="mfg3" , + .sta_mask =BIT (4 ), + .ctl_offs =0x30C , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_MFG4 ] = { + .name ="mfg4" , + .sta_mask =BIT (5 ), + .ctl_offs =0x310 , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_MFG5 ] = { + .name ="mfg5" , + .sta_mask =BIT (6 ), + .ctl_offs =0x314 , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_MFG6 ] = { + .name ="mfg6" , + .sta_mask =BIT (7 ), + .ctl_offs =0x318 , + .pwr_sta_offs =0x174 , + .pwr_sta2nd_offs =0x178 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_VPPSYS0 ] = { + .name ="vppsys0" , + .sta_mask =BIT (11 ), + .ctl_offs =0x364 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_VPPSYS0 , +MT8195_TOP_AXI_PROT_EN_SET , +MT8195_TOP_AXI_PROT_EN_CLR , +MT8195_TOP_AXI_PROT_EN_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_VPPSYS0 , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_VPPSYS0_2ND , +MT8195_TOP_AXI_PROT_EN_SET , +MT8195_TOP_AXI_PROT_EN_CLR , +MT8195_TOP_AXI_PROT_EN_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_VPPSYS0_2ND , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_VPPSYS0 , +MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_SET , +MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_CLR , +MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_STA1 ), + }, + }, + [MT8195_POWER_DOMAIN_VDOSYS0 ] = { + .name ="vdosys0" , + .sta_mask =BIT (13 ), + .ctl_offs =0x36C , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VDOSYS0 , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_VDOSYS0 , +MT8195_TOP_AXI_PROT_EN_SET , +MT8195_TOP_AXI_PROT_EN_CLR , +MT8195_TOP_AXI_PROT_EN_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_VDOSYS0 , +MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_SET , +MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_CLR , +MT8195_TOP_AXI_PROT_EN_SUB_INFRA_VDNR_STA1 ), + }, + }, + [MT8195_POWER_DOMAIN_VPPSYS1 ] = { + .name ="vppsys1" , + .sta_mask =BIT (12 ), + .ctl_offs =0x368 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VPPSYS1 , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VPPSYS1_2ND , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_VPPSYS1 , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), + }, + }, + [MT8195_POWER_DOMAIN_VDOSYS1 ] = { + .name ="vdosys1" , + .sta_mask =BIT (14 ), + .ctl_offs =0x370 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VDOSYS1 , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VDOSYS1_2ND , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_VDOSYS1 , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), + }, + }, + [MT8195_POWER_DOMAIN_DP_TX ] = { + .name ="dp_tx" , + .sta_mask =BIT (16 ), + .ctl_offs =0x378 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_VDNR_1_DP_TX , +MT8195_TOP_AXI_PROT_EN_VDNR_1_SET , +MT8195_TOP_AXI_PROT_EN_VDNR_1_CLR , +MT8195_TOP_AXI_PROT_EN_VDNR_1_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_EPD_TX ] = { + .name ="epd_tx" , + .sta_mask =BIT (17 ), + .ctl_offs =0x37C , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_VDNR_1_EPD_TX , +MT8195_TOP_AXI_PROT_EN_VDNR_1_SET , +MT8195_TOP_AXI_PROT_EN_VDNR_1_CLR , +MT8195_TOP_AXI_PROT_EN_VDNR_1_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_HDMI_TX ] = { + .name ="hdmi_tx" , + .sta_mask =BIT (18 ), + .ctl_offs =0x380 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF |MTK_SCPD_ACTIVE_WAKEUP , + }, + [MT8195_POWER_DOMAIN_WPESYS ] = { + .name ="wpesys" , + .sta_mask =BIT (15 ), + .ctl_offs =0x374 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_WPESYS , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_WPESYS , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_WPESYS_2ND , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), + }, + }, + [MT8195_POWER_DOMAIN_VDEC0 ] = { + .name ="vdec0" , + .sta_mask =BIT (20 ), + .ctl_offs =0x388 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VDEC0 , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_VDEC0 , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VDEC0_2ND , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_VDEC0_2ND , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_VDEC1 ] = { + .name ="vdec1" , + .sta_mask =BIT (21 ), + .ctl_offs =0x38C , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VDEC1 , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VDEC1_2ND , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_VDEC2 ] = { + .name ="vdec2" , + .sta_mask =BIT (22 ), + .ctl_offs =0x390 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_VDEC2 , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_VDEC2_2ND , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_VENC ] = { + .name ="venc" , + .sta_mask =BIT (23 ), + .ctl_offs =0x394 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VENC , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VENC_2ND , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_VENC , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_VENC_CORE1 ] = { + .name ="venc_core1" , + .sta_mask =BIT (24 ), + .ctl_offs =0x398 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_VENC_CORE1 , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_VENC_CORE1 , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_IMG ] = { + .name ="img" , + .sta_mask =BIT (29 ), + .ctl_offs =0x3AC , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_IMG , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_IMG_2ND , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_DIP ] = { + .name ="dip" , + .sta_mask =BIT (30 ), + .ctl_offs =0x3B0 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_IPE ] = { + .name ="ipe" , + .sta_mask =BIT (31 ), + .ctl_offs =0x3B4 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_IPE , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_IPE , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_CAM ] = { + .name ="cam" , + .sta_mask =BIT (25 ), + .ctl_offs =0x39C , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .bp_infracfg = { +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_2_CAM , +MT8195_TOP_AXI_PROT_EN_2_SET , +MT8195_TOP_AXI_PROT_EN_2_CLR , +MT8195_TOP_AXI_PROT_EN_2_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_CAM , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_1_CAM , +MT8195_TOP_AXI_PROT_EN_1_SET , +MT8195_TOP_AXI_PROT_EN_1_CLR , +MT8195_TOP_AXI_PROT_EN_1_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_CAM_2ND , +MT8195_TOP_AXI_PROT_EN_MM_SET , +MT8195_TOP_AXI_PROT_EN_MM_CLR , +MT8195_TOP_AXI_PROT_EN_MM_STA1 ), +BUS_PROT_WR (MT8195_TOP_AXI_PROT_EN_MM_2_CAM , +MT8195_TOP_AXI_PROT_EN_MM_2_SET , +MT8195_TOP_AXI_PROT_EN_MM_2_CLR , +MT8195_TOP_AXI_PROT_EN_MM_2_STA1 ), + }, + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_CAM_RAWA ] = { + .name ="cam_rawa" , + .sta_mask =BIT (26 ), + .ctl_offs =0x3A0 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_CAM_RAWB ] = { + .name ="cam_rawb" , + .sta_mask =BIT (27 ), + .ctl_offs =0x3A4 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, + [MT8195_POWER_DOMAIN_CAM_MRAW ] = { + .name ="cam_mraw" , + .sta_mask =BIT (28 ), + .ctl_offs =0x3A8 , + .pwr_sta_offs =0x16c , + .pwr_sta2nd_offs =0x170 , + .sram_pdn_bits =GENMASK (8 ,8 ), + .sram_pdn_ack_bits =GENMASK (12 ,12 ), + .caps =MTK_SCPD_KEEP_DEFAULT_OFF , + }, +}; + +static const struct scpsys_soc_data mt8195_scpsys_data = { + .domains_data = scpsys_domain_data_mt8195, + .num_domains =ARRAY_SIZE (scpsys_domain_data_mt8195), +}; + +#endif /* __SOC_MEDIATEK_MT8195_PM_DOMAINS_H */
drivers/soc/mediatek/mtk-pm-domains.c +5 -0
@@ -20,6 +20,7 @@#include "mt8173-pm-domains.h" #include "mt8183-pm-domains.h" #include "mt8192-pm-domains.h" +#include "mt8195-pm-domains.h" #define MTK_POLL_DELAY_US 10#define MTK_POLL_TIMEOUT USEC_PER_SEC
@@ -569,6 +570,10 @@ static const struct of_device_id scpsys_of_match[] = { .compatible = "mediatek,mt8192-power-controller", .data = &mt8192_scpsys_data, }, + { + .compatible = "mediatek,mt8195-power-controller", + .data = &mt8195_scpsys_data, + }, { } };
drivers/soc/mediatek/mtk-pm-domains.h +1 -1
@@ -37,7 +37,7 @@#define PWR_STATUS_AUDIO BIT(24)#define PWR_STATUS_USB BIT(25) -#define SPM_MAX_BUS_PROT_DATA 5 +#define SPM_MAX_BUS_PROT_DATA 6#define _BUS_PROT (_mask, _set, _clr, _sta, _update, _ignore) { \ .bus_prot_mask = (_mask), \
include/linux/soc/mediatek/infracfg.h +82 -0
88 lines not on this page · raw message
Signature · 1 line
2.18.0
Re: [v6 5/5] soc: mediatek: pm-domains: Add support for mt8195
Il 16/11/21 03:50, Chun-Jie Chen ha scritto:
Quoted 5 lines
Add domain control data including bus protection data size change due to more protection steps in mt8195.
Signed-off-by Chun-Jie Chen <[email protected]>Reviewed-by Chen-Yu Tsai <[email protected]>
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Quoted 2 lines · Chun-Jie Chen
This patch series adds power domain support for MT8195 and is based on 5.16-rc1.