From: Eddie James <eajames@linux.ibm.com>
To: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>
Cc: openbmc@lists.ozlabs.org, linux-aspeed@lists.ozlabs.org,
linux-media@vger.kernel.org
Subject: Re: [PATCH -next] media: aspeed: add AST2600 support
Date: Wed, 26 Feb 2020 08:50:06 -0600 [thread overview]
Message-ID: <f4ffad91-9742-9b68-be51-c1ec222e24b6@linux.ibm.com> (raw)
In-Reply-To: <20200225195853.17480-1-jae.hyun.yoo@linux.intel.com>
On 2/25/20 1:58 PM, Jae Hyun Yoo wrote:
> Video engine in AST2600 has the exactly same register set with
> AST2500 except VR084 register which provides more precise JPEG
> size read back. This commit adds support for the difference and
> adds 'aspeed,ast2600-video-engine' compatible OF string.
Thanks Jae!
Reviewed-by: Eddie James <eajames@linux.ibm.com>
>
> Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
> ---
> drivers/media/platform/aspeed-video.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
> index 47444a336ebb..7d98db1d9b52 100644
> --- a/drivers/media/platform/aspeed-video.c
> +++ b/drivers/media/platform/aspeed-video.c
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0-or-later
> // Copyright 2020 IBM Corp.
> -// Copyright (c) 2019 Intel Corporation
> +// Copyright (c) 2019-2020 Intel Corporation
>
> #include <linux/atomic.h>
> #include <linux/bitfield.h>
> @@ -132,7 +132,8 @@
> #define VE_COMP_CTRL_HQ_DCT_CHR GENMASK(26, 22)
> #define VE_COMP_CTRL_HQ_DCT_LUM GENMASK(31, 27)
>
> -#define VE_OFFSET_COMP_STREAM 0x078
> +#define AST2400_VE_COMP_SIZE_READ_BACK 0x078
> +#define AST2600_VE_COMP_SIZE_READ_BACK 0x084
>
> #define VE_SRC_LR_EDGE_DET 0x090
> #define VE_SRC_LR_EDGE_DET_LEFT GENMASK(11, 0)
> @@ -252,12 +253,17 @@ struct aspeed_video_config {
>
> static const struct aspeed_video_config ast2400_config = {
> .jpeg_mode = AST2400_VE_SEQ_CTRL_JPEG_MODE,
> - .comp_size_read = VE_OFFSET_COMP_STREAM,
> + .comp_size_read = AST2400_VE_COMP_SIZE_READ_BACK,
> };
>
> static const struct aspeed_video_config ast2500_config = {
> .jpeg_mode = AST2500_VE_SEQ_CTRL_JPEG_MODE,
> - .comp_size_read = VE_OFFSET_COMP_STREAM,
> + .comp_size_read = AST2400_VE_COMP_SIZE_READ_BACK,
> +};
> +
> +static const struct aspeed_video_config ast2600_config = {
> + .jpeg_mode = AST2500_VE_SEQ_CTRL_JPEG_MODE,
> + .comp_size_read = AST2600_VE_COMP_SIZE_READ_BACK,
> };
>
> static const u32 aspeed_video_jpeg_header[ASPEED_VIDEO_JPEG_HEADER_SIZE] = {
> @@ -1673,6 +1679,7 @@ static int aspeed_video_init(struct aspeed_video *video)
> static const struct of_device_id aspeed_video_of_match[] = {
> { .compatible = "aspeed,ast2400-video-engine", .data = &ast2400_config },
> { .compatible = "aspeed,ast2500-video-engine", .data = &ast2500_config },
> + { .compatible = "aspeed,ast2600-video-engine", .data = &ast2600_config },
> {}
> };
> MODULE_DEVICE_TABLE(of, aspeed_video_of_match);
prev parent reply other threads:[~2020-02-26 14:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-25 19:58 [PATCH -next] media: aspeed: add AST2600 support Jae Hyun Yoo
2020-02-25 23:52 ` Joel Stanley
2020-02-26 0:09 ` Jae Hyun Yoo
2020-02-26 14:50 ` Eddie James [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f4ffad91-9742-9b68-be51-c1ec222e24b6@linux.ibm.com \
--to=eajames@linux.ibm.com \
--cc=andrew@aj.id.au \
--cc=jae.hyun.yoo@linux.intel.com \
--cc=joel@jms.id.au \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=openbmc@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).