* [PATCH v5 0/3] media: atmel-isi: rework on the clock part and add runtime pm support
@ 2015-05-26 9:54 ` Josh Wu
0 siblings, 0 replies; 14+ messages in thread
From: Josh Wu @ 2015-05-26 9:54 UTC (permalink / raw)
To: Guennadi Liakhovetski, Laurent Pinchart
Cc: Linux Media Mailing List, Nicolas Ferre, linux-arm-kernel, Josh Wu
This patch series fix the peripheral clock code and enable runtime support.
Also it clean up the code which is for the compatiblity of mck.
Changes in v5:
- add new patch to fix the condition that codec request still in work.
- fix the error path in start_streaming() thanks to Laurent.
Changes in v4:
- need to call pm_runtime_disable() in atmel_isi_remove().
- merged the patch which remove isi disable code in atmel_isi_probe() as
isi peripherial clock is not enabled in this moment.
- refine the commit log
Changes in v3:
- remove useless definition: ISI_DEFAULT_MCLK_FREQ
Changes in v2:
- merged v1 two patch into one.
- use runtime_pm_put() instead of runtime_pm_put_sync()
- enable peripheral clock before access ISI registers.
- totally remove clock_start()/clock_stop() as they are optional.
Josh Wu (3):
media: atmel-isi: disable ISI even it has codec request in
stop_streaming()
media: atmel-isi: add runtime pm support
media: atmel-isi: remove mck back compatiable code as it's not need
drivers/media/platform/soc_camera/atmel-isi.c | 105 ++++++++++++--------------
1 file changed, 48 insertions(+), 57 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v5 0/3] media: atmel-isi: rework on the clock part and add runtime pm support
@ 2015-05-26 9:54 ` Josh Wu
0 siblings, 0 replies; 14+ messages in thread
From: Josh Wu @ 2015-05-26 9:54 UTC (permalink / raw)
To: linux-arm-kernel
This patch series fix the peripheral clock code and enable runtime support.
Also it clean up the code which is for the compatiblity of mck.
Changes in v5:
- add new patch to fix the condition that codec request still in work.
- fix the error path in start_streaming() thanks to Laurent.
Changes in v4:
- need to call pm_runtime_disable() in atmel_isi_remove().
- merged the patch which remove isi disable code in atmel_isi_probe() as
isi peripherial clock is not enabled in this moment.
- refine the commit log
Changes in v3:
- remove useless definition: ISI_DEFAULT_MCLK_FREQ
Changes in v2:
- merged v1 two patch into one.
- use runtime_pm_put() instead of runtime_pm_put_sync()
- enable peripheral clock before access ISI registers.
- totally remove clock_start()/clock_stop() as they are optional.
Josh Wu (3):
media: atmel-isi: disable ISI even it has codec request in
stop_streaming()
media: atmel-isi: add runtime pm support
media: atmel-isi: remove mck back compatiable code as it's not need
drivers/media/platform/soc_camera/atmel-isi.c | 105 ++++++++++++--------------
1 file changed, 48 insertions(+), 57 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v5 1/3] media: atmel-isi: disable ISI even it has codec request in stop_streaming()
2015-05-26 9:54 ` Josh Wu
@ 2015-05-26 9:54 ` Josh Wu
-1 siblings, 0 replies; 14+ messages in thread
From: Josh Wu @ 2015-05-26 9:54 UTC (permalink / raw)
To: Guennadi Liakhovetski, Laurent Pinchart
Cc: Linux Media Mailing List, Nicolas Ferre, linux-arm-kernel, Josh Wu
In current code, stop_streaming() will just return if ISI is still
working in the codec. But this is incorrect, we need to disable ISI even
it is working on the codec. otherwise stop_streaming() will not work as
we expected.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
Changes in v5:
- add new patch to fix the condition that codec request still in work.
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/media/platform/soc_camera/atmel-isi.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 2879026..2227022 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -431,11 +431,9 @@ static void stop_streaming(struct vb2_queue *vq)
time_before(jiffies, timeout))
msleep(1);
- if (time_after(jiffies, timeout)) {
+ if (time_after(jiffies, timeout))
dev_err(icd->parent,
"Timeout waiting for finishing codec request\n");
- return;
- }
/* Disable interrupts */
isi_writel(isi, ISI_INTDIS,
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v5 1/3] media: atmel-isi: disable ISI even it has codec request in stop_streaming()
@ 2015-05-26 9:54 ` Josh Wu
0 siblings, 0 replies; 14+ messages in thread
From: Josh Wu @ 2015-05-26 9:54 UTC (permalink / raw)
To: linux-arm-kernel
In current code, stop_streaming() will just return if ISI is still
working in the codec. But this is incorrect, we need to disable ISI even
it is working on the codec. otherwise stop_streaming() will not work as
we expected.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
Changes in v5:
- add new patch to fix the condition that codec request still in work.
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/media/platform/soc_camera/atmel-isi.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 2879026..2227022 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -431,11 +431,9 @@ static void stop_streaming(struct vb2_queue *vq)
time_before(jiffies, timeout))
msleep(1);
- if (time_after(jiffies, timeout)) {
+ if (time_after(jiffies, timeout))
dev_err(icd->parent,
"Timeout waiting for finishing codec request\n");
- return;
- }
/* Disable interrupts */
isi_writel(isi, ISI_INTDIS,
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v5 2/3] media: atmel-isi: add runtime pm support
2015-05-26 9:54 ` Josh Wu
@ 2015-05-26 9:54 ` Josh Wu
-1 siblings, 0 replies; 14+ messages in thread
From: Josh Wu @ 2015-05-26 9:54 UTC (permalink / raw)
To: Guennadi Liakhovetski, Laurent Pinchart
Cc: Linux Media Mailing List, Nicolas Ferre, linux-arm-kernel, Josh Wu
The runtime pm resume/suspend will enable/disable pclk (ISI peripheral
clock).
And we need to call runtime_pm_get_sync()/runtime_pm_put() when we need
access ISI registers. In atmel_isi_probe(), remove the isi disable code
as in the moment ISI peripheral clock is not enable yet.
In the meantime, as clock_start()/clock_stop() is used to control the
mclk not ISI peripheral clock. So move this to start[stop]_streaming()
function.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
Changes in v5:
- fix the error path in start_streaming() thanks to Laurent.
Changes in v4:
- need to call pm_runtime_disable() in atmel_isi_remove().
- merged the patch which remove isi disable code in atmel_isi_probe() as
isi peripherial clock is not enabled in this moment.
- refine the commit log
Changes in v3: None
Changes in v2:
- merged v1 two patch into one.
- use runtime_pm_put() instead of runtime_pm_put_sync()
- enable peripheral clock before access ISI registers.
drivers/media/platform/soc_camera/atmel-isi.c | 55 +++++++++++++++++++++++----
1 file changed, 47 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 2227022..0ea360a 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -20,6 +20,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/slab.h>
#include <media/atmel-isi.h>
@@ -386,10 +387,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
struct atmel_isi *isi = ici->priv;
int ret;
+ pm_runtime_get_sync(ici->v4l2_dev.dev);
+
/* Reset ISI */
ret = atmel_isi_wait_status(isi, WAIT_ISI_RESET);
if (ret < 0) {
dev_err(icd->parent, "Reset ISI timed out\n");
+ pm_runtime_put(ici->v4l2_dev.dev);
return ret;
}
/* Disable all interrupts */
@@ -443,6 +447,8 @@ static void stop_streaming(struct vb2_queue *vq)
ret = atmel_isi_wait_status(isi, WAIT_ISI_DISABLE);
if (ret < 0)
dev_err(icd->parent, "Disable ISI timed out\n");
+
+ pm_runtime_put(ici->v4l2_dev.dev);
}
static struct vb2_ops isi_video_qops = {
@@ -514,7 +520,13 @@ static int isi_camera_set_fmt(struct soc_camera_device *icd,
if (mf->code != xlate->code)
return -EINVAL;
+ /* Enable PM and peripheral clock before operate isi registers */
+ pm_runtime_get_sync(ici->v4l2_dev.dev);
+
ret = configure_geometry(isi, pix->width, pix->height, xlate->code);
+
+ pm_runtime_put(ici->v4l2_dev.dev);
+
if (ret < 0)
return ret;
@@ -734,14 +746,9 @@ static int isi_camera_clock_start(struct soc_camera_host *ici)
struct atmel_isi *isi = ici->priv;
int ret;
- ret = clk_prepare_enable(isi->pclk);
- if (ret)
- return ret;
-
if (!IS_ERR(isi->mck)) {
ret = clk_prepare_enable(isi->mck);
if (ret) {
- clk_disable_unprepare(isi->pclk);
return ret;
}
}
@@ -756,7 +763,6 @@ static void isi_camera_clock_stop(struct soc_camera_host *ici)
if (!IS_ERR(isi->mck))
clk_disable_unprepare(isi->mck);
- clk_disable_unprepare(isi->pclk);
}
static unsigned int isi_camera_poll(struct file *file, poll_table *pt)
@@ -853,9 +859,14 @@ static int isi_camera_set_bus_param(struct soc_camera_device *icd)
cfg1 |= ISI_CFG1_THMASK_BEATS_16;
+ /* Enable PM and peripheral clock before operate isi registers */
+ pm_runtime_get_sync(ici->v4l2_dev.dev);
+
isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
isi_writel(isi, ISI_CFG1, cfg1);
+ pm_runtime_put(ici->v4l2_dev.dev);
+
return 0;
}
@@ -887,6 +898,7 @@ static int atmel_isi_remove(struct platform_device *pdev)
sizeof(struct fbd) * MAX_BUFFER_NUM,
isi->p_fb_descriptors,
isi->fb_descriptors_phys);
+ pm_runtime_disable(&pdev->dev);
return 0;
}
@@ -1025,8 +1037,6 @@ static int atmel_isi_probe(struct platform_device *pdev)
if (isi->pdata.data_width_flags & ISI_DATAWIDTH_10)
isi->width_flags |= 1 << 9;
- isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
-
irq = platform_get_irq(pdev, 0);
if (IS_ERR_VALUE(irq)) {
ret = irq;
@@ -1047,6 +1057,9 @@ static int atmel_isi_probe(struct platform_device *pdev)
soc_host->v4l2_dev.dev = &pdev->dev;
soc_host->nr = pdev->id;
+ pm_suspend_ignore_children(&pdev->dev, true);
+ pm_runtime_enable(&pdev->dev);
+
if (isi->pdata.asd_sizes) {
soc_host->asd = isi->pdata.asd;
soc_host->asd_sizes = isi->pdata.asd_sizes;
@@ -1060,6 +1073,7 @@ static int atmel_isi_probe(struct platform_device *pdev)
return 0;
err_register_soc_camera_host:
+ pm_runtime_disable(&pdev->dev);
err_req_irq:
err_ioremap:
vb2_dma_contig_cleanup_ctx(isi->alloc_ctx);
@@ -1072,6 +1086,30 @@ err_alloc_ctx:
return ret;
}
+static int atmel_isi_runtime_suspend(struct device *dev)
+{
+ struct soc_camera_host *soc_host = to_soc_camera_host(dev);
+ struct atmel_isi *isi = container_of(soc_host,
+ struct atmel_isi, soc_host);
+
+ clk_disable_unprepare(isi->pclk);
+
+ return 0;
+}
+static int atmel_isi_runtime_resume(struct device *dev)
+{
+ struct soc_camera_host *soc_host = to_soc_camera_host(dev);
+ struct atmel_isi *isi = container_of(soc_host,
+ struct atmel_isi, soc_host);
+
+ return clk_prepare_enable(isi->pclk);
+}
+
+static const struct dev_pm_ops atmel_isi_dev_pm_ops = {
+ SET_RUNTIME_PM_OPS(atmel_isi_runtime_suspend,
+ atmel_isi_runtime_resume, NULL)
+};
+
static const struct of_device_id atmel_isi_of_match[] = {
{ .compatible = "atmel,at91sam9g45-isi" },
{ }
@@ -1083,6 +1121,7 @@ static struct platform_driver atmel_isi_driver = {
.driver = {
.name = "atmel_isi",
.of_match_table = of_match_ptr(atmel_isi_of_match),
+ .pm = &atmel_isi_dev_pm_ops,
},
};
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v5 2/3] media: atmel-isi: add runtime pm support
@ 2015-05-26 9:54 ` Josh Wu
0 siblings, 0 replies; 14+ messages in thread
From: Josh Wu @ 2015-05-26 9:54 UTC (permalink / raw)
To: linux-arm-kernel
The runtime pm resume/suspend will enable/disable pclk (ISI peripheral
clock).
And we need to call runtime_pm_get_sync()/runtime_pm_put() when we need
access ISI registers. In atmel_isi_probe(), remove the isi disable code
as in the moment ISI peripheral clock is not enable yet.
In the meantime, as clock_start()/clock_stop() is used to control the
mclk not ISI peripheral clock. So move this to start[stop]_streaming()
function.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
Changes in v5:
- fix the error path in start_streaming() thanks to Laurent.
Changes in v4:
- need to call pm_runtime_disable() in atmel_isi_remove().
- merged the patch which remove isi disable code in atmel_isi_probe() as
isi peripherial clock is not enabled in this moment.
- refine the commit log
Changes in v3: None
Changes in v2:
- merged v1 two patch into one.
- use runtime_pm_put() instead of runtime_pm_put_sync()
- enable peripheral clock before access ISI registers.
drivers/media/platform/soc_camera/atmel-isi.c | 55 +++++++++++++++++++++++----
1 file changed, 47 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 2227022..0ea360a 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -20,6 +20,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/slab.h>
#include <media/atmel-isi.h>
@@ -386,10 +387,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
struct atmel_isi *isi = ici->priv;
int ret;
+ pm_runtime_get_sync(ici->v4l2_dev.dev);
+
/* Reset ISI */
ret = atmel_isi_wait_status(isi, WAIT_ISI_RESET);
if (ret < 0) {
dev_err(icd->parent, "Reset ISI timed out\n");
+ pm_runtime_put(ici->v4l2_dev.dev);
return ret;
}
/* Disable all interrupts */
@@ -443,6 +447,8 @@ static void stop_streaming(struct vb2_queue *vq)
ret = atmel_isi_wait_status(isi, WAIT_ISI_DISABLE);
if (ret < 0)
dev_err(icd->parent, "Disable ISI timed out\n");
+
+ pm_runtime_put(ici->v4l2_dev.dev);
}
static struct vb2_ops isi_video_qops = {
@@ -514,7 +520,13 @@ static int isi_camera_set_fmt(struct soc_camera_device *icd,
if (mf->code != xlate->code)
return -EINVAL;
+ /* Enable PM and peripheral clock before operate isi registers */
+ pm_runtime_get_sync(ici->v4l2_dev.dev);
+
ret = configure_geometry(isi, pix->width, pix->height, xlate->code);
+
+ pm_runtime_put(ici->v4l2_dev.dev);
+
if (ret < 0)
return ret;
@@ -734,14 +746,9 @@ static int isi_camera_clock_start(struct soc_camera_host *ici)
struct atmel_isi *isi = ici->priv;
int ret;
- ret = clk_prepare_enable(isi->pclk);
- if (ret)
- return ret;
-
if (!IS_ERR(isi->mck)) {
ret = clk_prepare_enable(isi->mck);
if (ret) {
- clk_disable_unprepare(isi->pclk);
return ret;
}
}
@@ -756,7 +763,6 @@ static void isi_camera_clock_stop(struct soc_camera_host *ici)
if (!IS_ERR(isi->mck))
clk_disable_unprepare(isi->mck);
- clk_disable_unprepare(isi->pclk);
}
static unsigned int isi_camera_poll(struct file *file, poll_table *pt)
@@ -853,9 +859,14 @@ static int isi_camera_set_bus_param(struct soc_camera_device *icd)
cfg1 |= ISI_CFG1_THMASK_BEATS_16;
+ /* Enable PM and peripheral clock before operate isi registers */
+ pm_runtime_get_sync(ici->v4l2_dev.dev);
+
isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
isi_writel(isi, ISI_CFG1, cfg1);
+ pm_runtime_put(ici->v4l2_dev.dev);
+
return 0;
}
@@ -887,6 +898,7 @@ static int atmel_isi_remove(struct platform_device *pdev)
sizeof(struct fbd) * MAX_BUFFER_NUM,
isi->p_fb_descriptors,
isi->fb_descriptors_phys);
+ pm_runtime_disable(&pdev->dev);
return 0;
}
@@ -1025,8 +1037,6 @@ static int atmel_isi_probe(struct platform_device *pdev)
if (isi->pdata.data_width_flags & ISI_DATAWIDTH_10)
isi->width_flags |= 1 << 9;
- isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
-
irq = platform_get_irq(pdev, 0);
if (IS_ERR_VALUE(irq)) {
ret = irq;
@@ -1047,6 +1057,9 @@ static int atmel_isi_probe(struct platform_device *pdev)
soc_host->v4l2_dev.dev = &pdev->dev;
soc_host->nr = pdev->id;
+ pm_suspend_ignore_children(&pdev->dev, true);
+ pm_runtime_enable(&pdev->dev);
+
if (isi->pdata.asd_sizes) {
soc_host->asd = isi->pdata.asd;
soc_host->asd_sizes = isi->pdata.asd_sizes;
@@ -1060,6 +1073,7 @@ static int atmel_isi_probe(struct platform_device *pdev)
return 0;
err_register_soc_camera_host:
+ pm_runtime_disable(&pdev->dev);
err_req_irq:
err_ioremap:
vb2_dma_contig_cleanup_ctx(isi->alloc_ctx);
@@ -1072,6 +1086,30 @@ err_alloc_ctx:
return ret;
}
+static int atmel_isi_runtime_suspend(struct device *dev)
+{
+ struct soc_camera_host *soc_host = to_soc_camera_host(dev);
+ struct atmel_isi *isi = container_of(soc_host,
+ struct atmel_isi, soc_host);
+
+ clk_disable_unprepare(isi->pclk);
+
+ return 0;
+}
+static int atmel_isi_runtime_resume(struct device *dev)
+{
+ struct soc_camera_host *soc_host = to_soc_camera_host(dev);
+ struct atmel_isi *isi = container_of(soc_host,
+ struct atmel_isi, soc_host);
+
+ return clk_prepare_enable(isi->pclk);
+}
+
+static const struct dev_pm_ops atmel_isi_dev_pm_ops = {
+ SET_RUNTIME_PM_OPS(atmel_isi_runtime_suspend,
+ atmel_isi_runtime_resume, NULL)
+};
+
static const struct of_device_id atmel_isi_of_match[] = {
{ .compatible = "atmel,at91sam9g45-isi" },
{ }
@@ -1083,6 +1121,7 @@ static struct platform_driver atmel_isi_driver = {
.driver = {
.name = "atmel_isi",
.of_match_table = of_match_ptr(atmel_isi_of_match),
+ .pm = &atmel_isi_dev_pm_ops,
},
};
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v5 3/3] media: atmel-isi: remove mck back compatiable code as it's not need
2015-05-26 9:54 ` Josh Wu
@ 2015-05-26 9:54 ` Josh Wu
-1 siblings, 0 replies; 14+ messages in thread
From: Josh Wu @ 2015-05-26 9:54 UTC (permalink / raw)
To: Guennadi Liakhovetski, Laurent Pinchart
Cc: Linux Media Mailing List, Nicolas Ferre, linux-arm-kernel, Josh Wu
The master clock should handled by sensor itself.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- remove useless definition: ISI_DEFAULT_MCLK_FREQ
Changes in v2:
- totally remove clock_start()/clock_stop() as they are optional.
drivers/media/platform/soc_camera/atmel-isi.c | 46 ---------------------------
1 file changed, 46 deletions(-)
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 0ea360a..9070172 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -35,7 +35,6 @@
#define VID_LIMIT_BYTES (16 * 1024 * 1024)
#define MIN_FRAME_RATE 15
#define FRAME_INTERVAL_MILLI_SEC (1000 / MIN_FRAME_RATE)
-#define ISI_DEFAULT_MCLK_FREQ 25000000
/* Frame buffer descriptor */
struct fbd {
@@ -83,8 +82,6 @@ struct atmel_isi {
struct completion complete;
/* ISI peripherial clock */
struct clk *pclk;
- /* ISI_MCK, feed to camera sensor to generate pixel clock */
- struct clk *mck;
unsigned int irq;
struct isi_platform_data pdata;
@@ -740,31 +737,6 @@ static void isi_camera_remove_device(struct soc_camera_device *icd)
icd->devnum);
}
-/* Called with .host_lock held */
-static int isi_camera_clock_start(struct soc_camera_host *ici)
-{
- struct atmel_isi *isi = ici->priv;
- int ret;
-
- if (!IS_ERR(isi->mck)) {
- ret = clk_prepare_enable(isi->mck);
- if (ret) {
- return ret;
- }
- }
-
- return 0;
-}
-
-/* Called with .host_lock held */
-static void isi_camera_clock_stop(struct soc_camera_host *ici)
-{
- struct atmel_isi *isi = ici->priv;
-
- if (!IS_ERR(isi->mck))
- clk_disable_unprepare(isi->mck);
-}
-
static unsigned int isi_camera_poll(struct file *file, poll_table *pt)
{
struct soc_camera_device *icd = file->private_data;
@@ -874,8 +846,6 @@ static struct soc_camera_host_ops isi_soc_camera_host_ops = {
.owner = THIS_MODULE,
.add = isi_camera_add_device,
.remove = isi_camera_remove_device,
- .clock_start = isi_camera_clock_start,
- .clock_stop = isi_camera_clock_stop,
.set_fmt = isi_camera_set_fmt,
.try_fmt = isi_camera_try_fmt,
.get_formats = isi_camera_get_formats,
@@ -912,7 +882,6 @@ static int atmel_isi_probe_dt(struct atmel_isi *isi,
/* Default settings for ISI */
isi->pdata.full_mode = 1;
- isi->pdata.mck_hz = ISI_DEFAULT_MCLK_FREQ;
isi->pdata.frate = ISI_CFG1_FRATE_CAPTURE_ALL;
np = of_graph_get_next_endpoint(np, NULL);
@@ -988,21 +957,6 @@ static int atmel_isi_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&isi->video_buffer_list);
INIT_LIST_HEAD(&isi->dma_desc_head);
- /* ISI_MCK is the sensor master clock. It should be handled by the
- * sensor driver directly, as the ISI has no use for that clock. Make
- * the clock optional here while platforms transition to the correct
- * model.
- */
- isi->mck = devm_clk_get(dev, "isi_mck");
- if (!IS_ERR(isi->mck)) {
- /* Set ISI_MCK's frequency, it should be faster than pixel
- * clock.
- */
- ret = clk_set_rate(isi->mck, isi->pdata.mck_hz);
- if (ret < 0)
- return ret;
- }
-
isi->p_fb_descriptors = dma_alloc_coherent(&pdev->dev,
sizeof(struct fbd) * MAX_BUFFER_NUM,
&isi->fb_descriptors_phys,
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v5 3/3] media: atmel-isi: remove mck back compatiable code as it's not need
@ 2015-05-26 9:54 ` Josh Wu
0 siblings, 0 replies; 14+ messages in thread
From: Josh Wu @ 2015-05-26 9:54 UTC (permalink / raw)
To: linux-arm-kernel
The master clock should handled by sensor itself.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- remove useless definition: ISI_DEFAULT_MCLK_FREQ
Changes in v2:
- totally remove clock_start()/clock_stop() as they are optional.
drivers/media/platform/soc_camera/atmel-isi.c | 46 ---------------------------
1 file changed, 46 deletions(-)
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 0ea360a..9070172 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -35,7 +35,6 @@
#define VID_LIMIT_BYTES (16 * 1024 * 1024)
#define MIN_FRAME_RATE 15
#define FRAME_INTERVAL_MILLI_SEC (1000 / MIN_FRAME_RATE)
-#define ISI_DEFAULT_MCLK_FREQ 25000000
/* Frame buffer descriptor */
struct fbd {
@@ -83,8 +82,6 @@ struct atmel_isi {
struct completion complete;
/* ISI peripherial clock */
struct clk *pclk;
- /* ISI_MCK, feed to camera sensor to generate pixel clock */
- struct clk *mck;
unsigned int irq;
struct isi_platform_data pdata;
@@ -740,31 +737,6 @@ static void isi_camera_remove_device(struct soc_camera_device *icd)
icd->devnum);
}
-/* Called with .host_lock held */
-static int isi_camera_clock_start(struct soc_camera_host *ici)
-{
- struct atmel_isi *isi = ici->priv;
- int ret;
-
- if (!IS_ERR(isi->mck)) {
- ret = clk_prepare_enable(isi->mck);
- if (ret) {
- return ret;
- }
- }
-
- return 0;
-}
-
-/* Called with .host_lock held */
-static void isi_camera_clock_stop(struct soc_camera_host *ici)
-{
- struct atmel_isi *isi = ici->priv;
-
- if (!IS_ERR(isi->mck))
- clk_disable_unprepare(isi->mck);
-}
-
static unsigned int isi_camera_poll(struct file *file, poll_table *pt)
{
struct soc_camera_device *icd = file->private_data;
@@ -874,8 +846,6 @@ static struct soc_camera_host_ops isi_soc_camera_host_ops = {
.owner = THIS_MODULE,
.add = isi_camera_add_device,
.remove = isi_camera_remove_device,
- .clock_start = isi_camera_clock_start,
- .clock_stop = isi_camera_clock_stop,
.set_fmt = isi_camera_set_fmt,
.try_fmt = isi_camera_try_fmt,
.get_formats = isi_camera_get_formats,
@@ -912,7 +882,6 @@ static int atmel_isi_probe_dt(struct atmel_isi *isi,
/* Default settings for ISI */
isi->pdata.full_mode = 1;
- isi->pdata.mck_hz = ISI_DEFAULT_MCLK_FREQ;
isi->pdata.frate = ISI_CFG1_FRATE_CAPTURE_ALL;
np = of_graph_get_next_endpoint(np, NULL);
@@ -988,21 +957,6 @@ static int atmel_isi_probe(struct platform_device *pdev)
INIT_LIST_HEAD(&isi->video_buffer_list);
INIT_LIST_HEAD(&isi->dma_desc_head);
- /* ISI_MCK is the sensor master clock. It should be handled by the
- * sensor driver directly, as the ISI has no use for that clock. Make
- * the clock optional here while platforms transition to the correct
- * model.
- */
- isi->mck = devm_clk_get(dev, "isi_mck");
- if (!IS_ERR(isi->mck)) {
- /* Set ISI_MCK's frequency, it should be faster than pixel
- * clock.
- */
- ret = clk_set_rate(isi->mck, isi->pdata.mck_hz);
- if (ret < 0)
- return ret;
- }
-
isi->p_fb_descriptors = dma_alloc_coherent(&pdev->dev,
sizeof(struct fbd) * MAX_BUFFER_NUM,
&isi->fb_descriptors_phys,
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v5 2/3] media: atmel-isi: add runtime pm support
2015-05-26 9:54 ` Josh Wu
@ 2015-05-26 11:23 ` Laurent Pinchart
-1 siblings, 0 replies; 14+ messages in thread
From: Laurent Pinchart @ 2015-05-26 11:23 UTC (permalink / raw)
To: Josh Wu
Cc: Guennadi Liakhovetski, Linux Media Mailing List, Nicolas Ferre,
linux-arm-kernel
Hi Josh,
Thank you for the patch.
On Tuesday 26 May 2015 17:54:46 Josh Wu wrote:
> The runtime pm resume/suspend will enable/disable pclk (ISI peripheral
> clock).
> And we need to call runtime_pm_get_sync()/runtime_pm_put() when we need
> access ISI registers. In atmel_isi_probe(), remove the isi disable code
> as in the moment ISI peripheral clock is not enable yet.
>
> In the meantime, as clock_start()/clock_stop() is used to control the
> mclk not ISI peripheral clock. So move this to start[stop]_streaming()
> function.
>
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>
> Changes in v5:
> - fix the error path in start_streaming() thanks to Laurent.
>
> Changes in v4:
> - need to call pm_runtime_disable() in atmel_isi_remove().
> - merged the patch which remove isi disable code in atmel_isi_probe() as
> isi peripherial clock is not enabled in this moment.
> - refine the commit log
>
> Changes in v3: None
> Changes in v2:
> - merged v1 two patch into one.
> - use runtime_pm_put() instead of runtime_pm_put_sync()
> - enable peripheral clock before access ISI registers.
>
> drivers/media/platform/soc_camera/atmel-isi.c | 55 ++++++++++++++++++++----
> 1 file changed, 47 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c
> b/drivers/media/platform/soc_camera/atmel-isi.c index 2227022..0ea360a
> 100644
> --- a/drivers/media/platform/soc_camera/atmel-isi.c
> +++ b/drivers/media/platform/soc_camera/atmel-isi.c
> @@ -20,6 +20,7 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> #include <linux/slab.h>
>
> #include <media/atmel-isi.h>
> @@ -386,10 +387,13 @@ static int start_streaming(struct vb2_queue *vq,
> unsigned int count) struct atmel_isi *isi = ici->priv;
> int ret;
>
> + pm_runtime_get_sync(ici->v4l2_dev.dev);
> +
> /* Reset ISI */
> ret = atmel_isi_wait_status(isi, WAIT_ISI_RESET);
> if (ret < 0) {
> dev_err(icd->parent, "Reset ISI timed out\n");
> + pm_runtime_put(ici->v4l2_dev.dev);
> return ret;
> }
> /* Disable all interrupts */
> @@ -443,6 +447,8 @@ static void stop_streaming(struct vb2_queue *vq)
> ret = atmel_isi_wait_status(isi, WAIT_ISI_DISABLE);
> if (ret < 0)
> dev_err(icd->parent, "Disable ISI timed out\n");
> +
> + pm_runtime_put(ici->v4l2_dev.dev);
> }
>
> static struct vb2_ops isi_video_qops = {
> @@ -514,7 +520,13 @@ static int isi_camera_set_fmt(struct soc_camera_device
> *icd, if (mf->code != xlate->code)
> return -EINVAL;
>
> + /* Enable PM and peripheral clock before operate isi registers */
> + pm_runtime_get_sync(ici->v4l2_dev.dev);
> +
> ret = configure_geometry(isi, pix->width, pix->height, xlate->code);
> +
> + pm_runtime_put(ici->v4l2_dev.dev);
> +
> if (ret < 0)
> return ret;
>
> @@ -734,14 +746,9 @@ static int isi_camera_clock_start(struct
> soc_camera_host *ici) struct atmel_isi *isi = ici->priv;
> int ret;
>
> - ret = clk_prepare_enable(isi->pclk);
> - if (ret)
> - return ret;
> -
> if (!IS_ERR(isi->mck)) {
> ret = clk_prepare_enable(isi->mck);
> if (ret) {
> - clk_disable_unprepare(isi->pclk);
> return ret;
> }
> }
> @@ -756,7 +763,6 @@ static void isi_camera_clock_stop(struct soc_camera_host
> *ici)
>
> if (!IS_ERR(isi->mck))
> clk_disable_unprepare(isi->mck);
> - clk_disable_unprepare(isi->pclk);
> }
>
> static unsigned int isi_camera_poll(struct file *file, poll_table *pt)
> @@ -853,9 +859,14 @@ static int isi_camera_set_bus_param(struct
> soc_camera_device *icd)
>
> cfg1 |= ISI_CFG1_THMASK_BEATS_16;
>
> + /* Enable PM and peripheral clock before operate isi registers */
> + pm_runtime_get_sync(ici->v4l2_dev.dev);
> +
> isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
> isi_writel(isi, ISI_CFG1, cfg1);
>
> + pm_runtime_put(ici->v4l2_dev.dev);
> +
> return 0;
> }
>
> @@ -887,6 +898,7 @@ static int atmel_isi_remove(struct platform_device
> *pdev) sizeof(struct fbd) * MAX_BUFFER_NUM,
> isi->p_fb_descriptors,
> isi->fb_descriptors_phys);
> + pm_runtime_disable(&pdev->dev);
>
> return 0;
> }
> @@ -1025,8 +1037,6 @@ static int atmel_isi_probe(struct platform_device
> *pdev) if (isi->pdata.data_width_flags & ISI_DATAWIDTH_10)
> isi->width_flags |= 1 << 9;
>
> - isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
> -
> irq = platform_get_irq(pdev, 0);
> if (IS_ERR_VALUE(irq)) {
> ret = irq;
> @@ -1047,6 +1057,9 @@ static int atmel_isi_probe(struct platform_device
> *pdev) soc_host->v4l2_dev.dev = &pdev->dev;
> soc_host->nr = pdev->id;
>
> + pm_suspend_ignore_children(&pdev->dev, true);
> + pm_runtime_enable(&pdev->dev);
> +
> if (isi->pdata.asd_sizes) {
> soc_host->asd = isi->pdata.asd;
> soc_host->asd_sizes = isi->pdata.asd_sizes;
> @@ -1060,6 +1073,7 @@ static int atmel_isi_probe(struct platform_device
> *pdev) return 0;
>
> err_register_soc_camera_host:
> + pm_runtime_disable(&pdev->dev);
> err_req_irq:
> err_ioremap:
> vb2_dma_contig_cleanup_ctx(isi->alloc_ctx);
> @@ -1072,6 +1086,30 @@ err_alloc_ctx:
> return ret;
> }
>
> +static int atmel_isi_runtime_suspend(struct device *dev)
> +{
> + struct soc_camera_host *soc_host = to_soc_camera_host(dev);
> + struct atmel_isi *isi = container_of(soc_host,
> + struct atmel_isi, soc_host);
> +
> + clk_disable_unprepare(isi->pclk);
> +
> + return 0;
> +}
> +static int atmel_isi_runtime_resume(struct device *dev)
> +{
> + struct soc_camera_host *soc_host = to_soc_camera_host(dev);
> + struct atmel_isi *isi = container_of(soc_host,
> + struct atmel_isi, soc_host);
> +
> + return clk_prepare_enable(isi->pclk);
> +}
> +
> +static const struct dev_pm_ops atmel_isi_dev_pm_ops = {
> + SET_RUNTIME_PM_OPS(atmel_isi_runtime_suspend,
> + atmel_isi_runtime_resume, NULL)
> +};
> +
> static const struct of_device_id atmel_isi_of_match[] = {
> { .compatible = "atmel,at91sam9g45-isi" },
> { }
> @@ -1083,6 +1121,7 @@ static struct platform_driver atmel_isi_driver = {
> .driver = {
> .name = "atmel_isi",
> .of_match_table = of_match_ptr(atmel_isi_of_match),
> + .pm = &atmel_isi_dev_pm_ops,
> },
> };
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v5 2/3] media: atmel-isi: add runtime pm support
@ 2015-05-26 11:23 ` Laurent Pinchart
0 siblings, 0 replies; 14+ messages in thread
From: Laurent Pinchart @ 2015-05-26 11:23 UTC (permalink / raw)
To: linux-arm-kernel
Hi Josh,
Thank you for the patch.
On Tuesday 26 May 2015 17:54:46 Josh Wu wrote:
> The runtime pm resume/suspend will enable/disable pclk (ISI peripheral
> clock).
> And we need to call runtime_pm_get_sync()/runtime_pm_put() when we need
> access ISI registers. In atmel_isi_probe(), remove the isi disable code
> as in the moment ISI peripheral clock is not enable yet.
>
> In the meantime, as clock_start()/clock_stop() is used to control the
> mclk not ISI peripheral clock. So move this to start[stop]_streaming()
> function.
>
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>
> Changes in v5:
> - fix the error path in start_streaming() thanks to Laurent.
>
> Changes in v4:
> - need to call pm_runtime_disable() in atmel_isi_remove().
> - merged the patch which remove isi disable code in atmel_isi_probe() as
> isi peripherial clock is not enabled in this moment.
> - refine the commit log
>
> Changes in v3: None
> Changes in v2:
> - merged v1 two patch into one.
> - use runtime_pm_put() instead of runtime_pm_put_sync()
> - enable peripheral clock before access ISI registers.
>
> drivers/media/platform/soc_camera/atmel-isi.c | 55 ++++++++++++++++++++----
> 1 file changed, 47 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c
> b/drivers/media/platform/soc_camera/atmel-isi.c index 2227022..0ea360a
> 100644
> --- a/drivers/media/platform/soc_camera/atmel-isi.c
> +++ b/drivers/media/platform/soc_camera/atmel-isi.c
> @@ -20,6 +20,7 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> #include <linux/slab.h>
>
> #include <media/atmel-isi.h>
> @@ -386,10 +387,13 @@ static int start_streaming(struct vb2_queue *vq,
> unsigned int count) struct atmel_isi *isi = ici->priv;
> int ret;
>
> + pm_runtime_get_sync(ici->v4l2_dev.dev);
> +
> /* Reset ISI */
> ret = atmel_isi_wait_status(isi, WAIT_ISI_RESET);
> if (ret < 0) {
> dev_err(icd->parent, "Reset ISI timed out\n");
> + pm_runtime_put(ici->v4l2_dev.dev);
> return ret;
> }
> /* Disable all interrupts */
> @@ -443,6 +447,8 @@ static void stop_streaming(struct vb2_queue *vq)
> ret = atmel_isi_wait_status(isi, WAIT_ISI_DISABLE);
> if (ret < 0)
> dev_err(icd->parent, "Disable ISI timed out\n");
> +
> + pm_runtime_put(ici->v4l2_dev.dev);
> }
>
> static struct vb2_ops isi_video_qops = {
> @@ -514,7 +520,13 @@ static int isi_camera_set_fmt(struct soc_camera_device
> *icd, if (mf->code != xlate->code)
> return -EINVAL;
>
> + /* Enable PM and peripheral clock before operate isi registers */
> + pm_runtime_get_sync(ici->v4l2_dev.dev);
> +
> ret = configure_geometry(isi, pix->width, pix->height, xlate->code);
> +
> + pm_runtime_put(ici->v4l2_dev.dev);
> +
> if (ret < 0)
> return ret;
>
> @@ -734,14 +746,9 @@ static int isi_camera_clock_start(struct
> soc_camera_host *ici) struct atmel_isi *isi = ici->priv;
> int ret;
>
> - ret = clk_prepare_enable(isi->pclk);
> - if (ret)
> - return ret;
> -
> if (!IS_ERR(isi->mck)) {
> ret = clk_prepare_enable(isi->mck);
> if (ret) {
> - clk_disable_unprepare(isi->pclk);
> return ret;
> }
> }
> @@ -756,7 +763,6 @@ static void isi_camera_clock_stop(struct soc_camera_host
> *ici)
>
> if (!IS_ERR(isi->mck))
> clk_disable_unprepare(isi->mck);
> - clk_disable_unprepare(isi->pclk);
> }
>
> static unsigned int isi_camera_poll(struct file *file, poll_table *pt)
> @@ -853,9 +859,14 @@ static int isi_camera_set_bus_param(struct
> soc_camera_device *icd)
>
> cfg1 |= ISI_CFG1_THMASK_BEATS_16;
>
> + /* Enable PM and peripheral clock before operate isi registers */
> + pm_runtime_get_sync(ici->v4l2_dev.dev);
> +
> isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
> isi_writel(isi, ISI_CFG1, cfg1);
>
> + pm_runtime_put(ici->v4l2_dev.dev);
> +
> return 0;
> }
>
> @@ -887,6 +898,7 @@ static int atmel_isi_remove(struct platform_device
> *pdev) sizeof(struct fbd) * MAX_BUFFER_NUM,
> isi->p_fb_descriptors,
> isi->fb_descriptors_phys);
> + pm_runtime_disable(&pdev->dev);
>
> return 0;
> }
> @@ -1025,8 +1037,6 @@ static int atmel_isi_probe(struct platform_device
> *pdev) if (isi->pdata.data_width_flags & ISI_DATAWIDTH_10)
> isi->width_flags |= 1 << 9;
>
> - isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
> -
> irq = platform_get_irq(pdev, 0);
> if (IS_ERR_VALUE(irq)) {
> ret = irq;
> @@ -1047,6 +1057,9 @@ static int atmel_isi_probe(struct platform_device
> *pdev) soc_host->v4l2_dev.dev = &pdev->dev;
> soc_host->nr = pdev->id;
>
> + pm_suspend_ignore_children(&pdev->dev, true);
> + pm_runtime_enable(&pdev->dev);
> +
> if (isi->pdata.asd_sizes) {
> soc_host->asd = isi->pdata.asd;
> soc_host->asd_sizes = isi->pdata.asd_sizes;
> @@ -1060,6 +1073,7 @@ static int atmel_isi_probe(struct platform_device
> *pdev) return 0;
>
> err_register_soc_camera_host:
> + pm_runtime_disable(&pdev->dev);
> err_req_irq:
> err_ioremap:
> vb2_dma_contig_cleanup_ctx(isi->alloc_ctx);
> @@ -1072,6 +1086,30 @@ err_alloc_ctx:
> return ret;
> }
>
> +static int atmel_isi_runtime_suspend(struct device *dev)
> +{
> + struct soc_camera_host *soc_host = to_soc_camera_host(dev);
> + struct atmel_isi *isi = container_of(soc_host,
> + struct atmel_isi, soc_host);
> +
> + clk_disable_unprepare(isi->pclk);
> +
> + return 0;
> +}
> +static int atmel_isi_runtime_resume(struct device *dev)
> +{
> + struct soc_camera_host *soc_host = to_soc_camera_host(dev);
> + struct atmel_isi *isi = container_of(soc_host,
> + struct atmel_isi, soc_host);
> +
> + return clk_prepare_enable(isi->pclk);
> +}
> +
> +static const struct dev_pm_ops atmel_isi_dev_pm_ops = {
> + SET_RUNTIME_PM_OPS(atmel_isi_runtime_suspend,
> + atmel_isi_runtime_resume, NULL)
> +};
> +
> static const struct of_device_id atmel_isi_of_match[] = {
> { .compatible = "atmel,at91sam9g45-isi" },
> { }
> @@ -1083,6 +1121,7 @@ static struct platform_driver atmel_isi_driver = {
> .driver = {
> .name = "atmel_isi",
> .of_match_table = of_match_ptr(atmel_isi_of_match),
> + .pm = &atmel_isi_dev_pm_ops,
> },
> };
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v5 0/3] media: atmel-isi: rework on the clock part and add runtime pm support
2015-05-26 9:54 ` Josh Wu
@ 2015-06-11 3:47 ` Josh Wu
-1 siblings, 0 replies; 14+ messages in thread
From: Josh Wu @ 2015-06-11 3:47 UTC (permalink / raw)
To: Guennadi Liakhovetski, Laurent Pinchart
Cc: Linux Media Mailing List, Nicolas Ferre, linux-arm-kernel
Hi, Guennadi
Any feedback for this patch series?
Best Regards,
Josh Wu
On 5/26/2015 5:54 PM, Josh Wu wrote:
> This patch series fix the peripheral clock code and enable runtime support.
> Also it clean up the code which is for the compatiblity of mck.
>
> Changes in v5:
> - add new patch to fix the condition that codec request still in work.
> - fix the error path in start_streaming() thanks to Laurent.
>
> Changes in v4:
> - need to call pm_runtime_disable() in atmel_isi_remove().
> - merged the patch which remove isi disable code in atmel_isi_probe() as
> isi peripherial clock is not enabled in this moment.
> - refine the commit log
>
> Changes in v3:
> - remove useless definition: ISI_DEFAULT_MCLK_FREQ
>
> Changes in v2:
> - merged v1 two patch into one.
> - use runtime_pm_put() instead of runtime_pm_put_sync()
> - enable peripheral clock before access ISI registers.
> - totally remove clock_start()/clock_stop() as they are optional.
>
> Josh Wu (3):
> media: atmel-isi: disable ISI even it has codec request in
> stop_streaming()
> media: atmel-isi: add runtime pm support
> media: atmel-isi: remove mck back compatiable code as it's not need
>
> drivers/media/platform/soc_camera/atmel-isi.c | 105 ++++++++++++--------------
> 1 file changed, 48 insertions(+), 57 deletions(-)
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v5 0/3] media: atmel-isi: rework on the clock part and add runtime pm support
@ 2015-06-11 3:47 ` Josh Wu
0 siblings, 0 replies; 14+ messages in thread
From: Josh Wu @ 2015-06-11 3:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi, Guennadi
Any feedback for this patch series?
Best Regards,
Josh Wu
On 5/26/2015 5:54 PM, Josh Wu wrote:
> This patch series fix the peripheral clock code and enable runtime support.
> Also it clean up the code which is for the compatiblity of mck.
>
> Changes in v5:
> - add new patch to fix the condition that codec request still in work.
> - fix the error path in start_streaming() thanks to Laurent.
>
> Changes in v4:
> - need to call pm_runtime_disable() in atmel_isi_remove().
> - merged the patch which remove isi disable code in atmel_isi_probe() as
> isi peripherial clock is not enabled in this moment.
> - refine the commit log
>
> Changes in v3:
> - remove useless definition: ISI_DEFAULT_MCLK_FREQ
>
> Changes in v2:
> - merged v1 two patch into one.
> - use runtime_pm_put() instead of runtime_pm_put_sync()
> - enable peripheral clock before access ISI registers.
> - totally remove clock_start()/clock_stop() as they are optional.
>
> Josh Wu (3):
> media: atmel-isi: disable ISI even it has codec request in
> stop_streaming()
> media: atmel-isi: add runtime pm support
> media: atmel-isi: remove mck back compatiable code as it's not need
>
> drivers/media/platform/soc_camera/atmel-isi.c | 105 ++++++++++++--------------
> 1 file changed, 48 insertions(+), 57 deletions(-)
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v5 0/3] media: atmel-isi: rework on the clock part and add runtime pm support
2015-06-11 3:47 ` Josh Wu
@ 2015-06-11 19:08 ` Guennadi Liakhovetski
-1 siblings, 0 replies; 14+ messages in thread
From: Guennadi Liakhovetski @ 2015-06-11 19:08 UTC (permalink / raw)
To: Josh Wu
Cc: Laurent Pinchart, Linux Media Mailing List, Nicolas Ferre,
linux-arm-kernel
Hi Josh,
On Thu, 11 Jun 2015, Josh Wu wrote:
> Hi, Guennadi
>
> Any feedback for this patch series?
Sorry, I haven't found the time to look at patches from you and William
Towle, they are at the top of my todo list now - after all the compulsory
things, of course. I'll handle them as soon as I find time. Sorry for the
delay.
Thanks
Guennadi
> Best Regards,
> Josh Wu
>
> On 5/26/2015 5:54 PM, Josh Wu wrote:
> > This patch series fix the peripheral clock code and enable runtime support.
> > Also it clean up the code which is for the compatiblity of mck.
> >
> > Changes in v5:
> > - add new patch to fix the condition that codec request still in work.
> > - fix the error path in start_streaming() thanks to Laurent.
> >
> > Changes in v4:
> > - need to call pm_runtime_disable() in atmel_isi_remove().
> > - merged the patch which remove isi disable code in atmel_isi_probe() as
> > isi peripherial clock is not enabled in this moment.
> > - refine the commit log
> >
> > Changes in v3:
> > - remove useless definition: ISI_DEFAULT_MCLK_FREQ
> >
> > Changes in v2:
> > - merged v1 two patch into one.
> > - use runtime_pm_put() instead of runtime_pm_put_sync()
> > - enable peripheral clock before access ISI registers.
> > - totally remove clock_start()/clock_stop() as they are optional.
> >
> > Josh Wu (3):
> > media: atmel-isi: disable ISI even it has codec request in
> > stop_streaming()
> > media: atmel-isi: add runtime pm support
> > media: atmel-isi: remove mck back compatiable code as it's not need
> >
> > drivers/media/platform/soc_camera/atmel-isi.c | 105
> > ++++++++++++--------------
> > 1 file changed, 48 insertions(+), 57 deletions(-)
> >
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v5 0/3] media: atmel-isi: rework on the clock part and add runtime pm support
@ 2015-06-11 19:08 ` Guennadi Liakhovetski
0 siblings, 0 replies; 14+ messages in thread
From: Guennadi Liakhovetski @ 2015-06-11 19:08 UTC (permalink / raw)
To: linux-arm-kernel
Hi Josh,
On Thu, 11 Jun 2015, Josh Wu wrote:
> Hi, Guennadi
>
> Any feedback for this patch series?
Sorry, I haven't found the time to look at patches from you and William
Towle, they are at the top of my todo list now - after all the compulsory
things, of course. I'll handle them as soon as I find time. Sorry for the
delay.
Thanks
Guennadi
> Best Regards,
> Josh Wu
>
> On 5/26/2015 5:54 PM, Josh Wu wrote:
> > This patch series fix the peripheral clock code and enable runtime support.
> > Also it clean up the code which is for the compatiblity of mck.
> >
> > Changes in v5:
> > - add new patch to fix the condition that codec request still in work.
> > - fix the error path in start_streaming() thanks to Laurent.
> >
> > Changes in v4:
> > - need to call pm_runtime_disable() in atmel_isi_remove().
> > - merged the patch which remove isi disable code in atmel_isi_probe() as
> > isi peripherial clock is not enabled in this moment.
> > - refine the commit log
> >
> > Changes in v3:
> > - remove useless definition: ISI_DEFAULT_MCLK_FREQ
> >
> > Changes in v2:
> > - merged v1 two patch into one.
> > - use runtime_pm_put() instead of runtime_pm_put_sync()
> > - enable peripheral clock before access ISI registers.
> > - totally remove clock_start()/clock_stop() as they are optional.
> >
> > Josh Wu (3):
> > media: atmel-isi: disable ISI even it has codec request in
> > stop_streaming()
> > media: atmel-isi: add runtime pm support
> > media: atmel-isi: remove mck back compatiable code as it's not need
> >
> > drivers/media/platform/soc_camera/atmel-isi.c | 105
> > ++++++++++++--------------
> > 1 file changed, 48 insertions(+), 57 deletions(-)
> >
>
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2015-06-11 19:09 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-26 9:54 [PATCH v5 0/3] media: atmel-isi: rework on the clock part and add runtime pm support Josh Wu
2015-05-26 9:54 ` Josh Wu
2015-05-26 9:54 ` [PATCH v5 1/3] media: atmel-isi: disable ISI even it has codec request in stop_streaming() Josh Wu
2015-05-26 9:54 ` Josh Wu
2015-05-26 9:54 ` [PATCH v5 2/3] media: atmel-isi: add runtime pm support Josh Wu
2015-05-26 9:54 ` Josh Wu
2015-05-26 11:23 ` Laurent Pinchart
2015-05-26 11:23 ` Laurent Pinchart
2015-05-26 9:54 ` [PATCH v5 3/3] media: atmel-isi: remove mck back compatiable code as it's not need Josh Wu
2015-05-26 9:54 ` Josh Wu
2015-06-11 3:47 ` [PATCH v5 0/3] media: atmel-isi: rework on the clock part and add runtime pm support Josh Wu
2015-06-11 3:47 ` Josh Wu
2015-06-11 19:08 ` Guennadi Liakhovetski
2015-06-11 19:08 ` Guennadi Liakhovetski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.