* [PATCH 0/3] video: aspeed video engine cleanups
@ 2020-01-07 3:43 Joel Stanley
2020-01-07 3:43 ` [PATCH 1/3] media: aspeed: Rework memory mapping in probe Joel Stanley
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Joel Stanley @ 2020-01-07 3:43 UTC (permalink / raw)
To: Jae Hyun Yoo, Eddie James, Mauro Carvalho Chehab
Cc: Andrew Jeffery, linux-media, linux-arm-kernel, linux-aspeed,
linux-kernel
When reviewing some patches from Jae I noticed the driver used compile
time tests for some registers. When thinking about how to avoid that, I
came up with a few cleanups.
Jae, feel free to base your patches on this series if you, Eddie and
Mauro are ok with the changes.
Joel Stanley (3):
media: aspeed: Rework memory mapping in probe
media: aspeed: Use runtime configuration
video: aspeed: Update copyright information
drivers/media/platform/aspeed-video.c | 73 ++++++++++++++++++---------
1 file changed, 48 insertions(+), 25 deletions(-)
--
2.24.1
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/3] media: aspeed: Rework memory mapping in probe 2020-01-07 3:43 [PATCH 0/3] video: aspeed video engine cleanups Joel Stanley @ 2020-01-07 3:43 ` Joel Stanley 2020-01-07 17:20 ` Jae Hyun Yoo 2020-01-07 19:16 ` Eddie James 2020-01-07 3:43 ` [PATCH 2/3] media: aspeed: Use runtime configuration Joel Stanley 2020-01-07 3:43 ` [PATCH 3/3] video: aspeed: Update copyright information Joel Stanley 2 siblings, 2 replies; 10+ messages in thread From: Joel Stanley @ 2020-01-07 3:43 UTC (permalink / raw) To: Jae Hyun Yoo, Eddie James, Mauro Carvalho Chehab Cc: Andrew Jeffery, linux-media, linux-arm-kernel, linux-aspeed, linux-kernel Use the recently introduced function devm_platform_ioremap_resource to save a few lines of code. This makes the driver match common platform device probe patterns. Signed-off-by: Joel Stanley <joel@jms.id.au> --- drivers/media/platform/aspeed-video.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index d8593cb2ae84..8f849d9866af 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -1655,14 +1655,17 @@ static int aspeed_video_init(struct aspeed_video *video) static int aspeed_video_probe(struct platform_device *pdev) { + struct aspeed_video *video; int rc; - struct resource *res; - struct aspeed_video *video = - devm_kzalloc(&pdev->dev, sizeof(*video), GFP_KERNEL); + video = devm_kzalloc(&pdev->dev, sizeof(*video), GFP_KERNEL); if (!video) return -ENOMEM; + video->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(video->base)) + return PTR_ERR(video->base); + video->frame_rate = 30; video->dev = &pdev->dev; spin_lock_init(&video->lock); @@ -1671,13 +1674,6 @@ static int aspeed_video_probe(struct platform_device *pdev) INIT_DELAYED_WORK(&video->res_work, aspeed_video_resolution_work); INIT_LIST_HEAD(&video->buffers); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - - video->base = devm_ioremap_resource(video->dev, res); - - if (IS_ERR(video->base)) - return PTR_ERR(video->base); - rc = aspeed_video_init(video); if (rc) return rc; -- 2.24.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] media: aspeed: Rework memory mapping in probe 2020-01-07 3:43 ` [PATCH 1/3] media: aspeed: Rework memory mapping in probe Joel Stanley @ 2020-01-07 17:20 ` Jae Hyun Yoo 2020-01-07 19:16 ` Eddie James 1 sibling, 0 replies; 10+ messages in thread From: Jae Hyun Yoo @ 2020-01-07 17:20 UTC (permalink / raw) To: Joel Stanley, Eddie James, Mauro Carvalho Chehab Cc: Andrew Jeffery, linux-media, linux-arm-kernel, linux-aspeed, linux-kernel On 1/6/2020 7:43 PM, Joel Stanley wrote: > Use the recently introduced function devm_platform_ioremap_resource to > save a few lines of code. This makes the driver match common platform > device probe patterns. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- Reviewed-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> Thanks, Jae ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/3] media: aspeed: Rework memory mapping in probe 2020-01-07 3:43 ` [PATCH 1/3] media: aspeed: Rework memory mapping in probe Joel Stanley 2020-01-07 17:20 ` Jae Hyun Yoo @ 2020-01-07 19:16 ` Eddie James 1 sibling, 0 replies; 10+ messages in thread From: Eddie James @ 2020-01-07 19:16 UTC (permalink / raw) To: Joel Stanley, Jae Hyun Yoo, Mauro Carvalho Chehab Cc: Andrew Jeffery, linux-media, linux-arm-kernel, linux-aspeed, linux-kernel On 1/6/20 9:43 PM, Joel Stanley wrote: > Use the recently introduced function devm_platform_ioremap_resource to > save a few lines of code. This makes the driver match common platform > device probe patterns. Reviewed-by: Eddie James <eajames@linux.ibm.com> Thanks Joel! > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > drivers/media/platform/aspeed-video.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index d8593cb2ae84..8f849d9866af 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -1655,14 +1655,17 @@ static int aspeed_video_init(struct aspeed_video *video) > > static int aspeed_video_probe(struct platform_device *pdev) > { > + struct aspeed_video *video; > int rc; > - struct resource *res; > - struct aspeed_video *video = > - devm_kzalloc(&pdev->dev, sizeof(*video), GFP_KERNEL); > > + video = devm_kzalloc(&pdev->dev, sizeof(*video), GFP_KERNEL); > if (!video) > return -ENOMEM; > > + video->base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(video->base)) > + return PTR_ERR(video->base); > + > video->frame_rate = 30; > video->dev = &pdev->dev; > spin_lock_init(&video->lock); > @@ -1671,13 +1674,6 @@ static int aspeed_video_probe(struct platform_device *pdev) > INIT_DELAYED_WORK(&video->res_work, aspeed_video_resolution_work); > INIT_LIST_HEAD(&video->buffers); > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - > - video->base = devm_ioremap_resource(video->dev, res); > - > - if (IS_ERR(video->base)) > - return PTR_ERR(video->base); > - > rc = aspeed_video_init(video); > if (rc) > return rc; ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/3] media: aspeed: Use runtime configuration 2020-01-07 3:43 [PATCH 0/3] video: aspeed video engine cleanups Joel Stanley 2020-01-07 3:43 ` [PATCH 1/3] media: aspeed: Rework memory mapping in probe Joel Stanley @ 2020-01-07 3:43 ` Joel Stanley 2020-01-07 17:33 ` Jae Hyun Yoo 2020-01-07 19:18 ` Eddie James 2020-01-07 3:43 ` [PATCH 3/3] video: aspeed: Update copyright information Joel Stanley 2 siblings, 2 replies; 10+ messages in thread From: Joel Stanley @ 2020-01-07 3:43 UTC (permalink / raw) To: Jae Hyun Yoo, Eddie James, Mauro Carvalho Chehab Cc: Andrew Jeffery, linux-media, linux-arm-kernel, linux-aspeed, linux-kernel The aspeed video IP has some differences between SoC families. Currently the driver decides which registers to use at compile time, which means a single kernel can not be used between platforms. Switch to using runtime configuration of the registers that vary between SoC families. This is in preparation for upcoming ast2600 support. Signed-off-by: Joel Stanley <joel@jms.id.au> --- drivers/media/platform/aspeed-video.c | 53 ++++++++++++++++++++------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index 8f849d9866af..d70b893fd4cf 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -72,11 +72,8 @@ #define VE_SEQ_CTRL_CAP_BUSY BIT(16) #define VE_SEQ_CTRL_COMP_BUSY BIT(18) -#ifdef CONFIG_MACH_ASPEED_G5 -#define VE_SEQ_CTRL_JPEG_MODE BIT(13) /* AST2500 */ -#else -#define VE_SEQ_CTRL_JPEG_MODE BIT(8) /* AST2400 */ -#endif /* CONFIG_MACH_ASPEED_G5 */ +#define AST2500_VE_SEQ_CTRL_JPEG_MODE BIT(13) +#define AST2400_VE_SEQ_CTRL_JPEG_MODE BIT(8) #define VE_CTRL 0x008 #define VE_CTRL_HSYNC_POL BIT(0) @@ -220,6 +217,9 @@ struct aspeed_video { struct video_device vdev; struct mutex video_lock; /* v4l2 and videobuf2 lock */ + u32 jpeg_mode; + u32 comp_size_read; + wait_queue_head_t wait; spinlock_t lock; /* buffer list lock */ struct delayed_work res_work; @@ -243,6 +243,21 @@ struct aspeed_video { #define to_aspeed_video(x) container_of((x), struct aspeed_video, v4l2_dev) +struct aspeed_video_config { + u32 jpeg_mode; + u32 comp_size_read; +}; + +static const struct aspeed_video_config ast2400_config = { + .jpeg_mode = AST2400_VE_SEQ_CTRL_JPEG_MODE, + .comp_size_read = VE_OFFSET_COMP_STREAM, +}; + +static const struct aspeed_video_config ast2500_config = { + .jpeg_mode = AST2500_VE_SEQ_CTRL_JPEG_MODE, + .comp_size_read = VE_OFFSET_COMP_STREAM, +}; + static const u32 aspeed_video_jpeg_header[ASPEED_VIDEO_JPEG_HEADER_SIZE] = { 0xe0ffd8ff, 0x464a1000, 0x01004649, 0x60000101, 0x00006000, 0x0f00feff, 0x00002d05, 0x00000000, 0x00000000, 0x00dbff00 @@ -572,7 +587,7 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg) if (sts & VE_INTERRUPT_COMP_COMPLETE) { struct aspeed_video_buffer *buf; u32 frame_size = aspeed_video_read(video, - VE_OFFSET_COMP_STREAM); + video->comp_size_read); spin_lock(&video->lock); clear_bit(VIDEO_FRAME_INPRG, &video->flags); @@ -907,7 +922,7 @@ static void aspeed_video_init_regs(struct aspeed_video *video) FIELD_PREP(VE_COMP_CTRL_DCT_LUM, video->jpeg_quality) | FIELD_PREP(VE_COMP_CTRL_DCT_CHR, video->jpeg_quality | 0x10); u32 ctrl = VE_CTRL_AUTO_OR_CURSOR; - u32 seq_ctrl = VE_SEQ_CTRL_JPEG_MODE; + u32 seq_ctrl = video->jpeg_mode;; if (video->frame_rate) ctrl |= FIELD_PREP(VE_CTRL_FRC, video->frame_rate); @@ -1653,8 +1668,17 @@ static int aspeed_video_init(struct aspeed_video *video) return rc; } +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 }, + {} +}; +MODULE_DEVICE_TABLE(of, aspeed_video_of_match); + static int aspeed_video_probe(struct platform_device *pdev) { + const struct aspeed_video_config *config; + const struct of_device_id *match; struct aspeed_video *video; int rc; @@ -1666,6 +1690,14 @@ static int aspeed_video_probe(struct platform_device *pdev) if (IS_ERR(video->base)) return PTR_ERR(video->base); + match = of_match_node(aspeed_video_of_match, pdev->dev.of_node); + if (!match) + return -EINVAL; + + config = match->data; + video->jpeg_mode = config->jpeg_mode; + video->comp_size_read = config->comp_size_read; + video->frame_rate = 30; video->dev = &pdev->dev; spin_lock_init(&video->lock); @@ -1712,13 +1744,6 @@ static int aspeed_video_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id aspeed_video_of_match[] = { - { .compatible = "aspeed,ast2400-video-engine" }, - { .compatible = "aspeed,ast2500-video-engine" }, - {} -}; -MODULE_DEVICE_TABLE(of, aspeed_video_of_match); - static struct platform_driver aspeed_video_driver = { .driver = { .name = DEVICE_NAME, -- 2.24.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] media: aspeed: Use runtime configuration 2020-01-07 3:43 ` [PATCH 2/3] media: aspeed: Use runtime configuration Joel Stanley @ 2020-01-07 17:33 ` Jae Hyun Yoo 2020-01-07 19:18 ` Eddie James 1 sibling, 0 replies; 10+ messages in thread From: Jae Hyun Yoo @ 2020-01-07 17:33 UTC (permalink / raw) To: Joel Stanley, Eddie James, Mauro Carvalho Chehab Cc: Andrew Jeffery, linux-media, linux-arm-kernel, linux-aspeed, linux-kernel Hi Joel, On 1/6/2020 7:43 PM, Joel Stanley wrote: > The aspeed video IP has some differences between SoC families. Currently > the driver decides which registers to use at compile time, which means > a single kernel can not be used between platforms. > > Switch to using runtime configuration of the registers that vary between > SoC families. This is in preparation for upcoming ast2600 support. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > drivers/media/platform/aspeed-video.c | 53 ++++++++++++++++++++------- > 1 file changed, 39 insertions(+), 14 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index 8f849d9866af..d70b893fd4cf 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -72,11 +72,8 @@ > #define VE_SEQ_CTRL_CAP_BUSY BIT(16) > #define VE_SEQ_CTRL_COMP_BUSY BIT(18) > > -#ifdef CONFIG_MACH_ASPEED_G5 > -#define VE_SEQ_CTRL_JPEG_MODE BIT(13) /* AST2500 */ > -#else > -#define VE_SEQ_CTRL_JPEG_MODE BIT(8) /* AST2400 */ > -#endif /* CONFIG_MACH_ASPEED_G5 */ > +#define AST2500_VE_SEQ_CTRL_JPEG_MODE BIT(13) > +#define AST2400_VE_SEQ_CTRL_JPEG_MODE BIT(8) > > #define VE_CTRL 0x008 > #define VE_CTRL_HSYNC_POL BIT(0) > @@ -220,6 +217,9 @@ struct aspeed_video { > struct video_device vdev; > struct mutex video_lock; /* v4l2 and videobuf2 lock */ > > + u32 jpeg_mode; > + u32 comp_size_read; How do you think about of adding 'const struct aspeed_video_config *config' instead so that we can use them like 'video->config->jpeg_mode' in this module. Also, we could simply add any SoC specific variations in the future if we add the 'config' member instead of above. Overall it looks good to me. I'll rebase my change on top of it. Thanks a lot! Jae > + > wait_queue_head_t wait; > spinlock_t lock; /* buffer list lock */ > struct delayed_work res_work; > @@ -243,6 +243,21 @@ struct aspeed_video { > > #define to_aspeed_video(x) container_of((x), struct aspeed_video, v4l2_dev) > > +struct aspeed_video_config { > + u32 jpeg_mode; > + u32 comp_size_read; > +}; > + > +static const struct aspeed_video_config ast2400_config = { > + .jpeg_mode = AST2400_VE_SEQ_CTRL_JPEG_MODE, > + .comp_size_read = VE_OFFSET_COMP_STREAM, > +}; > + > +static const struct aspeed_video_config ast2500_config = { > + .jpeg_mode = AST2500_VE_SEQ_CTRL_JPEG_MODE, > + .comp_size_read = VE_OFFSET_COMP_STREAM, > +}; > + > static const u32 aspeed_video_jpeg_header[ASPEED_VIDEO_JPEG_HEADER_SIZE] = { > 0xe0ffd8ff, 0x464a1000, 0x01004649, 0x60000101, 0x00006000, 0x0f00feff, > 0x00002d05, 0x00000000, 0x00000000, 0x00dbff00 > @@ -572,7 +587,7 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg) > if (sts & VE_INTERRUPT_COMP_COMPLETE) { > struct aspeed_video_buffer *buf; > u32 frame_size = aspeed_video_read(video, > - VE_OFFSET_COMP_STREAM); > + video->comp_size_read); > > spin_lock(&video->lock); > clear_bit(VIDEO_FRAME_INPRG, &video->flags); > @@ -907,7 +922,7 @@ static void aspeed_video_init_regs(struct aspeed_video *video) > FIELD_PREP(VE_COMP_CTRL_DCT_LUM, video->jpeg_quality) | > FIELD_PREP(VE_COMP_CTRL_DCT_CHR, video->jpeg_quality | 0x10); > u32 ctrl = VE_CTRL_AUTO_OR_CURSOR; > - u32 seq_ctrl = VE_SEQ_CTRL_JPEG_MODE; > + u32 seq_ctrl = video->jpeg_mode;; > > if (video->frame_rate) > ctrl |= FIELD_PREP(VE_CTRL_FRC, video->frame_rate); > @@ -1653,8 +1668,17 @@ static int aspeed_video_init(struct aspeed_video *video) > return rc; > } > > +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 }, > + {} > +}; > +MODULE_DEVICE_TABLE(of, aspeed_video_of_match); > + > static int aspeed_video_probe(struct platform_device *pdev) > { > + const struct aspeed_video_config *config; > + const struct of_device_id *match; > struct aspeed_video *video; > int rc; > > @@ -1666,6 +1690,14 @@ static int aspeed_video_probe(struct platform_device *pdev) > if (IS_ERR(video->base)) > return PTR_ERR(video->base); > > + match = of_match_node(aspeed_video_of_match, pdev->dev.of_node); > + if (!match) > + return -EINVAL; > + > + config = match->data; > + video->jpeg_mode = config->jpeg_mode; > + video->comp_size_read = config->comp_size_read; > + > video->frame_rate = 30; > video->dev = &pdev->dev; > spin_lock_init(&video->lock); > @@ -1712,13 +1744,6 @@ static int aspeed_video_remove(struct platform_device *pdev) > return 0; > } > > -static const struct of_device_id aspeed_video_of_match[] = { > - { .compatible = "aspeed,ast2400-video-engine" }, > - { .compatible = "aspeed,ast2500-video-engine" }, > - {} > -}; > -MODULE_DEVICE_TABLE(of, aspeed_video_of_match); > - > static struct platform_driver aspeed_video_driver = { > .driver = { > .name = DEVICE_NAME, > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/3] media: aspeed: Use runtime configuration 2020-01-07 3:43 ` [PATCH 2/3] media: aspeed: Use runtime configuration Joel Stanley 2020-01-07 17:33 ` Jae Hyun Yoo @ 2020-01-07 19:18 ` Eddie James 1 sibling, 0 replies; 10+ messages in thread From: Eddie James @ 2020-01-07 19:18 UTC (permalink / raw) To: Joel Stanley, Jae Hyun Yoo, Mauro Carvalho Chehab Cc: Andrew Jeffery, linux-media, linux-arm-kernel, linux-aspeed, linux-kernel On 1/6/20 9:43 PM, Joel Stanley wrote: > The aspeed video IP has some differences between SoC families. Currently > the driver decides which registers to use at compile time, which means > a single kernel can not be used between platforms. > > Switch to using runtime configuration of the registers that vary between > SoC families. This is in preparation for upcoming ast2600 support. Reviewed-by: Eddie James <eajames@linux.ibm.com> > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > drivers/media/platform/aspeed-video.c | 53 ++++++++++++++++++++------- > 1 file changed, 39 insertions(+), 14 deletions(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index 8f849d9866af..d70b893fd4cf 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -72,11 +72,8 @@ > #define VE_SEQ_CTRL_CAP_BUSY BIT(16) > #define VE_SEQ_CTRL_COMP_BUSY BIT(18) > > -#ifdef CONFIG_MACH_ASPEED_G5 > -#define VE_SEQ_CTRL_JPEG_MODE BIT(13) /* AST2500 */ > -#else > -#define VE_SEQ_CTRL_JPEG_MODE BIT(8) /* AST2400 */ > -#endif /* CONFIG_MACH_ASPEED_G5 */ > +#define AST2500_VE_SEQ_CTRL_JPEG_MODE BIT(13) > +#define AST2400_VE_SEQ_CTRL_JPEG_MODE BIT(8) > > #define VE_CTRL 0x008 > #define VE_CTRL_HSYNC_POL BIT(0) > @@ -220,6 +217,9 @@ struct aspeed_video { > struct video_device vdev; > struct mutex video_lock; /* v4l2 and videobuf2 lock */ > > + u32 jpeg_mode; > + u32 comp_size_read; > + > wait_queue_head_t wait; > spinlock_t lock; /* buffer list lock */ > struct delayed_work res_work; > @@ -243,6 +243,21 @@ struct aspeed_video { > > #define to_aspeed_video(x) container_of((x), struct aspeed_video, v4l2_dev) > > +struct aspeed_video_config { > + u32 jpeg_mode; > + u32 comp_size_read; > +}; > + > +static const struct aspeed_video_config ast2400_config = { > + .jpeg_mode = AST2400_VE_SEQ_CTRL_JPEG_MODE, > + .comp_size_read = VE_OFFSET_COMP_STREAM, > +}; > + > +static const struct aspeed_video_config ast2500_config = { > + .jpeg_mode = AST2500_VE_SEQ_CTRL_JPEG_MODE, > + .comp_size_read = VE_OFFSET_COMP_STREAM, > +}; > + > static const u32 aspeed_video_jpeg_header[ASPEED_VIDEO_JPEG_HEADER_SIZE] = { > 0xe0ffd8ff, 0x464a1000, 0x01004649, 0x60000101, 0x00006000, 0x0f00feff, > 0x00002d05, 0x00000000, 0x00000000, 0x00dbff00 > @@ -572,7 +587,7 @@ static irqreturn_t aspeed_video_irq(int irq, void *arg) > if (sts & VE_INTERRUPT_COMP_COMPLETE) { > struct aspeed_video_buffer *buf; > u32 frame_size = aspeed_video_read(video, > - VE_OFFSET_COMP_STREAM); > + video->comp_size_read); > > spin_lock(&video->lock); > clear_bit(VIDEO_FRAME_INPRG, &video->flags); > @@ -907,7 +922,7 @@ static void aspeed_video_init_regs(struct aspeed_video *video) > FIELD_PREP(VE_COMP_CTRL_DCT_LUM, video->jpeg_quality) | > FIELD_PREP(VE_COMP_CTRL_DCT_CHR, video->jpeg_quality | 0x10); > u32 ctrl = VE_CTRL_AUTO_OR_CURSOR; > - u32 seq_ctrl = VE_SEQ_CTRL_JPEG_MODE; > + u32 seq_ctrl = video->jpeg_mode;; > > if (video->frame_rate) > ctrl |= FIELD_PREP(VE_CTRL_FRC, video->frame_rate); > @@ -1653,8 +1668,17 @@ static int aspeed_video_init(struct aspeed_video *video) > return rc; > } > > +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 }, > + {} > +}; > +MODULE_DEVICE_TABLE(of, aspeed_video_of_match); > + > static int aspeed_video_probe(struct platform_device *pdev) > { > + const struct aspeed_video_config *config; > + const struct of_device_id *match; > struct aspeed_video *video; > int rc; > > @@ -1666,6 +1690,14 @@ static int aspeed_video_probe(struct platform_device *pdev) > if (IS_ERR(video->base)) > return PTR_ERR(video->base); > > + match = of_match_node(aspeed_video_of_match, pdev->dev.of_node); > + if (!match) > + return -EINVAL; > + > + config = match->data; > + video->jpeg_mode = config->jpeg_mode; > + video->comp_size_read = config->comp_size_read; > + > video->frame_rate = 30; > video->dev = &pdev->dev; > spin_lock_init(&video->lock); > @@ -1712,13 +1744,6 @@ static int aspeed_video_remove(struct platform_device *pdev) > return 0; > } > > -static const struct of_device_id aspeed_video_of_match[] = { > - { .compatible = "aspeed,ast2400-video-engine" }, > - { .compatible = "aspeed,ast2500-video-engine" }, > - {} > -}; > -MODULE_DEVICE_TABLE(of, aspeed_video_of_match); > - > static struct platform_driver aspeed_video_driver = { > .driver = { > .name = DEVICE_NAME, ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] video: aspeed: Update copyright information 2020-01-07 3:43 [PATCH 0/3] video: aspeed video engine cleanups Joel Stanley 2020-01-07 3:43 ` [PATCH 1/3] media: aspeed: Rework memory mapping in probe Joel Stanley 2020-01-07 3:43 ` [PATCH 2/3] media: aspeed: Use runtime configuration Joel Stanley @ 2020-01-07 3:43 ` Joel Stanley 2020-01-07 17:55 ` Jae Hyun Yoo 2020-01-07 19:18 ` Eddie James 2 siblings, 2 replies; 10+ messages in thread From: Joel Stanley @ 2020-01-07 3:43 UTC (permalink / raw) To: Jae Hyun Yoo, Eddie James, Mauro Carvalho Chehab Cc: Andrew Jeffery, linux-media, linux-arm-kernel, linux-aspeed, linux-kernel Use the preferred form for GPL2+, and add IBM and Intel as the authors. The driver was initially upstreamed by Eddie from IBM, and has had major contributions from Jae at Intel. Signed-off-by: Joel Stanley <joel@jms.id.au> --- drivers/media/platform/aspeed-video.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c index d70b893fd4cf..71e0dbdb37dc 100644 --- a/drivers/media/platform/aspeed-video.c +++ b/drivers/media/platform/aspeed-video.c @@ -1,4 +1,6 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later +// Copyright 2020 IBM Corp. +// Copyright (c) 2019 Intel Corporation #include <linux/atomic.h> #include <linux/bitfield.h> -- 2.24.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] video: aspeed: Update copyright information 2020-01-07 3:43 ` [PATCH 3/3] video: aspeed: Update copyright information Joel Stanley @ 2020-01-07 17:55 ` Jae Hyun Yoo 2020-01-07 19:18 ` Eddie James 1 sibling, 0 replies; 10+ messages in thread From: Jae Hyun Yoo @ 2020-01-07 17:55 UTC (permalink / raw) To: Joel Stanley, Eddie James, Mauro Carvalho Chehab Cc: Andrew Jeffery, linux-media, linux-arm-kernel, linux-aspeed, linux-kernel On 1/6/2020 7:43 PM, Joel Stanley wrote: > Use the preferred form for GPL2+, and add IBM and Intel as the authors. > The driver was initially upstreamed by Eddie from IBM, and has had major > contributions from Jae at Intel. > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > drivers/media/platform/aspeed-video.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index d70b893fd4cf..71e0dbdb37dc 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -1,4 +1,6 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: GPL-2.0-or-later > +// Copyright 2020 IBM Corp. > +// Copyright (c) 2019 Intel Corporation Acked-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> Thanks a lot for adding Intel's copyright. -Jae > #include <linux/atomic.h> > #include <linux/bitfield.h> > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/3] video: aspeed: Update copyright information 2020-01-07 3:43 ` [PATCH 3/3] video: aspeed: Update copyright information Joel Stanley 2020-01-07 17:55 ` Jae Hyun Yoo @ 2020-01-07 19:18 ` Eddie James 1 sibling, 0 replies; 10+ messages in thread From: Eddie James @ 2020-01-07 19:18 UTC (permalink / raw) To: Joel Stanley, Jae Hyun Yoo, Mauro Carvalho Chehab Cc: Andrew Jeffery, linux-media, linux-arm-kernel, linux-aspeed, linux-kernel On 1/6/20 9:43 PM, Joel Stanley wrote: > Use the preferred form for GPL2+, and add IBM and Intel as the authors. > The driver was initially upstreamed by Eddie from IBM, and has had major > contributions from Jae at Intel. Reviewed-by: Eddie James <eajames@linux.ibm.com> > > Signed-off-by: Joel Stanley <joel@jms.id.au> > --- > drivers/media/platform/aspeed-video.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c > index d70b893fd4cf..71e0dbdb37dc 100644 > --- a/drivers/media/platform/aspeed-video.c > +++ b/drivers/media/platform/aspeed-video.c > @@ -1,4 +1,6 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: GPL-2.0-or-later > +// Copyright 2020 IBM Corp. > +// Copyright (c) 2019 Intel Corporation > > #include <linux/atomic.h> > #include <linux/bitfield.h> ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-01-07 19:19 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-01-07 3:43 [PATCH 0/3] video: aspeed video engine cleanups Joel Stanley 2020-01-07 3:43 ` [PATCH 1/3] media: aspeed: Rework memory mapping in probe Joel Stanley 2020-01-07 17:20 ` Jae Hyun Yoo 2020-01-07 19:16 ` Eddie James 2020-01-07 3:43 ` [PATCH 2/3] media: aspeed: Use runtime configuration Joel Stanley 2020-01-07 17:33 ` Jae Hyun Yoo 2020-01-07 19:18 ` Eddie James 2020-01-07 3:43 ` [PATCH 3/3] video: aspeed: Update copyright information Joel Stanley 2020-01-07 17:55 ` Jae Hyun Yoo 2020-01-07 19:18 ` Eddie James
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).