[PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support

[PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support

[Valentine Barshak]

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

Re: [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support

[Laurent Pinchart]

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

Re: [PATCH] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support

[Valentine]

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.