On Thu Aug 27 15:33:33 2026 +0300, Antti Laakso wrote:
> We are about to enable support for ipu7 hardware, set model name
> accordingly.
>
> 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.c | 2 +-
drivers/media/pci/intel/ipu6/ipu6.c | 2 ++
drivers/media/pci/intel/ipu6/ipu6.h | 3 +++
3 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c
b/drivers/media/pci/intel/ipu6/ipu6-isys.c
index 3fb34d2d189c..08f29b678d1b 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.c
@@ -739,7 +739,7 @@ static int isys_register_devices(struct ipu6_isys *isys)
isys->media_dev.dev = dev;
media_device_pci_init(&isys->media_dev,
- pdev, IPU6_MEDIA_DEV_MODEL_NAME);
+ pdev, isys->adev->isp->model_name);
strscpy(isys->v4l2_dev.name, isys->media_dev.model,
sizeof(isys->v4l2_dev.name));
diff --git a/drivers/media/pci/intel/ipu6/ipu6.c
b/drivers/media/pci/intel/ipu6/ipu6.c
index 817bf54e332a..14a60f10e649 100644
--- a/drivers/media/pci/intel/ipu6/ipu6.c
+++ b/drivers/media/pci/intel/ipu6/ipu6.c
@@ -588,6 +588,7 @@ static int ipu6_pci_probe(struct pci_dev *pdev, const
struct pci_device_id *id)
isp->cpd_metadata_cmpnt_size = sizeof(struct ipu6_cpd_metadata_cmpnt);
isp->buttress.regs = &ipu6_buttress_regs;
+ isp->model_name = IPU6_MEDIA_DEV_MODEL_NAME;
isys_ctrl = &ipu6_isys_buttress_ctrl;
psys_ctrl = &ipu6_psys_buttress_ctrl;
@@ -618,6 +619,7 @@ static int ipu6_pci_probe(struct pci_dev *pdev, const
struct pci_device_id *id)
case PCI_DEVICE_ID_INTEL_IPU7:
isp->hw_ver = IPU_VERSION_7;
isp->cpd_fw_name = IPU7_FIRMWARE_NAME;
+ isp->model_name = IPU7_MEDIA_DEV_MODEL_NAME;
isp->buttress.regs = &ipu7_buttress_regs;
isys_ctrl = &ipu7_isys_buttress_ctrl;
psys_ctrl = &ipu7_psys_buttress_ctrl;
diff --git a/drivers/media/pci/intel/ipu6/ipu6.h
b/drivers/media/pci/intel/ipu6/ipu6.h
index a2992ffe8e3c..8a696caf4b88 100644
--- a/drivers/media/pci/intel/ipu6/ipu6.h
+++ b/drivers/media/pci/intel/ipu6/ipu6.h
@@ -16,6 +16,8 @@ struct ipu6_bus_device;
#define IPU6_NAME "intel-ipu6"
#define IPU6_MEDIA_DEV_MODEL_NAME "ipu6"
+#define IPU7_MEDIA_DEV_MODEL_NAME "ipu7"
+#define IPU7P5_MEDIA_DEV_MODEL_NAME "ipu7.5"
#define IPU6SE_FIRMWARE_NAME "intel/ipu/ipu6se_fw.bin"
#define IPU6EP_FIRMWARE_NAME "intel/ipu/ipu6ep_fw.bin"
@@ -63,6 +65,7 @@ struct ipu6_device {
const struct firmware *cpd_fw;
const char *cpd_fw_name;
u32 cpd_metadata_cmpnt_size;
+ const char *model_name;
void __iomem *base;
void __iomem *pb_base;
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
