Commit 022b02b4 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by Matthias Brugger
Browse files

soc: mediatek: pm-domains: Add a meaningful power domain name 



Add the power domains names to the power domain struct so we
have meaningful name for every power domain. This also removes the
following debugfs error message.

  [    2.242068] debugfs: Directory 'power-domain' with parent 'pm_genpd' already present!
  [    2.249949] debugfs: Directory 'power-domain' with parent 'pm_genpd' already present!
  [    2.257784] debugfs: Directory 'power-domain' with parent 'pm_genpd' already present!
  ...

Fixes: 59b644b0 ("soc: mediatek: Add MediaTek SCPSYS power domains")
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Link: https://lore.kernel.org/r/20210225175000.824661-1-enric.balletbo@collabora.com


Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent b23ab27b

drivers/soc/mediatek/mt8173-pm-domains.h

+10 −0
Original line number Diff line number Diff line
@@ -12,24 +12,28 @@ 


static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = {

	[MT8173_POWER_DOMAIN_VDEC] = {

		.name = "vdec",

		.sta_mask = PWR_STATUS_VDEC,

		.ctl_offs = SPM_VDE_PWR_CON,

		.sram_pdn_bits = GENMASK(11, 8),

		.sram_pdn_ack_bits = GENMASK(12, 12),

	},

	[MT8173_POWER_DOMAIN_VENC] = {

		.name = "venc",

		.sta_mask = PWR_STATUS_VENC,

		.ctl_offs = SPM_VEN_PWR_CON,

		.sram_pdn_bits = GENMASK(11, 8),

		.sram_pdn_ack_bits = GENMASK(15, 12),

	},

	[MT8173_POWER_DOMAIN_ISP] = {

		.name = "isp",

		.sta_mask = PWR_STATUS_ISP,

		.ctl_offs = SPM_ISP_PWR_CON,

		.sram_pdn_bits = GENMASK(11, 8),

		.sram_pdn_ack_bits = GENMASK(13, 12),

	},

	[MT8173_POWER_DOMAIN_MM] = {

		.name = "mm",

		.sta_mask = PWR_STATUS_DISP,

		.ctl_offs = SPM_DIS_PWR_CON,

		.sram_pdn_bits = GENMASK(11, 8),
@@ -40,18 +44,21 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { 
		},

	},

	[MT8173_POWER_DOMAIN_VENC_LT] = {

		.name = "venc_lt",

		.sta_mask = PWR_STATUS_VENC_LT,

		.ctl_offs = SPM_VEN2_PWR_CON,

		.sram_pdn_bits = GENMASK(11, 8),

		.sram_pdn_ack_bits = GENMASK(15, 12),

	},

	[MT8173_POWER_DOMAIN_AUDIO] = {

		.name = "audio",

		.sta_mask = PWR_STATUS_AUDIO,

		.ctl_offs = SPM_AUDIO_PWR_CON,

		.sram_pdn_bits = GENMASK(11, 8),

		.sram_pdn_ack_bits = GENMASK(15, 12),

	},

	[MT8173_POWER_DOMAIN_USB] = {

		.name = "usb",

		.sta_mask = PWR_STATUS_USB,

		.ctl_offs = SPM_USB_PWR_CON,

		.sram_pdn_bits = GENMASK(11, 8),
@@ -59,18 +66,21 @@ static const struct scpsys_domain_data scpsys_domain_data_mt8173[] = { 
		.caps = MTK_SCPD_ACTIVE_WAKEUP,

	},

	[MT8173_POWER_DOMAIN_MFG_ASYNC] = {

		.name = "mfg_async",

		.sta_mask = PWR_STATUS_MFG_ASYNC,

		.ctl_offs = SPM_MFG_ASYNC_PWR_CON,

		.sram_pdn_bits = GENMASK(11, 8),

		.sram_pdn_ack_bits = 0,

	},

	[MT8173_POWER_DOMAIN_MFG_2D] = {

		.name = "mfg_2d",

		.sta_mask = PWR_STATUS_MFG_2D,

		.ctl_offs = SPM_MFG_2D_PWR_CON,

		.sram_pdn_bits = GENMASK(11, 8),

		.sram_pdn_ack_bits = GENMASK(13, 12),

	},

	[MT8173_POWER_DOMAIN_MFG] = {

		.name = "mfg",

		.sta_mask = PWR_STATUS_MFG,

		.ctl_offs = SPM_MFG_PWR_CON,

		.sram_pdn_bits = GENMASK(13, 8),

drivers/soc/mediatek/mtk-pm-domains.c

+5 −1
Original line number Diff line number Diff line
@@ -438,7 +438,11 @@ generic_pm_domain *scpsys_add_one_domain(struct scpsys *scpsys, struct device_no 
		goto err_unprepare_subsys_clocks;

	}



	if (!pd->data->name)

		pd->genpd.name = node->name;

	else

		pd->genpd.name = pd->data->name;



	pd->genpd.power_off = scpsys_power_off;

	pd->genpd.power_on = scpsys_power_on;

drivers/soc/mediatek/mtk-pm-domains.h

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct scpsys_bus_prot_data { 


/**

 * struct scpsys_domain_data - scp domain data for power on/off flow

 * @name: The name of the power domain.

 * @sta_mask: The mask for power on/off status bit.

 * @ctl_offs: The offset for main power control register.

 * @sram_pdn_bits: The mask for sram power control bits.
@@ -85,6 +86,7 @@ struct scpsys_bus_prot_data { 
 * @bp_smi: bus protection for smi subsystem

 */

struct scpsys_domain_data {

	const char *name;

	u32 sta_mask;

	int ctl_offs;

	u32 sram_pdn_bits;