Commit f849f26f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pmdomain-v6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm 

Pull pmdomain fixes from Ulf Hansson:

 - mediatek: Fix spinlock recursion in probe

 - tegra: Use GENPD_FLAG_NO_STAY_ON to restore old behaviour

* tag 'pmdomain-v6.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm:
  pmdomain: tegra: Add GENPD_FLAG_NO_STAY_ON flag
  pmdomains: mtk-pm-domains: Fix spinlock recursion in probe
parents e538109a c98c99d5

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

+15 −3
Original line number Diff line number Diff line
@@ -748,6 +748,18 @@ static void scpsys_domain_cleanup(struct scpsys *scpsys) 
	}

}



static struct device_node *scpsys_get_legacy_regmap(struct device_node *np, const char *pn)

{

	struct device_node *local_node;



	for_each_child_of_node(np, local_node) {

		if (of_property_present(local_node, pn))

			return local_node;

	}



	return NULL;

}



static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *scpsys)

{

	const u8 bp_blocks[3] = {
@@ -769,7 +781,7 @@ static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *s 
	 * this makes it then possible to allocate the array of bus_prot

	 * regmaps and convert all to the new style handling.

	 */

	node = of_find_node_with_property(np, "mediatek,infracfg");

	node = scpsys_get_legacy_regmap(np, "mediatek,infracfg");

	if (node) {

		regmap[0] = syscon_regmap_lookup_by_phandle(node, "mediatek,infracfg");

		of_node_put(node);
@@ -782,7 +794,7 @@ static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *s 
		regmap[0] = NULL;

	}



	node = of_find_node_with_property(np, "mediatek,smi");

	node = scpsys_get_legacy_regmap(np, "mediatek,smi");

	if (node) {

		smi_np = of_parse_phandle(node, "mediatek,smi", 0);

		of_node_put(node);
@@ -800,7 +812,7 @@ static int scpsys_get_bus_protection_legacy(struct device *dev, struct scpsys *s 
		regmap[1] = NULL;

	}



	node = of_find_node_with_property(np, "mediatek,infracfg-nao");

	node = scpsys_get_legacy_regmap(np, "mediatek,infracfg-nao");

	if (node) {

		regmap[2] = syscon_regmap_lookup_by_phandle(node, "mediatek,infracfg-nao");

		num_regmaps++;

drivers/pmdomain/tegra/powergate-bpmp.c

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ tegra_powergate_add(struct tegra_bpmp *bpmp, 
	powergate->genpd.name = kstrdup(info->name, GFP_KERNEL);

	powergate->genpd.power_on = tegra_powergate_power_on;

	powergate->genpd.power_off = tegra_powergate_power_off;

	powergate->genpd.flags = GENPD_FLAG_NO_STAY_ON;



	err = pm_genpd_init(&powergate->genpd, NULL, off);

	if (err < 0) {