Skip to content

media: qcom: camss: Fully unprepare OPE clocks on suspend #1370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nihal Kumar Gupta (nihal231998) wants to merge 1 commit into
base: qcom-6.18.y
Choose a base branch
from
+30 −12
Open

media: qcom: camss: Fully unprepare OPE clocks on suspend #1370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions drivers/media/platform/qcom/camss/ope/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,8 @@ struct ope_dev {

struct icc_path *icc_data;
struct icc_path *icc_config;
struct clk_bulk_data *clks;
int nclks;

void __iomem *base;
void __iomem *base_rd;
Expand Down Expand Up @@ -3696,18 +3698,17 @@ static int ope_init_power(struct ope_dev *ope)
if (ret && ret != -ENODEV)
return dev_err_probe(dev, ret, "invalid OPP table\n");

ret = devm_pm_runtime_enable(dev);
if (ret)
return ret;
ret = devm_clk_bulk_get_all(dev, &ope->clks);
if (ret < 0)
return dev_err_probe(dev, ret, "failed to get clocks\n");
else if (!ret)
return dev_err_probe(dev, -EINVAL, "not enough clocks in DT\n");

ret = devm_pm_clk_create(dev);
ope->nclks = ret;
ret = devm_pm_runtime_enable(dev);
if (ret)
return ret;

ret = of_pm_clk_add_clks(dev);
if (ret < 0)
return ret;

return 0;
}

Expand Down Expand Up @@ -3752,6 +3753,7 @@ static int ope_probe(struct platform_device *pdev)
spin_lock_init(&ope->ctx_lock);
spin_lock_init(&ope->sched_lock);
INIT_WORK(&ope->run_work, ope_run_work);
platform_set_drvdata(pdev, ope);

ret = dma_set_mask(dev, DMA_BIT_MASK(32));
if (ret) {
Expand Down Expand Up @@ -3792,17 +3794,18 @@ static int ope_probe(struct platform_device *pdev)

/* ope ownership is transferred to ope_v4l2_register(), even on failure */
ret = ope_v4l2_register(ope);
if (ret)
if (ret) {
platform_set_drvdata(pdev, NULL);
return dev_err_probe(dev, ret, "V4L2 registration failed\n");

platform_set_drvdata(pdev, ope);
}

/* Everything @ope_irq() touches is in place, let interrupts in */
enable_irq(ope->irq);

return 0;

err_free:
platform_set_drvdata(pdev, NULL);
mutex_destroy(&ope->mutex);
kfree(ope);
return ret;
Expand All @@ -3816,14 +3819,29 @@ static void ope_remove(struct platform_device *pdev)
ope_unregister(ope);
}

static int ope_runtime_suspend(struct device *dev)
{
struct ope_dev *ope = dev_get_drvdata(dev);
clk_bulk_disable_unprepare(ope->nclks, ope->clks);

return 0;
}

static int ope_runtime_resume(struct device *dev)
{
struct ope_dev *ope = dev_get_drvdata(dev);

return clk_bulk_prepare_enable(ope->nclks, ope->clks);
}

static const struct of_device_id ope_dt_ids[] = {
{ .compatible = "qcom,qcm2290-camss-ope" },
{ },
};
MODULE_DEVICE_TABLE(of, ope_dt_ids);

static const struct dev_pm_ops ope_pm_ops = {
SET_RUNTIME_PM_OPS(pm_clk_suspend, pm_clk_resume, NULL)
SET_RUNTIME_PM_OPS(ope_runtime_suspend, ope_runtime_resume, NULL)
};

static struct platform_driver ope_driver = {
Expand Down
Loading