Message ID | 1380896452-10687-1-git-send-email-valentine.barshak@cogentembedded.com (mailing list archive) |
---|---|
State | Awaiting Upstream |
Headers | show |
On Fri, Oct 04, 2013 at 06:20:52PM +0400, Valentine Barshak wrote: > Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com> This looks entirely sane to me. Acked-by: Simon Horman <horms+renesas@verge.net.au> Mauro, would you consider taking this? > --- > drivers/media/platform/soc_camera/rcar_vin.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c > index d02a7e0..b21f777 100644 > --- a/drivers/media/platform/soc_camera/rcar_vin.c > +++ b/drivers/media/platform/soc_camera/rcar_vin.c > @@ -105,6 +105,7 @@ > #define VIN_MAX_HEIGHT 2048 > > enum chip_id { > + RCAR_H2, > RCAR_H1, > RCAR_M1, > RCAR_E1, > @@ -300,7 +301,8 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv) > dmr = 0; > break; > case V4L2_PIX_FMT_RGB32: > - if (priv->chip == RCAR_H1 || priv->chip == RCAR_E1) { > + if (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 || > + priv->chip == RCAR_E1) { > dmr = VNDMR_EXRGB; > break; > } > @@ -1381,6 +1383,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops = { > }; > > static struct platform_device_id rcar_vin_id_table[] = { > + { "r8a7790-vin", RCAR_H2 }, > { "r8a7779-vin", RCAR_H1 }, > { "r8a7778-vin", RCAR_M1 }, > { "uPD35004-vin", RCAR_E1 }, > -- > 1.8.3.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index d02a7e0..b21f777 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -105,6 +105,7 @@ #define VIN_MAX_HEIGHT 2048 enum chip_id { + RCAR_H2, RCAR_H1, RCAR_M1, RCAR_E1, @@ -300,7 +301,8 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv) dmr = 0; break; case V4L2_PIX_FMT_RGB32: - if (priv->chip == RCAR_H1 || priv->chip == RCAR_E1) { + if (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 || + priv->chip == RCAR_E1) { dmr = VNDMR_EXRGB; break; } @@ -1381,6 +1383,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops = { }; static struct platform_device_id rcar_vin_id_table[] = { + { "r8a7790-vin", RCAR_H2 }, { "r8a7779-vin", RCAR_H1 }, { "r8a7778-vin", RCAR_M1 }, { "uPD35004-vin", RCAR_E1 },
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com> --- drivers/media/platform/soc_camera/rcar_vin.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)