* [PATCH v2 1/4] media: platform: Aspeed: Remove use of reset line
2019-04-24 15:16 [PATCH v2 0/4] Aspeed: Enable video engine Eddie James
@ 2019-04-24 15:16 ` Eddie James
2019-04-24 15:16 ` [PATCH v2 2/4] media: platform: Aspeed: Make reserved memory optional Eddie James
2019-04-24 15:16 ` [PATCH v2 3/4] media: dt-bindings: aspeed-video: Add missing memory-region property Eddie James
2 siblings, 0 replies; 7+ messages in thread
From: Eddie James @ 2019-04-24 15:16 UTC (permalink / raw)
To: linux-kernel
Cc: linux-aspeed, devicetree, linux-media, andrew, joel, robh+dt,
mark.rutland, mchehab, hverkuil, Eddie James
The reset line is toggled by enabling the clocks, so it's not necessary
to manually toggle the reset as well.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
---
drivers/media/platform/aspeed-video.c | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index 692e08e..55c55a6 100644
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -14,7 +14,6 @@
#include <linux/of_irq.h>
#include <linux/of_reserved_mem.h>
#include <linux/platform_device.h>
-#include <linux/reset.h>
#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/string.h>
@@ -208,7 +207,6 @@ struct aspeed_video {
void __iomem *base;
struct clk *eclk;
struct clk *vclk;
- struct reset_control *rst;
struct device *dev;
struct v4l2_ctrl_handler ctrl_handler;
@@ -483,19 +481,10 @@ static void aspeed_video_enable_mode_detect(struct aspeed_video *video)
aspeed_video_update(video, VE_SEQ_CTRL, 0, VE_SEQ_CTRL_TRIG_MODE_DET);
}
-static void aspeed_video_reset(struct aspeed_video *video)
-{
- /* Reset the engine */
- reset_control_assert(video->rst);
-
- /* Don't usleep here; function may be called in interrupt context */
- udelay(100);
- reset_control_deassert(video->rst);
-}
-
static void aspeed_video_off(struct aspeed_video *video)
{
- aspeed_video_reset(video);
+ /* Disable interrupts */
+ aspeed_video_write(video, VE_INTERRUPT_CTRL, 0);
/* Turn off the relevant clocks */
clk_disable_unprepare(video->vclk);
@@ -507,8 +496,6 @@ static void aspeed_video_on(struct aspeed_video *video)
/* Turn on the relevant clocks */
clk_prepare_enable(video->eclk);
clk_prepare_enable(video->vclk);
-
- aspeed_video_reset(video);
}
static void aspeed_video_bufs_done(struct aspeed_video *video,
@@ -1464,7 +1451,9 @@ static void aspeed_video_stop_streaming(struct vb2_queue *q)
* Need to force stop any DMA and try and get HW into a good
* state for future calls to start streaming again.
*/
- aspeed_video_reset(video);
+ aspeed_video_off(video);
+ aspeed_video_on(video);
+
aspeed_video_init_regs(video);
aspeed_video_get_resolution(video);
@@ -1619,12 +1608,6 @@ static int aspeed_video_init(struct aspeed_video *video)
return PTR_ERR(video->vclk);
}
- video->rst = devm_reset_control_get_exclusive(dev, NULL);
- if (IS_ERR(video->rst)) {
- dev_err(dev, "Unable to get VE reset\n");
- return PTR_ERR(video->rst);
- }
-
rc = of_reserved_mem_device_init(dev);
if (rc) {
dev_err(dev, "Unable to reserve memory\n");
--
1.8.3.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/4] media: platform: Aspeed: Make reserved memory optional
2019-04-24 15:16 [PATCH v2 0/4] Aspeed: Enable video engine Eddie James
2019-04-24 15:16 ` [PATCH v2 1/4] media: platform: Aspeed: Remove use of reset line Eddie James
@ 2019-04-24 15:16 ` Eddie James
2019-04-24 15:16 ` [PATCH v2 3/4] media: dt-bindings: aspeed-video: Add missing memory-region property Eddie James
2 siblings, 0 replies; 7+ messages in thread
From: Eddie James @ 2019-04-24 15:16 UTC (permalink / raw)
To: linux-kernel
Cc: linux-aspeed, devicetree, linux-media, andrew, joel, robh+dt,
mark.rutland, mchehab, hverkuil, Eddie James
Reserved memory doesn't need to be required; system memory would work
fine.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
drivers/media/platform/aspeed-video.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index 55c55a6..8144fe3 100644
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -1608,11 +1608,7 @@ static int aspeed_video_init(struct aspeed_video *video)
return PTR_ERR(video->vclk);
}
- rc = of_reserved_mem_device_init(dev);
- if (rc) {
- dev_err(dev, "Unable to reserve memory\n");
- return rc;
- }
+ of_reserved_mem_device_init(dev);
rc = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (rc) {
--
1.8.3.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 3/4] media: dt-bindings: aspeed-video: Add missing memory-region property
2019-04-24 15:16 [PATCH v2 0/4] Aspeed: Enable video engine Eddie James
2019-04-24 15:16 ` [PATCH v2 1/4] media: platform: Aspeed: Remove use of reset line Eddie James
2019-04-24 15:16 ` [PATCH v2 2/4] media: platform: Aspeed: Make reserved memory optional Eddie James
@ 2019-04-24 15:16 ` Eddie James
2019-04-24 21:17 ` Rob Herring
2 siblings, 1 reply; 7+ messages in thread
From: Eddie James @ 2019-04-24 15:16 UTC (permalink / raw)
To: linux-kernel
Cc: linux-aspeed, devicetree, linux-media, andrew, joel, robh+dt,
mark.rutland, mchehab, hverkuil, Eddie James
Missed documenting this property in the initial commit.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
Changes since v1:
- Add missing semi-colon
Documentation/devicetree/bindings/media/aspeed-video.txt | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation/devicetree/bindings/media/aspeed-video.txt b/Documentation/devicetree/bindings/media/aspeed-video.txt
index 78b464a..ce28945 100644
--- a/Documentation/devicetree/bindings/media/aspeed-video.txt
+++ b/Documentation/devicetree/bindings/media/aspeed-video.txt
@@ -14,6 +14,11 @@ Required properties:
the VE
- interrupts: the interrupt associated with the VE on this platform
+Optional properties:
+ - memory-region:
+ phandle to a memory region to allocate from, as defined in
+ Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt
+
Example:
video-engine@1e700000 {
@@ -23,4 +28,5 @@ video-engine@1e700000 {
clock-names = "vclk", "eclk";
resets = <&syscon ASPEED_RESET_VIDEO>;
interrupts = <7>;
+ memory-region = <&video_engine_memory>;
};
--
1.8.3.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 3/4] media: dt-bindings: aspeed-video: Add missing memory-region property
2019-04-24 15:16 ` [PATCH v2 3/4] media: dt-bindings: aspeed-video: Add missing memory-region property Eddie James
@ 2019-04-24 21:17 ` Rob Herring
2019-04-25 7:19 ` Hans Verkuil
2019-04-26 14:11 ` Eddie James
0 siblings, 2 replies; 7+ messages in thread
From: Rob Herring @ 2019-04-24 21:17 UTC (permalink / raw)
To: Eddie James
Cc: linux-kernel, linux-aspeed, devicetree, linux-media, andrew,
joel, robh+dt, mark.rutland, mchehab, hverkuil, Eddie James
On Wed, 24 Apr 2019 10:16:59 -0500, Eddie James wrote:
> Missed documenting this property in the initial commit.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> ---
> Changes since v1:
> - Add missing semi-colon
>
> Documentation/devicetree/bindings/media/aspeed-video.txt | 6 ++++++
> 1 file changed, 6 insertions(+)
>
Please add Acked-by/Reviewed-by tags when posting new versions. However,
there's no need to repost patches *only* to add the tags. The upstream
maintainer will do that for acks received on the version they apply.
If a tag was not added on purpose, please state why and what changed.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 3/4] media: dt-bindings: aspeed-video: Add missing memory-region property
2019-04-24 21:17 ` Rob Herring
@ 2019-04-25 7:19 ` Hans Verkuil
2019-04-26 14:11 ` Eddie James
1 sibling, 0 replies; 7+ messages in thread
From: Hans Verkuil @ 2019-04-25 7:19 UTC (permalink / raw)
To: Rob Herring, Eddie James
Cc: linux-kernel, linux-aspeed, devicetree, linux-media, andrew,
joel, robh+dt, mark.rutland, mchehab
On 4/24/19 11:17 PM, Rob Herring wrote:
> On Wed, 24 Apr 2019 10:16:59 -0500, Eddie James wrote:
>> Missed documenting this property in the initial commit.
>>
>> Signed-off-by: Eddie James <eajames@linux.ibm.com>
>> ---
>> Changes since v1:
>> - Add missing semi-colon
>>
>> Documentation/devicetree/bindings/media/aspeed-video.txt | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>
> Please add Acked-by/Reviewed-by tags when posting new versions. However,
> there's no need to repost patches *only* to add the tags. The upstream
> maintainer will do that for acks received on the version they apply.
>
> If a tag was not added on purpose, please state why and what changed.
>
I noticed the same when I was processing this patch. I've added back your
'Reviewed-by' tag.
So there is no need to repost, Eddie. Just remember this for the next
time :-)
Regards,
Hans
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 3/4] media: dt-bindings: aspeed-video: Add missing memory-region property
2019-04-24 21:17 ` Rob Herring
2019-04-25 7:19 ` Hans Verkuil
@ 2019-04-26 14:11 ` Eddie James
1 sibling, 0 replies; 7+ messages in thread
From: Eddie James @ 2019-04-26 14:11 UTC (permalink / raw)
To: Rob Herring
Cc: linux-kernel, linux-aspeed, devicetree, linux-media, andrew,
joel, robh+dt, mark.rutland, mchehab, hverkuil
On 4/24/19 4:17 PM, Rob Herring wrote:
> On Wed, 24 Apr 2019 10:16:59 -0500, Eddie James wrote:
>> Missed documenting this property in the initial commit.
>>
>> Signed-off-by: Eddie James <eajames@linux.ibm.com>
>> ---
>> Changes since v1:
>> - Add missing semi-colon
>>
>> Documentation/devicetree/bindings/media/aspeed-video.txt | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
> Please add Acked-by/Reviewed-by tags when posting new versions. However,
> there's no need to repost patches *only* to add the tags. The upstream
> maintainer will do that for acks received on the version they apply.
>
> If a tag was not added on purpose, please state why and what changed.
Yes, I left it off because I added a semi-colon (trivial, I know, but it
did change). The change log is there below the commit message.
Thanks,
Eddie
>
^ permalink raw reply [flat|nested] 7+ messages in thread