Improvements to Renesas media drivers:

- R-Car V4M support for VIN
 - Fix rzg2l-csi2 module auto-loading
 -----BEGIN PGP SIGNATURE-----
 
 iJgEABYKAEAWIQTAnvhxs4J7QT+XHKnMPy2AAyfeZAUCZspjiyIcbGF1cmVudC5w
 aW5jaGFydEBpZGVhc29uYm9hcmQuY29tAAoJEMw/LYADJ95kiTQBAKc45cDnjwT9
 kGOhTUN1RdsHi5+2RsgUPwU6xK9/ebKbAQCZbl+mV1I6IXBx8h3zUFdFrAH/Z+0z
 Rzi8aImc2SJuDQ==
 =b2am
 -----END PGP SIGNATURE-----

Merge tag 'tags/next-media-renesas-20240825' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git

Improvements to Renesas media drivers:

- R-Car V4M support for VIN
- Fix rzg2l-csi2 module auto-loading

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.linuxtv.org/project/linux-media/patch/20240824234307.GC9543@pendragon.ideasonboard.com/
This commit is contained in:
Hans Verkuil 2024-08-28 13:10:10 +02:00
commit c4d0678991
3 changed files with 14 additions and 12 deletions

View File

@ -52,8 +52,12 @@ properties:
- renesas,vin-r8a77980 # R-Car V3H
- renesas,vin-r8a77990 # R-Car E3
- renesas,vin-r8a77995 # R-Car D3
- items:
- enum:
- renesas,vin-r8a779a0 # R-Car V3U
- renesas,vin-r8a779g0 # R-Car V4H
- renesas,vin-r8a779h0 # R-Car V4M
- const: renesas,rcar-gen4-vin # Generic R-Car Gen4
reg:
maxItems: 1

View File

@ -1274,16 +1274,7 @@ static const struct rvin_info rcar_info_r8a77995 = {
.scaler = rvin_scaler_gen3,
};
static const struct rvin_info rcar_info_r8a779a0 = {
.model = RCAR_GEN3,
.use_mc = true,
.use_isp = true,
.nv12 = true,
.max_width = 4096,
.max_height = 4096,
};
static const struct rvin_info rcar_info_r8a779g0 = {
static const struct rvin_info rcar_info_gen4 = {
.model = RCAR_GEN3,
.use_mc = true,
.use_isp = true,
@ -1354,12 +1345,18 @@ static const struct of_device_id rvin_of_id_table[] = {
.data = &rcar_info_r8a77995,
},
{
/* Keep to be compatible with old DTS files. */
.compatible = "renesas,vin-r8a779a0",
.data = &rcar_info_r8a779a0,
.data = &rcar_info_gen4,
},
{
/* Keep to be compatible with old DTS files. */
.compatible = "renesas,vin-r8a779g0",
.data = &rcar_info_r8a779g0,
.data = &rcar_info_gen4,
},
{
.compatible = "renesas,rcar-gen4-vin",
.data = &rcar_info_gen4,
},
{ /* Sentinel */ },
};

View File

@ -865,6 +865,7 @@ static const struct of_device_id rzg2l_csi2_of_table[] = {
{ .compatible = "renesas,rzg2l-csi2", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, rzg2l_csi2_of_table);
static struct platform_driver rzg2l_csi2_pdrv = {
.remove_new = rzg2l_csi2_remove,