From b741032df1ff19b795a138bfceb4c43479976c82 Mon Sep 17 00:00:00 2001 From: Antti Laakso Date: Thu, 27 Aug 2026 15:33:03 +0300 Subject: [PATCH] media: ipu6: Rename IPU subsys ID We will need subsys ID later elsewhere, so move it to common header too. Signed-off-by: Antti Laakso Signed-off-by: Sakari Ailus --- drivers/media/pci/intel/ipu6/ipu6-mmu.h | 3 --- drivers/media/pci/intel/ipu6/ipu6.c | 5 ++--- drivers/media/pci/intel/ipu6/ipu6.h | 3 +++ 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu6-mmu.h b/drivers/media/pci/intel/ipu6/ipu6-mmu.h index 8e40b4a66d7d..35cac80d2d4e 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-mmu.h +++ b/drivers/media/pci/intel/ipu6/ipu6-mmu.h @@ -4,9 +4,6 @@ #ifndef IPU6_MMU_H #define IPU6_MMU_H -#define ISYS_MMID 1 -#define PSYS_MMID 0 - #include #include #include diff --git a/drivers/media/pci/intel/ipu6/ipu6.c b/drivers/media/pci/intel/ipu6/ipu6.c index 7ac9c92744c0..c24e18520de6 100644 --- a/drivers/media/pci/intel/ipu6/ipu6.c +++ b/drivers/media/pci/intel/ipu6/ipu6.c @@ -424,8 +424,7 @@ ipu6_isys_init(struct pci_dev *pdev, struct device *parent, "ipu6_bus_initialize_device isys failed\n"); } - isys_adev->mmu = ipu6_mmu_init(dev, base, ISYS_MMID, - &ipdata->hw_variant); + isys_adev->mmu = ipu6_mmu_init(dev, base, IPU_ISYS, &ipdata->hw_variant); if (IS_ERR(isys_adev->mmu)) { put_device(&isys_adev->auxdev.dev); return dev_err_cast_probe(dev, isys_adev->mmu, @@ -465,7 +464,7 @@ ipu6_psys_init(struct pci_dev *pdev, struct device *parent, "ipu6_bus_initialize_device psys failed\n"); } - psys_adev->mmu = ipu6_mmu_init(&pdev->dev, base, PSYS_MMID, + psys_adev->mmu = ipu6_mmu_init(&pdev->dev, base, IPU_PSYS, &ipdata->hw_variant); if (IS_ERR(psys_adev->mmu)) { put_device(&psys_adev->auxdev.dev); diff --git a/drivers/media/pci/intel/ipu6/ipu6.h b/drivers/media/pci/intel/ipu6/ipu6.h index ebae876058ca..dc98a787612f 100644 --- a/drivers/media/pci/intel/ipu6/ipu6.h +++ b/drivers/media/pci/intel/ipu6/ipu6.h @@ -70,6 +70,9 @@ struct ipu6_device { bool bus_ready_to_probe; }; +#define IPU_PSYS 0 +#define IPU_ISYS 1 + #define IPU6_ISYS_NAME "isys" #define IPU6_PSYS_NAME "psys"