redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mxc-jpeg: Add support for multi power domain 

Attach the power domains in probe, detach in remove.

Signed-off-by: Mirela Rabulea <mirela.rabulea@nxp.com>
Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
(cherry picked from commit 5b766aa74094e73875282c110e0824e92af6c93e)
5.4-rM2-2.2.x-imx-squashed
Mirela Rabulea 2019-10-04 18:56:24 +03:00 committed by Dong Aisheng
parent d981b31e3c
commit 4d69ad2022
2 changed files with 79 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/media/platform/imx8/mxc-jpeg.c
View File

@ -15,6 +15,7 @@
#include <linux/irqreturn.h>
#include <linux/interrupt.h>
#include <linux/pm_runtime.h>
#include <linux/pm_domain.h>
#include <linux/string.h>
#include <media/v4l2-mem2mem.h>
@ -1994,6 +1995,58 @@ static struct v4l2_m2m_ops mxc_jpeg_m2m_ops = {
.job_abort = mxc_jpeg_job_abort,
};
static void mxc_jpeg_detach_pm_domains(struct mxc_jpeg_dev *jpeg)
{
int i;
for (i = 0; i < MXC_JPEG_NUM_PD; i++) {
if (jpeg->pd_link[i] && !IS_ERR(jpeg->pd_link[i]))
device_link_del(jpeg->pd_link[i]);
if (jpeg->pd_dev[i] && !IS_ERR(jpeg->pd_dev[i]))
dev_pm_domain_detach(jpeg->pd_dev[i], true);
jpeg->pd_dev[i] = NULL;
jpeg->pd_link[i] = NULL;
}
}
static int mxc_jpeg_attach_pm_domains(struct mxc_jpeg_dev *jpeg)
{
struct device *dev = jpeg->dev;
struct device_node *np = jpeg->pdev->dev.of_node;
int i, num_domains;
int ret;
num_domains = of_count_phandle_with_args(np, "power-domains",
"#power-domain-cells");
if (num_domains != MXC_JPEG_NUM_PD) {
dev_err(dev, "Expecting %d power domains, got %d\n",
MXC_JPEG_NUM_PD, num_domains);
return -EINVAL;
}
for (i = 0; i < MXC_JPEG_NUM_PD; i++) {
jpeg->pd_dev[i] = dev_pm_domain_attach_by_id(dev, i);
if (IS_ERR(jpeg->pd_dev[i])) {
ret = PTR_ERR(jpeg->pd_dev[i]);
goto fail;
}
jpeg->pd_link[i] = device_link_add(dev, jpeg->pd_dev[i],
DL_FLAG_STATELESS |
DL_FLAG_PM_RUNTIME |
DL_FLAG_RPM_ACTIVE);
if (IS_ERR(jpeg->pd_link[i])) {
ret = PTR_ERR(jpeg->pd_link[i]);
goto fail;
}
}
return 0;
fail:
mxc_jpeg_detach_pm_domains(jpeg);
return ret;
}
static int mxc_jpeg_probe(struct platform_device *pdev)
{
struct mxc_jpeg_dev *jpeg;
@ -2059,6 +2112,12 @@ static int mxc_jpeg_probe(struct platform_device *pdev)
goto err_clk;
}
ret = mxc_jpeg_attach_pm_domains(jpeg);
if (ret < 0) {
dev_err(dev, "failed to attach power domains %d\n", ret);
return ret;
}
/* v4l2 */
ret = v4l2_device_register(dev, &jpeg->v4l2_dev);
if (ret) {
@ -2184,6 +2243,7 @@ static int mxc_jpeg_remove(struct platform_device *pdev)
video_device_release(jpeg->dec_vdev);
v4l2_m2m_release(jpeg->m2m_dev);
v4l2_device_unregister(&jpeg->v4l2_dev);
mxc_jpeg_detach_pm_domains(jpeg);
return 0;
}

36
drivers/media/platform/imx8/mxc-jpeg.h
View File

@ -41,6 +41,7 @@
#define APP14 0xEE
#define MXC_JPEG_ENC_CONF_DONE 1
#define MXC_JPEG_MAX_PLANES 2
#define MXC_JPEG_NUM_PD 6
/**
@ -116,24 +117,25 @@ struct mxc_jpeg_slot_data {
};
struct mxc_jpeg_dev {
spinlock_t hw_lock;
unsigned int mode;
spinlock_t hw_lock;
unsigned int mode;
struct mutex lock;
bool enc;
bool dec;
struct clk *clk_ipg;
struct clk *clk_per;
struct platform_device *pdev;
struct device *dev;
void __iomem *base_reg;
void __iomem *enc_reg;
struct v4l2_device v4l2_dev;
struct v4l2_m2m_dev *m2m_dev;
struct video_device *dec_vdev;
unsigned int irq;
int id;
struct mxc_jpeg_slot_data slot_data[MXC_MAX_SLOTS];
bool enc;
bool dec;
struct clk *clk_ipg;
struct clk *clk_per;
struct platform_device *pdev;
struct device *dev;
void __iomem *base_reg;
void __iomem *enc_reg;
struct v4l2_device v4l2_dev;
struct v4l2_m2m_dev *m2m_dev;
struct video_device *dec_vdev;
unsigned int irq;
int id;
struct mxc_jpeg_slot_data slot_data[MXC_MAX_SLOTS];
struct device *pd_dev[MXC_JPEG_NUM_PD];
struct device_link *pd_link[MXC_JPEG_NUM_PD];
};
#define MXC_JPEG_MAX_COMPONENTS 4