| Message ID | 1413773489-18170-1-git-send-email-ykaneko0929@gmail.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Mon, Oct 20, 2014 at 11:51:29AM +0900, Yoshihiro Kaneko wrote: > Based on platform device work by Matsuoka-san. > > Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> > --- > > Compile tested only. > > This patch is against master branch of linuxtv.org/media_tree.git. > > Documentation/devicetree/bindings/media/rcar_vin.txt | 2 ++ > drivers/media/platform/soc_camera/rcar_vin.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt > index ba61782..9dafe6b 100644 > --- a/Documentation/devicetree/bindings/media/rcar_vin.txt > +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt > @@ -6,6 +6,8 @@ family of devices. The current blocks are always slaves and suppot one input > channel which can be either RGB, YUYV or BT656. > > - compatible: Must be one of the following > + - "renesas,vin-r8a7794" for the R8A7794 device > + - "renesas,vin-r8a7793" for the R8A7793 device > - "renesas,vin-r8a7791" for the R8A7791 device > - "renesas,vin-r8a7790" for the R8A7790 device > - "renesas,vin-r8a7779" for the R8A7779 device > diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c > index 234cf86..c023aab 100644 > --- a/drivers/media/platform/soc_camera/rcar_vin.c > +++ b/drivers/media/platform/soc_camera/rcar_vin.c > @@ -1871,6 +1871,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops = { > > #ifdef CONFIG_OF > static struct of_device_id rcar_vin_of_table[] = { > + { .compatible = "renesas,vin-r8a7794", .data = (void *)RCAR_GEN2 }, > + { .compatible = "renesas,vin-r8a7793", .data = (void *)RCAR_GEN2 }, > { .compatible = "renesas,vin-r8a7791", .data = (void *)RCAR_GEN2 }, > { .compatible = "renesas,vin-r8a7790", .data = (void *)RCAR_GEN2 }, > { .compatible = "renesas,vin-r8a7779", .data = (void *)RCAR_H1 }, > -- > 1.9.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 > -- 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/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt index ba61782..9dafe6b 100644 --- a/Documentation/devicetree/bindings/media/rcar_vin.txt +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt @@ -6,6 +6,8 @@ family of devices. The current blocks are always slaves and suppot one input channel which can be either RGB, YUYV or BT656. - compatible: Must be one of the following + - "renesas,vin-r8a7794" for the R8A7794 device + - "renesas,vin-r8a7793" for the R8A7793 device - "renesas,vin-r8a7791" for the R8A7791 device - "renesas,vin-r8a7790" for the R8A7790 device - "renesas,vin-r8a7779" for the R8A7779 device diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index 234cf86..c023aab 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -1871,6 +1871,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops = { #ifdef CONFIG_OF static struct of_device_id rcar_vin_of_table[] = { + { .compatible = "renesas,vin-r8a7794", .data = (void *)RCAR_GEN2 }, + { .compatible = "renesas,vin-r8a7793", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7791", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7790", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7779", .data = (void *)RCAR_H1 },
Based on platform device work by Matsuoka-san. Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com> --- Compile tested only. This patch is against master branch of linuxtv.org/media_tree.git. Documentation/devicetree/bindings/media/rcar_vin.txt | 2 ++ drivers/media/platform/soc_camera/rcar_vin.c | 2 ++ 2 files changed, 4 insertions(+)