Commit 6948de3c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-opp' 

* pm-opp:
  memory: samsung: exynos5422-dmc: Convert to use resource-managed OPP API
  drm/panfrost: Convert to use resource-managed OPP API
  drm/lima: Convert to use resource-managed OPP API
  mmc: sdhci-msm: Convert to use resource-managed OPP API
  spi: spi-qcom-qspi: Convert to use resource-managed OPP API
  spi: spi-geni-qcom: Convert to use resource-managed OPP API
  serial: qcom_geni_serial: Convert to use resource-managed OPP API
  opp: Change return type of devm_pm_opp_attach_genpd()
  opp: Change return type of devm_pm_opp_register_set_opp_helper()
  opp: Add devres wrapper for dev_pm_opp_of_add_table
  opp: Add devres wrapper for dev_pm_opp_set_supported_hw
  opp: Add devres wrapper for dev_pm_opp_set_regulators
  opp: Add devres wrapper for dev_pm_opp_set_clkname
parents bf0cc836 eed7a175

drivers/gpu/drm/lima/lima_devfreq.c

+11 −36
Original line number Diff line number Diff line
@@ -99,20 +99,12 @@ void lima_devfreq_fini(struct lima_device *ldev) 
		devm_devfreq_remove_device(ldev->dev, devfreq->devfreq);

		devfreq->devfreq = NULL;

	}



	dev_pm_opp_of_remove_table(ldev->dev);



	dev_pm_opp_put_regulators(devfreq->regulators_opp_table);

	dev_pm_opp_put_clkname(devfreq->clkname_opp_table);

	devfreq->regulators_opp_table = NULL;

	devfreq->clkname_opp_table = NULL;

}



int lima_devfreq_init(struct lima_device *ldev)

{

	struct thermal_cooling_device *cooling;

	struct device *dev = ldev->dev;

	struct opp_table *opp_table;

	struct devfreq *devfreq;

	struct lima_devfreq *ldevfreq = &ldev->devfreq;

	struct dev_pm_opp *opp;
@@ -125,40 +117,28 @@ int lima_devfreq_init(struct lima_device *ldev) 


	spin_lock_init(&ldevfreq->lock);



	opp_table = dev_pm_opp_set_clkname(dev, "core");

	if (IS_ERR(opp_table)) {

		ret = PTR_ERR(opp_table);

		goto err_fini;

	}



	ldevfreq->clkname_opp_table = opp_table;



	opp_table = dev_pm_opp_set_regulators(dev,

					      (const char *[]){ "mali" },

					      1);

	if (IS_ERR(opp_table)) {

		ret = PTR_ERR(opp_table);

	ret = devm_pm_opp_set_clkname(dev, "core");

	if (ret)

		return ret;



	ret = devm_pm_opp_set_regulators(dev, (const char *[]){ "mali" }, 1);

	if (ret) {

		/* Continue if the optional regulator is missing */

		if (ret != -ENODEV)

			goto err_fini;

	} else {

		ldevfreq->regulators_opp_table = opp_table;

			return ret;

	}



	ret = dev_pm_opp_of_add_table(dev);

	ret = devm_pm_opp_of_add_table(dev);

	if (ret)

		goto err_fini;

		return ret;



	lima_devfreq_reset(ldevfreq);



	cur_freq = clk_get_rate(ldev->clk_gpu);



	opp = devfreq_recommended_opp(dev, &cur_freq, 0);

	if (IS_ERR(opp)) {

		ret = PTR_ERR(opp);

		goto err_fini;

	}

	if (IS_ERR(opp))

		return PTR_ERR(opp);



	lima_devfreq_profile.initial_freq = cur_freq;

	dev_pm_opp_put(opp);
@@ -167,8 +147,7 @@ int lima_devfreq_init(struct lima_device *ldev) 
					  DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL);

	if (IS_ERR(devfreq)) {

		dev_err(dev, "Couldn't initialize GPU devfreq\n");

		ret = PTR_ERR(devfreq);

		goto err_fini;

		return PTR_ERR(devfreq);

	}



	ldevfreq->devfreq = devfreq;
@@ -180,10 +159,6 @@ int lima_devfreq_init(struct lima_device *ldev) 
		ldevfreq->cooling = cooling;



	return 0;



err_fini:

	lima_devfreq_fini(ldev);

	return ret;

}



void lima_devfreq_record_busy(struct lima_devfreq *devfreq)

drivers/gpu/drm/lima/lima_devfreq.h

+0 −3
Original line number Diff line number Diff line
@@ -8,15 +8,12 @@ 
#include <linux/ktime.h>



struct devfreq;

struct opp_table;

struct thermal_cooling_device;



struct lima_device;



struct lima_devfreq {

	struct devfreq *devfreq;

	struct opp_table *clkname_opp_table;

	struct opp_table *regulators_opp_table;

	struct thermal_cooling_device *cooling;



	ktime_t busy_time;

drivers/gpu/drm/panfrost/panfrost_devfreq.c

+9 −28
Original line number Diff line number Diff line
@@ -89,29 +89,25 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) 
	unsigned long cur_freq;

	struct device *dev = &pfdev->pdev->dev;

	struct devfreq *devfreq;

	struct opp_table *opp_table;

	struct thermal_cooling_device *cooling;

	struct panfrost_devfreq *pfdevfreq = &pfdev->pfdevfreq;



	opp_table = dev_pm_opp_set_regulators(dev, pfdev->comp->supply_names,

	ret = devm_pm_opp_set_regulators(dev, pfdev->comp->supply_names,

					 pfdev->comp->num_supplies);

	if (IS_ERR(opp_table)) {

		ret = PTR_ERR(opp_table);

	if (ret) {

		/* Continue if the optional regulator is missing */

		if (ret != -ENODEV) {

			DRM_DEV_ERROR(dev, "Couldn't set OPP regulators\n");

			goto err_fini;

			return ret;

		}

	} else {

		pfdevfreq->regulators_opp_table = opp_table;

	}



	ret = dev_pm_opp_of_add_table(dev);

	ret = devm_pm_opp_of_add_table(dev);

	if (ret) {

		/* Optional, continue without devfreq */

		if (ret == -ENODEV)

			ret = 0;

		goto err_fini;

		return ret;

	}

	pfdevfreq->opp_of_table_added = true;
@@ -122,10 +118,8 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) 
	cur_freq = clk_get_rate(pfdev->clock);



	opp = devfreq_recommended_opp(dev, &cur_freq, 0);

	if (IS_ERR(opp)) {

		ret = PTR_ERR(opp);

		goto err_fini;

	}

	if (IS_ERR(opp))

		return PTR_ERR(opp);



	panfrost_devfreq_profile.initial_freq = cur_freq;

	dev_pm_opp_put(opp);
@@ -134,8 +128,7 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) 
					  DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL);

	if (IS_ERR(devfreq)) {

		DRM_DEV_ERROR(dev, "Couldn't initialize GPU devfreq\n");

		ret = PTR_ERR(devfreq);

		goto err_fini;

		return PTR_ERR(devfreq);

	}

	pfdevfreq->devfreq = devfreq;
@@ -146,10 +139,6 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) 
		pfdevfreq->cooling = cooling;



	return 0;



err_fini:

	panfrost_devfreq_fini(pfdev);

	return ret;

}



void panfrost_devfreq_fini(struct panfrost_device *pfdev)
@@ -160,14 +149,6 @@ void panfrost_devfreq_fini(struct panfrost_device *pfdev) 
		devfreq_cooling_unregister(pfdevfreq->cooling);

		pfdevfreq->cooling = NULL;

	}



	if (pfdevfreq->opp_of_table_added) {

		dev_pm_opp_of_remove_table(&pfdev->pdev->dev);

		pfdevfreq->opp_of_table_added = false;

	}



	dev_pm_opp_put_regulators(pfdevfreq->regulators_opp_table);

	pfdevfreq->regulators_opp_table = NULL;

}



void panfrost_devfreq_resume(struct panfrost_device *pfdev)

drivers/gpu/drm/panfrost/panfrost_devfreq.h

+0 −2
Original line number Diff line number Diff line
@@ -8,14 +8,12 @@ 
#include <linux/ktime.h>



struct devfreq;

struct opp_table;

struct thermal_cooling_device;



struct panfrost_device;



struct panfrost_devfreq {

	struct devfreq *devfreq;

	struct opp_table *regulators_opp_table;

	struct thermal_cooling_device *cooling;

	bool opp_of_table_added;

drivers/memory/samsung/exynos5422-dmc.c

+3 −10
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc, 
	int idx;

	unsigned long freq;



	ret = dev_pm_opp_of_add_table(dmc->dev);

	ret = devm_pm_opp_of_add_table(dmc->dev);

	if (ret < 0) {

		dev_err(dmc->dev, "Failed to get OPP table\n");

		return ret;
@@ -354,7 +354,7 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc, 
	dmc->opp = devm_kmalloc_array(dmc->dev, dmc->opp_count,

				      sizeof(struct dmc_opp_table), GFP_KERNEL);

	if (!dmc->opp)

		goto err_opp;

		return -ENOMEM;



	idx = dmc->opp_count - 1;

	for (i = 0, freq = ULONG_MAX; i < dmc->opp_count; i++, freq--) {
@@ -362,7 +362,7 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc, 


		opp = dev_pm_opp_find_freq_floor(dmc->dev, &freq);

		if (IS_ERR(opp))

			goto err_opp;

			return PTR_ERR(opp);



		dmc->opp[idx - i].freq_hz = freq;

		dmc->opp[idx - i].volt_uv = dev_pm_opp_get_voltage(opp);
@@ -371,11 +371,6 @@ static int exynos5_init_freq_table(struct exynos5_dmc *dmc, 
	}



	return 0;



err_opp:

	dev_pm_opp_of_remove_table(dmc->dev);



	return -EINVAL;

}



/**
@@ -1567,8 +1562,6 @@ static int exynos5_dmc_remove(struct platform_device *pdev) 
	clk_disable_unprepare(dmc->mout_bpll);

	clk_disable_unprepare(dmc->fout_bpll);



	dev_pm_opp_remove_table(dmc->dev);



	return 0;

}