korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-03 00:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: rcar-vin: add R8A77980 support

Browse Source 
Add the R8A77980 SoC support to the R-Car VIN driver.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Sergei Shtylyov 2018-08-06 14:48:20 -04:00 committed by Mauro Carvalho Chehab
parent 3ba37c2bcb
commit a383096c98
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/media/rcar_vin.txt
View File

@ -24,6 +24,7 @@ on Gen3 platforms to a CSI-2 receiver.
- "renesas,vin-r8a7796" for the R8A7796 device - "renesas,vin-r8a7796" for the R8A7796 device
- "renesas,vin-r8a77965" for the R8A77965 device - "renesas,vin-r8a77965" for the R8A77965 device
- "renesas,vin-r8a77970" for the R8A77970 device - "renesas,vin-r8a77970" for the R8A77970 device
- "renesas,vin-r8a77980" for the R8A77980 device
- "renesas,vin-r8a77990" for the R8A77990 device - "renesas,vin-r8a77990" for the R8A77990 device
- "renesas,vin-r8a77995" for the R8A77995 device - "renesas,vin-r8a77995" for the R8A77995 device
- "renesas,rcar-gen2-vin" for a generic R-Car Gen2 or RZ/G1 compatible - "renesas,rcar-gen2-vin" for a generic R-Car Gen2 or RZ/G1 compatible

32
drivers/media/platform/rcar-vin/rcar-core.c
View File

@ -1088,6 +1088,34 @@ static const struct rvin_info rcar_info_r8a77970 = {
.routes = rcar_info_r8a77970_routes, .routes = rcar_info_r8a77970_routes,
}; };
static const struct rvin_group_route rcar_info_r8a77980_routes[] = {
{ .csi = RVIN_CSI40, .channel = 0, .vin = 0, .mask = BIT(0) | BIT(3) },
{ .csi = RVIN_CSI40, .channel = 1, .vin = 0, .mask = BIT(2) },
{ .csi = RVIN_CSI40, .channel = 0, .vin = 1, .mask = BIT(2) },
{ .csi = RVIN_CSI40, .channel = 1, .vin = 1, .mask = BIT(1) | BIT(3) },
{ .csi = RVIN_CSI40, .channel = 0, .vin = 2, .mask = BIT(1) },
{ .csi = RVIN_CSI40, .channel = 2, .vin = 2, .mask = BIT(3) },
{ .csi = RVIN_CSI40, .channel = 1, .vin = 3, .mask = BIT(0) },
{ .csi = RVIN_CSI40, .channel = 3, .vin = 3, .mask = BIT(3) },
{ .csi = RVIN_CSI41, .channel = 0, .vin = 4, .mask = BIT(0) | BIT(3) },
{ .csi = RVIN_CSI41, .channel = 1, .vin = 4, .mask = BIT(2) },
{ .csi = RVIN_CSI41, .channel = 0, .vin = 5, .mask = BIT(2) },
{ .csi = RVIN_CSI41, .channel = 1, .vin = 5, .mask = BIT(1) | BIT(3) },
{ .csi = RVIN_CSI41, .channel = 0, .vin = 6, .mask = BIT(1) },
{ .csi = RVIN_CSI41, .channel = 2, .vin = 6, .mask = BIT(3) },
{ .csi = RVIN_CSI41, .channel = 1, .vin = 7, .mask = BIT(0) },
{ .csi = RVIN_CSI41, .channel = 3, .vin = 7, .mask = BIT(3) },
{ /* Sentinel */ }
};
static const struct rvin_info rcar_info_r8a77980 = {
.model = RCAR_GEN3,
.use_mc = true,
.max_width = 4096,
.max_height = 4096,
.routes = rcar_info_r8a77980_routes,
};
static const struct rvin_group_route rcar_info_r8a77990_routes[] = { static const struct rvin_group_route rcar_info_r8a77990_routes[] = {
{ .csi = RVIN_CSI40, .channel = 0, .vin = 4, .mask = BIT(0) | BIT(3) }, { .csi = RVIN_CSI40, .channel = 0, .vin = 4, .mask = BIT(0) | BIT(3) },
{ .csi = RVIN_CSI40, .channel = 0, .vin = 5, .mask = BIT(2) }, { .csi = RVIN_CSI40, .channel = 0, .vin = 5, .mask = BIT(2) },
@ -1161,6 +1189,10 @@ static const struct of_device_id rvin_of_id_table[] = {
.compatible = "renesas,vin-r8a77970", .compatible = "renesas,vin-r8a77970",
.data = &rcar_info_r8a77970, .data = &rcar_info_r8a77970,
}, },
{
.compatible = "renesas,vin-r8a77980",
.data = &rcar_info_r8a77980,
},
{ {
.compatible = "renesas,vin-r8a77990", .compatible = "renesas,vin-r8a77990",
.data = &rcar_info_r8a77990, .data = &rcar_info_r8a77990,