diff options
| author |   Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-07-13 15:51:31 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-07-13 15:51:31 -0400 |
| commit | d5bfbad214369f543958a1c6c55fa805e3f14976 (patch) | |
| tree | 259bcb334acf9607d590721a5a5d3727b3dda769 /drivers/media/platform/rcar-vin/rcar-core.c | |
| parent | drm/i915/display/xelpd: Extend Wa_14011508470 (diff) | |
| parent | Linux 5.14-rc1 (diff) | |
| download | linux-dev-d5bfbad214369f543958a1c6c55fa805e3f14976.tar.xz linux-dev-d5bfbad214369f543958a1c6c55fa805e3f14976.zip | |
Merge drm/drm-next into drm-intel-next
Catching up with 5.14-rc1
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/media/platform/rcar-vin/rcar-core.c')
| -rw-r--r-- | drivers/media/platform/rcar-vin/rcar-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c index cb3025992817..33957cc9118c 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -1363,6 +1363,10 @@ static const struct of_device_id rvin_of_id_table[] = { .data = &rcar_info_r8a7796, }, { + .compatible = "renesas,vin-r8a77961", + .data = &rcar_info_r8a7796, + }, + { .compatible = "renesas,vin-r8a77965", .data = &rcar_info_r8a77965, }, |