Commit d6e98f3e authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by MyungJoo Ham
Browse files

PM / devfreq: rk3399_dmc: Fix duplicated opp table on reload. 



The opp table is not removed when the driver is unloaded neither when
there is an error within probe, so if the driver is reloaded the opp
core shows the following warning:

  rk3399-dmc-freq dmc: _opp_add: duplicate OPPs detected. Existing: freq:
               200000000, volt: 900000, enabled: 1. New: freq: 200000000,
               volt: 900000, enabled: 1
  rk3399-dmc-freq dmc: _opp_add: duplicate OPPs detected. Existing: freq:
               400000000, volt: 900000, enabled: 1. New: freq: 400000000,
               volt: 900000, enabled: 1
  rk3399-dmc-freq dmc: _opp_add: duplicate OPPs detected. Existing: freq:
               666000000, volt: 900000, enabled: 1. New: freq: 666000000,
               volt: 900000, enabled: 1
  rk3399-dmc-freq dmc: _opp_add: duplicate OPPs detected. Existing: freq:
               800000000, volt: 900000, enabled: 1. New: freq: 800000000,
               volt: 900000, enabled: 1
  rk3399-dmc-freq dmc: _opp_add: duplicate OPPs detected. Existing: freq:
               928000000, volt: 900000, enabled: 1. New: freq: 928000000,
               volt: 900000, enabled: 1

This patch fixes the error path in the probe function and adds a .remove
function to properly cleanup the opp table on unloading.

Fixes: 5a893e31 (PM / devfreq: rockchip: add devfreq driver for rk3399 dmc)
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarMyungJoo Ham <myungjoo.ham@samsung.com>
parent 2c2cb1e6

drivers/devfreq/rk3399_dmc.c

+27 −4
Original line number Original line Diff line number Diff line
@@ -375,8 +375,10 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) 
	data->rate = clk_get_rate(data->dmc_clk);

	data->rate = clk_get_rate(data->dmc_clk);





	opp = devfreq_recommended_opp(dev, &data->rate, 0);

	opp = devfreq_recommended_opp(dev, &data->rate, 0);

	if (IS_ERR(opp))

	if (IS_ERR(opp)) {

		return PTR_ERR(opp);

		ret = PTR_ERR(opp);

		goto err_free_opp;

	}





	data->rate = dev_pm_opp_get_freq(opp);

	data->rate = dev_pm_opp_get_freq(opp);

	data->volt = dev_pm_opp_get_voltage(opp);

	data->volt = dev_pm_opp_get_voltage(opp);
@@ -388,13 +390,33 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) 
					   &rk3399_devfreq_dmc_profile,

					   &rk3399_devfreq_dmc_profile,

					   DEVFREQ_GOV_SIMPLE_ONDEMAND,

					   DEVFREQ_GOV_SIMPLE_ONDEMAND,

					   &data->ondemand_data);

					   &data->ondemand_data);

	if (IS_ERR(data->devfreq))

	if (IS_ERR(data->devfreq)) {

		return PTR_ERR(data->devfreq);

		ret = PTR_ERR(data->devfreq);

		goto err_free_opp;

	}



	devm_devfreq_register_opp_notifier(dev, data->devfreq);

	devm_devfreq_register_opp_notifier(dev, data->devfreq);





	data->dev = dev;

	data->dev = dev;

	platform_set_drvdata(pdev, data);

	platform_set_drvdata(pdev, data);





	return 0;



err_free_opp:

	dev_pm_opp_of_remove_table(&pdev->dev);

	return ret;

}



static int rk3399_dmcfreq_remove(struct platform_device *pdev)

{

	struct rk3399_dmcfreq *dmcfreq = dev_get_drvdata(&pdev->dev);



	/*

	 * Before remove the opp table we need to unregister the opp notifier.

	 */

	devm_devfreq_unregister_opp_notifier(dmcfreq->dev, dmcfreq->devfreq);

	dev_pm_opp_of_remove_table(dmcfreq->dev);



	return 0;

	return 0;

}

}
@@ -406,6 +428,7 @@ MODULE_DEVICE_TABLE(of, rk3399dmc_devfreq_of_match); 




static struct platform_driver rk3399_dmcfreq_driver = {

static struct platform_driver rk3399_dmcfreq_driver = {

	.probe	= rk3399_dmcfreq_probe,

	.probe	= rk3399_dmcfreq_probe,

	.remove = rk3399_dmcfreq_remove,

	.driver = {

	.driver = {

		.name	= "rk3399-dmc-freq",

		.name	= "rk3399-dmc-freq",

		.pm	= &rk3399_dmcfreq_pm,

		.pm	= &rk3399_dmcfreq_pm,

CRA Git | Maintained and supported by SUSTech CRA and CCSE