* [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support
@ 2013-12-23 20:28 Valentine Barshak
2013-12-26 14:18 ` Laurent Pinchart
0 siblings, 1 reply; 3+ messages in thread
From: Valentine Barshak @ 2013-12-23 20:28 UTC (permalink / raw)
To: linux-sh, linux-media
Cc: Simon Horman, Magnus Damm, Kuninori Morimoto, Laurent Pinchart,
Mauro Carvalho Chehab, Hans Verkuil, Guennadi Liakhovetski
This adds R-Car M2 (R8A7791) VIN support.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
---
drivers/media/platform/soc_camera/rcar_vin.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 6866bb4..8b79727 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -106,6 +106,7 @@
#define VIN_MAX_HEIGHT 2048
enum chip_id {
+ RCAR_M2,
RCAR_H2,
RCAR_H1,
RCAR_M1,
@@ -302,8 +303,8 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
dmr = 0;
break;
case V4L2_PIX_FMT_RGB32:
- if (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 ||
- priv->chip == RCAR_E1) {
+ if (priv->chip == RCAR_M2 || priv->chip == RCAR_H2 ||
+ priv->chip == RCAR_H1 || priv->chip == RCAR_E1) {
dmr = VNDMR_EXRGB;
break;
}
@@ -1384,6 +1385,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops = {
};
static struct platform_device_id rcar_vin_id_table[] = {
+ { "r8a7791-vin", RCAR_M2 },
{ "r8a7790-vin", RCAR_H2 },
{ "r8a7779-vin", RCAR_H1 },
{ "r8a7778-vin", RCAR_M1 },
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support
2013-12-23 20:28 [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support Valentine Barshak
@ 2013-12-26 14:18 ` Laurent Pinchart
2013-12-26 14:31 ` Valentine
0 siblings, 1 reply; 3+ messages in thread
From: Laurent Pinchart @ 2013-12-26 14:18 UTC (permalink / raw)
To: Valentine Barshak
Cc: linux-sh, linux-media, Simon Horman, Magnus Damm,
Kuninori Morimoto, Mauro Carvalho Chehab, Hans Verkuil,
Guennadi Liakhovetski
Hi Valentine,
Thank you for the patch.
On Tuesday 24 December 2013 00:28:06 Valentine Barshak wrote:
> This adds R-Car M2 (R8A7791) VIN support.
>
> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
> ---
> drivers/media/platform/soc_camera/rcar_vin.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c
> b/drivers/media/platform/soc_camera/rcar_vin.c index 6866bb4..8b79727
> 100644
> --- a/drivers/media/platform/soc_camera/rcar_vin.c
> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
> @@ -106,6 +106,7 @@
> #define VIN_MAX_HEIGHT 2048
>
> enum chip_id {
> + RCAR_M2,
> RCAR_H2,
What about renaming RCAR_H2 to RCAR_GEN2 instead, and using RCAR_GEN2 for both
r8a7790 and r8a7791 (but keeping the "r8a7790-vin" and "r8a7791-vin" device
IDs as you've done below) ? They're identical so far (at least from what's
implemented in the driver, you might be aware of features specific to the H2
or M2 that are not yet supported but will be implemented in the near future).
> RCAR_H1,
> RCAR_M1,
> @@ -302,8 +303,8 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
> dmr = 0;
> break;
> case V4L2_PIX_FMT_RGB32:
> - if (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 ||
> - priv->chip == RCAR_E1) {
> + if (priv->chip == RCAR_M2 || priv->chip == RCAR_H2 ||
> + priv->chip == RCAR_H1 || priv->chip == RCAR_E1) {
> dmr = VNDMR_EXRGB;
> break;
> }
> @@ -1384,6 +1385,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops =
> { };
>
> static struct platform_device_id rcar_vin_id_table[] = {
> + { "r8a7791-vin", RCAR_M2 },
> { "r8a7790-vin", RCAR_H2 },
> { "r8a7779-vin", RCAR_H1 },
> { "r8a7778-vin", RCAR_M1 },
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support
2013-12-26 14:18 ` Laurent Pinchart
@ 2013-12-26 14:31 ` Valentine
0 siblings, 0 replies; 3+ messages in thread
From: Valentine @ 2013-12-26 14:31 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-sh, linux-media, Simon Horman, Magnus Damm,
Kuninori Morimoto, Mauro Carvalho Chehab, Hans Verkuil,
Guennadi Liakhovetski
On 12/26/2013 06:18 PM, Laurent Pinchart wrote:
> Hi Valentine,
>
> Thank you for the patch.
>
> On Tuesday 24 December 2013 00:28:06 Valentine Barshak wrote:
>> This adds R-Car M2 (R8A7791) VIN support.
>>
>> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
>> ---
>> drivers/media/platform/soc_camera/rcar_vin.c | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/media/platform/soc_camera/rcar_vin.c
>> b/drivers/media/platform/soc_camera/rcar_vin.c index 6866bb4..8b79727
>> 100644
>> --- a/drivers/media/platform/soc_camera/rcar_vin.c
>> +++ b/drivers/media/platform/soc_camera/rcar_vin.c
>> @@ -106,6 +106,7 @@
>> #define VIN_MAX_HEIGHT 2048
>>
>> enum chip_id {
>> + RCAR_M2,
>> RCAR_H2,
>
> What about renaming RCAR_H2 to RCAR_GEN2 instead, and using RCAR_GEN2 for both
> r8a7790 and r8a7791 (but keeping the "r8a7790-vin" and "r8a7791-vin" device
> IDs as you've done below) ? They're identical so far (at least from what's
> implemented in the driver, you might be aware of features specific to the H2
> or M2 that are not yet supported but will be implemented in the near future).
Yes, the driver won't see any difference at this point.
The h/w (at least the input data formats supported) seems a bit different though.
The M2 variant doesn't seem to support 4-bit data (AOT H2).
I'm not aware or any M2 or H2 specific features that need to be implemented in the near future.
I've preferred to keep them separate just in case.
I wouldn't mind to use the same (GEN2) id for both but we may need to split them in the future.
>
>> RCAR_H1,
>> RCAR_M1,
>> @@ -302,8 +303,8 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
>> dmr = 0;
>> break;
>> case V4L2_PIX_FMT_RGB32:
>> - if (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 ||
>> - priv->chip == RCAR_E1) {
>> + if (priv->chip == RCAR_M2 || priv->chip == RCAR_H2 ||
>> + priv->chip == RCAR_H1 || priv->chip == RCAR_E1) {
>> dmr = VNDMR_EXRGB;
>> break;
>> }
>> @@ -1384,6 +1385,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops =
>> { };
>>
>> static struct platform_device_id rcar_vin_id_table[] = {
>> + { "r8a7791-vin", RCAR_M2 },
>> { "r8a7790-vin", RCAR_H2 },
>> { "r8a7779-vin", RCAR_H1 },
>> { "r8a7778-vin", RCAR_M1 },
>
Thanks,
Val.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-26 14:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-23 20:28 [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support Valentine Barshak
2013-12-26 14:18 ` Laurent Pinchart
2013-12-26 14:31 ` Valentine
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).