Commit 094041b1 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

pmdomain: Merge branch fixes into next 



Merge the pmdomain fixes for v6.13-rc[n] into the next branch, to allow them
to get tested together with the new changes that are targeted for v6.14.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents b06bc472 f64f610e

drivers/pmdomain/core.c

+6 −0
Original line number Diff line number Diff line
@@ -2142,6 +2142,11 @@ static int genpd_set_default_power_state(struct generic_pm_domain *genpd) 
	return 0;

}



static void genpd_provider_release(struct device *dev)

{

	/* nothing to be done here */

}



static int genpd_alloc_data(struct generic_pm_domain *genpd)

{

	struct genpd_governor_data *gd = NULL;
@@ -2173,6 +2178,7 @@ static int genpd_alloc_data(struct generic_pm_domain *genpd) 


	genpd->gd = gd;

	device_initialize(&genpd->dev);

	genpd->dev.release = genpd_provider_release;



	if (!genpd_is_dev_name_fw(genpd)) {

		dev_set_name(&genpd->dev, "%s", genpd->name);

drivers/pmdomain/imx/gpcv2.c

+2 −2
Original line number Diff line number Diff line
@@ -1459,12 +1459,12 @@ static int imx_gpcv2_probe(struct platform_device *pdev) 
		.max_register   = SZ_4K,

	};

	struct device *dev = &pdev->dev;

	struct device_node *pgc_np;

	struct device_node *pgc_np __free(device_node) =

		of_get_child_by_name(dev->of_node, "pgc");

	struct regmap *regmap;

	void __iomem *base;

	int ret;



	pgc_np = of_get_child_by_name(dev->of_node, "pgc");

	if (!pgc_np) {

		dev_err(dev, "No power domains specified in DT\n");

		return -EINVAL;