On 08/06/2018 09:10 PM, Niklas Söderlund wrote:
>> Add the R8A77980 SoC support to the R-Car VIN driver.
>>
>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@xxxxxxxxxxxxxxxxxx>
[...]
>> --- media_tree.orig/drivers/media/platform/rcar-vin/rcar-core.c
>> +++ media_tree/drivers/media/platform/rcar-vin/rcar-core.c
>> @@ -1097,6 +1097,34 @@ static const struct rvin_info rcar_info_
>> .routes = rcar_info_r8a77995_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,
>> +};
>> +
>
> Could you move this chunk so it fits the numerical sorting order of this
> part of the code? That is move the chunk between the r8a77970 and
> r8a77995 structs :-) With that fixed feel free to add
Ugh, I've noticed the newly added SoC when rebasing to media_tree.git but
failed to updated all chunks... Sorry, will respin/repost.
> Acked-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
Thanks!
[...]
MBR, Sergei
