On Thu Aug 27 15:33:28 2026 +0300, Antti Laakso wrote:
> Add SKU ID to buttress register map to get correct ID for both IPUs.
>
> 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-buttress.h | 1 +
drivers/media/pci/intel/ipu6/ipu6.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6-buttress.h
b/drivers/media/pci/intel/ipu6/ipu6-buttress.h
index af72de2b8729..47a49e961945 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-buttress.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.h
@@ -54,6 +54,7 @@ struct ipu6_buttress_registers {
u32 db0_out;
u32 data0_in;
u32 data0_out;
+ u32 sku_id;
/* Bitmasks */
u32 irq_is;
diff --git a/drivers/media/pci/intel/ipu6/ipu6.c
b/drivers/media/pci/intel/ipu6/ipu6.c
index 4e4f32723904..428ad046e239 100644
--- a/drivers/media/pci/intel/ipu6/ipu6.c
+++ b/drivers/media/pci/intel/ipu6/ipu6.c
@@ -153,6 +153,7 @@ static const struct ipu6_buttress_registers
ipu6_buttress_regs = {
.db0_out = BUTTRESS_REG_IU2CSEDB0,
.data0_in = BUTTRESS_REG_CSE2IUDATA0,
.data0_out = BUTTRESS_REG_IU2CSEDATA0,
+ .sku_id = BUTTRESS_REG_SKU,
/* Bitmasks */
.irq_is = BUTTRESS_ISR_IS_IRQ,
@@ -182,6 +183,7 @@ static const struct ipu6_buttress_registers
ipu7_buttress_regs = {
.db0_out = IPU7_BUTTRESS_REG_IU2CSEDB0,
.data0_in = IPU7_BUTTRESS_REG_CSE2IUDATA0,
.data0_out = IPU7_BUTTRESS_REG_IU2CSEDATA0,
+ .sku_id = IPU7_BUTTRESS_REG_SKU,
/* Bitmasks */
.irq_is = IPU7_BUTTRESS_IRQ_IS_IRQ,
@@ -657,7 +659,7 @@ static int ipu6_pci_probe(struct pci_dev *pdev, const
struct pci_device_id *id)
/* Configure the arbitration mechanisms for VC requests */
ipu6_configure_vc_mechanism(isp);
- val = readl(isp->base + BUTTRESS_REG_SKU);
+ val = readl(isp->base + isp->buttress.regs->sku_id);
sku_id = FIELD_GET(GENMASK(6, 4), val);
version = FIELD_GET(GENMASK(3, 0), val);
dev_info(dev, "IPU%u-v%u[%x] hardware version %d\n", version, sku_id,
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
