Commit d88ea303 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

pmdomain: Merge branch fixes into next 



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

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 0cebf7cb 670c900f

drivers/pmdomain/ti/ti_sci_pm_domains.c

+19 −1
Original line number Diff line number Diff line
@@ -114,6 +114,18 @@ static const struct of_device_id ti_sci_pm_domain_matches[] = { 
};

MODULE_DEVICE_TABLE(of, ti_sci_pm_domain_matches);



static bool ti_sci_pm_idx_exists(struct ti_sci_genpd_provider *pd_provider, u32 idx)

{

	struct ti_sci_pm_domain *pd;



	list_for_each_entry(pd, &pd_provider->pd_list, node) {

		if (pd->idx == idx)

			return true;

	}



	return false;

}



static int ti_sci_pm_domain_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -149,8 +161,14 @@ static int ti_sci_pm_domain_probe(struct platform_device *pdev) 
				break;



			if (args.args_count >= 1 && args.np == dev->of_node) {

				if (args.args[0] > max_id)

				if (args.args[0] > max_id) {

					max_id = args.args[0];

				} else {

					if (ti_sci_pm_idx_exists(pd_provider, args.args[0])) {

						index++;

						continue;

					}

				}



				pd = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL);

				if (!pd) {