| Message ID | 20170822232640.26147-26-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 23/08/17 01:26, Niklas Söderlund wrote: > Add the SoC specific information for Renesas r8a7796. > > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com> Regards, Hans > --- > .../devicetree/bindings/media/rcar_vin.txt | 1 + > drivers/media/platform/rcar-vin/rcar-core.c | 64 ++++++++++++++++++++++ > 2 files changed, 65 insertions(+) > > diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt > index be38ad89d71ad05d..767358f39512aa17 100644 > --- a/Documentation/devicetree/bindings/media/rcar_vin.txt > +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt > @@ -10,6 +10,7 @@ always slaves and support multiple input channels which can be either RGB, > YUVU, BT656 or CSI-2. > > - compatible: Must be one or more of the following > + - "renesas,vin-r8a7796" for the R8A7796 device > - "renesas,vin-r8a7795" for the R8A7795 device > - "renesas,vin-r8a7794" for the R8A7794 device > - "renesas,vin-r8a7793" for the R8A7793 device > diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c > index 58d903ab9fb83faf..e01edd5f5925d26c 100644 > --- a/drivers/media/platform/rcar-vin/rcar-core.c > +++ b/drivers/media/platform/rcar-vin/rcar-core.c > @@ -1116,7 +1116,71 @@ static const struct rvin_info rcar_info_r8a7795es1 = { > }, > }; > > +static const struct rvin_info rcar_info_r8a7796 = { > + .chip = RCAR_GEN3, > + .use_mc = true, > + .max_width = 4096, > + .max_height = 4096, > + > + .num_chsels = 5, > + .chsels = { > + { > + { .csi = RVIN_CSI40, .chan = 0 }, > + { .csi = RVIN_CSI20, .chan = 0 }, > + { .csi = RVIN_NC, .chan = 0 }, > + { .csi = RVIN_CSI40, .chan = 0 }, > + { .csi = RVIN_CSI20, .chan = 0 }, > + }, { > + { .csi = RVIN_CSI20, .chan = 0 }, > + { .csi = RVIN_NC, .chan = 0 }, > + { .csi = RVIN_CSI40, .chan = 0 }, > + { .csi = RVIN_CSI40, .chan = 1 }, > + { .csi = RVIN_CSI20, .chan = 1 }, > + }, { > + { .csi = RVIN_NC, .chan = 0 }, > + { .csi = RVIN_CSI40, .chan = 0 }, > + { .csi = RVIN_CSI20, .chan = 0 }, > + { .csi = RVIN_CSI40, .chan = 2 }, > + { .csi = RVIN_CSI20, .chan = 2 }, > + }, { > + { .csi = RVIN_CSI40, .chan = 1 }, > + { .csi = RVIN_CSI20, .chan = 1 }, > + { .csi = RVIN_NC, .chan = 1 }, > + { .csi = RVIN_CSI40, .chan = 3 }, > + { .csi = RVIN_CSI20, .chan = 3 }, > + }, { > + { .csi = RVIN_CSI40, .chan = 0 }, > + { .csi = RVIN_CSI20, .chan = 0 }, > + { .csi = RVIN_NC, .chan = 0 }, > + { .csi = RVIN_CSI40, .chan = 0 }, > + { .csi = RVIN_CSI20, .chan = 0 }, > + }, { > + { .csi = RVIN_CSI20, .chan = 0 }, > + { .csi = RVIN_NC, .chan = 0 }, > + { .csi = RVIN_CSI40, .chan = 0 }, > + { .csi = RVIN_CSI40, .chan = 1 }, > + { .csi = RVIN_CSI20, .chan = 1 }, > + }, { > + { .csi = RVIN_NC, .chan = 0 }, > + { .csi = RVIN_CSI40, .chan = 0 }, > + { .csi = RVIN_CSI20, .chan = 0 }, > + { .csi = RVIN_CSI40, .chan = 2 }, > + { .csi = RVIN_CSI20, .chan = 2 }, > + }, { > + { .csi = RVIN_CSI40, .chan = 1 }, > + { .csi = RVIN_CSI20, .chan = 1 }, > + { .csi = RVIN_NC, .chan = 1 }, > + { .csi = RVIN_CSI40, .chan = 3 }, > + { .csi = RVIN_CSI20, .chan = 3 }, > + }, > + }, > +}; > + > static const struct of_device_id rvin_of_id_table[] = { > + { > + .compatible = "renesas,vin-r8a7796", > + .data = &rcar_info_r8a7796, > + }, > { > .compatible = "renesas,vin-r8a7795", > .data = &rcar_info_r8a7795, >
diff --git a/Documentation/devicetree/bindings/media/rcar_vin.txt b/Documentation/devicetree/bindings/media/rcar_vin.txt index be38ad89d71ad05d..767358f39512aa17 100644 --- a/Documentation/devicetree/bindings/media/rcar_vin.txt +++ b/Documentation/devicetree/bindings/media/rcar_vin.txt @@ -10,6 +10,7 @@ always slaves and support multiple input channels which can be either RGB, YUVU, BT656 or CSI-2. - compatible: Must be one or more of the following + - "renesas,vin-r8a7796" for the R8A7796 device - "renesas,vin-r8a7795" for the R8A7795 device - "renesas,vin-r8a7794" for the R8A7794 device - "renesas,vin-r8a7793" for the R8A7793 device diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c index 58d903ab9fb83faf..e01edd5f5925d26c 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -1116,7 +1116,71 @@ static const struct rvin_info rcar_info_r8a7795es1 = { }, }; +static const struct rvin_info rcar_info_r8a7796 = { + .chip = RCAR_GEN3, + .use_mc = true, + .max_width = 4096, + .max_height = 4096, + + .num_chsels = 5, + .chsels = { + { + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_NC, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + }, { + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_NC, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + }, { + { .csi = RVIN_NC, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 2 }, + { .csi = RVIN_CSI20, .chan = 2 }, + }, { + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_NC, .chan = 1 }, + { .csi = RVIN_CSI40, .chan = 3 }, + { .csi = RVIN_CSI20, .chan = 3 }, + }, { + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_NC, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + }, { + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_NC, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + }, { + { .csi = RVIN_NC, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 0 }, + { .csi = RVIN_CSI20, .chan = 0 }, + { .csi = RVIN_CSI40, .chan = 2 }, + { .csi = RVIN_CSI20, .chan = 2 }, + }, { + { .csi = RVIN_CSI40, .chan = 1 }, + { .csi = RVIN_CSI20, .chan = 1 }, + { .csi = RVIN_NC, .chan = 1 }, + { .csi = RVIN_CSI40, .chan = 3 }, + { .csi = RVIN_CSI20, .chan = 3 }, + }, + }, +}; + static const struct of_device_id rvin_of_id_table[] = { + { + .compatible = "renesas,vin-r8a7796", + .data = &rcar_info_r8a7796, + }, { .compatible = "renesas,vin-r8a7795", .data = &rcar_info_r8a7795,
Add the SoC specific information for Renesas r8a7796. Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> --- .../devicetree/bindings/media/rcar_vin.txt | 1 + drivers/media/platform/rcar-vin/rcar-core.c | 64 ++++++++++++++++++++++ 2 files changed, 65 insertions(+)