Commit 599618e5 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'devfreq-next-for-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux 

Pull devfreq next for v6.1 from Chanwoo Choi:

"1. Handle -EPROBE_DEFER when regulator is not probed on mtk-ci-devfreq.c
 2. Use dev_err_probe to reduce the error log on rockchip-dfi.c"

* tag 'devfreq-next-for-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux:
  PM / devfreq: rockchip-dfi: Fix an error message
  PM / devfreq: mtk-cci: Handle sram regulator probe deferral
parents f76349cf fb2ac84f

drivers/devfreq/event/rockchip-dfi.c

+3 −4
Original line number Diff line number Diff line
@@ -189,10 +189,9 @@ static int rockchip_dfi_probe(struct platform_device *pdev) 
		return PTR_ERR(data->regs);



	data->clk = devm_clk_get(dev, "pclk_ddr_mon");

	if (IS_ERR(data->clk)) {

		dev_err(dev, "Cannot get the clk dmc_clk\n");

		return PTR_ERR(data->clk);

	}

	if (IS_ERR(data->clk))

		return dev_err_probe(dev, PTR_ERR(data->clk),

				     "Cannot get the clk pclk_ddr_mon\n");



	/* try to find the optional reference to the pmu syscon */

	node = of_parse_phandle(np, "rockchip,pmu", 0);

drivers/devfreq/mtk-cci-devfreq.c

+6 −2
Original line number Diff line number Diff line
@@ -291,9 +291,13 @@ static int mtk_ccifreq_probe(struct platform_device *pdev) 
	}



	drv->sram_reg = devm_regulator_get_optional(dev, "sram");

	if (IS_ERR(drv->sram_reg))

	if (IS_ERR(drv->sram_reg)) {

		ret = PTR_ERR(drv->sram_reg);

		if (ret == -EPROBE_DEFER)

			goto out_free_resources;



		drv->sram_reg = NULL;

	else {

	} else {

		ret = regulator_enable(drv->sram_reg);

		if (ret) {

			dev_err(dev, "failed to enable sram regulator\n");