On Thu Oct 1 15:45:34 2026 +0300, Antti Laakso wrote:
> The media entity name prefix is ipu6 for all the hardware, fix it.
>
> Signed-off-by: Antti Laakso <[email protected]>
> Signed-off-by: Sakari Ailus <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 3 ++-
drivers/media/pci/intel/ipu6/ipu6-isys.c | 3 ++-
drivers/media/pci/intel/ipu6/ipu6-isys.h | 18 +++++++++++++++++-
3 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
index 4a2b3d460782..152545427930 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c
@@ -937,7 +937,8 @@ int ipu6_isys_csi2_init(struct ipu6_isys_csi2 *csi2,
csi2->asd.source = IPU6_FW_ISYS_STREAM_SRC_CSI2_PORT0 + index;
csi2->asd.supported_codes = csi2_supported_codes;
snprintf(csi2->asd.sd.name, sizeof(csi2->asd.sd.name),
- IPU6_ISYS_ENTITY_PREFIX " CSI2 %u", index);
+ "Intel IPU%s CSI2 %u",
+ ipu6_isys_entity_version(isys->adev->isp), index);
v4l2_set_subdevdata(&csi2->asd.sd, &csi2->asd);
ret = v4l2_subdev_init_finalize(&csi2->asd.sd);
if (ret) {
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c
b/drivers/media/pci/intel/ipu6/ipu6-isys.c
index a6b79a7be871..094a98e31c06 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.c
@@ -263,7 +263,8 @@ static int isys_register_video_devices(struct ipu6_isys
*isys)
struct ipu6_isys_video *av = &isys->csi2[i].av[j];
snprintf(av->vdev.name, sizeof(av->vdev.name),
- IPU6_ISYS_ENTITY_PREFIX " ISYS Capture %u",
+ "Intel IPU%s ISYS Capture %u",
+ ipu6_isys_entity_version(isys->adev->isp),
i * NR_OF_CSI2_SRC_PADS + j);
av->isys = isys;
av->aq.vbq.buf_struct_size =
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.h
b/drivers/media/pci/intel/ipu6/ipu6-isys.h
index c5c8ede8e64e..f4d00f763eba 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.h
@@ -25,7 +25,23 @@
struct ipu6_bus_device;
-#define IPU6_ISYS_ENTITY_PREFIX "Intel IPU6"
+#define IPU6_ISYS_ENTITY_VERSION "6"
+#define IPU7_ISYS_ENTITY_VERSION "7"
+#define IPU7P5_ISYS_ENTITY_VERSION "7.5"
+#define IPU8_ISYS_ENTITY_VERSION "8"
+
+static inline const char *ipu6_isys_entity_version(struct ipu6_device *isp)
+{
+ if (IS_IPU8(isp))
+ return IPU8_ISYS_ENTITY_VERSION;
+ if (IS_IPU7P5(isp))
+ return IPU7P5_ISYS_ENTITY_VERSION;
+ if (IS_IPU7_MTL(isp))
+ return IPU7_ISYS_ENTITY_VERSION;
+
+ return IPU6_ISYS_ENTITY_VERSION;
+}
+
/* FW support max 16 streams */
#define IPU6_ISYS_MAX_STREAMS 16
#define ISYS_UNISPART_IRQS (IPU6_ISYS_UNISPART_IRQ_SW | \
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
