On Thu Oct 1 10:31:31 2026 +0300, Divyamani Tripathi wrote:
> IPU8's GPREG stride is 0x2000, not IPU7's hardcoded 0x1000. Add
> csi2.gpreg_stride and use it in the two gpreg accessors instead of the
> fixed value, wiring it up for both IPU7 and IPU8 in
> ipu6_internal_pdata_init().
>
> Signed-off-by: Divyamani Tripathi <[email protected]>
> Signed-off-by: Sakari Ailus <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
drivers/media/pci/intel/ipu6/ipu6.c | 7 +++++++
drivers/media/pci/intel/ipu6/ipu6.h | 1 +
drivers/media/pci/intel/ipu6/ipu7-isys-csi-phy.c | 6 ++++--
drivers/media/pci/intel/ipu6/ipu7-isys-csi2-regs.h | 2 ++
4 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6.c
b/drivers/media/pci/intel/ipu6/ipu6.c
index 43d951735f72..965410defa09 100644
--- a/drivers/media/pci/intel/ipu6/ipu6.c
+++ b/drivers/media/pci/intel/ipu6/ipu6.c
@@ -373,6 +373,13 @@ static void ipu6_internal_pdata_init(struct ipu6_device
*isp)
if (IS_IPU7(isp)) {
isys_ipdata.csi2.gpreg = IPU7_IS_IO_CSI2_GPREGS_BASE;
+ isys_ipdata.csi2.gpreg_stride = IPU7_IS_IO_CSI2_GPREGS_STRIDE;
+ isys_ipdata.csi2.nports = 4;
+ }
+
+ if (IS_IPU8(isp)) {
+ isys_ipdata.csi2.gpreg = IPU8_IS_IO_CSI2_GPREGS_BASE;
+ isys_ipdata.csi2.gpreg_stride = IPU8_IS_IO_CSI2_GPREGS_STRIDE;
isys_ipdata.csi2.nports = 4;
}
}
diff --git a/drivers/media/pci/intel/ipu6/ipu6.h
b/drivers/media/pci/intel/ipu6/ipu6.h
index 20ffbb4a9934..00fb78a1ec1d 100644
--- a/drivers/media/pci/intel/ipu6/ipu6.h
+++ b/drivers/media/pci/intel/ipu6/ipu6.h
@@ -147,6 +147,7 @@ struct ipu6_isys_internal_csi2_pdata {
u32 fw_access_port_ofs;
/* IPU7-specific field */
u32 gpreg;
+ u32 gpreg_stride;
};
struct ipu6_isys_internal_tpg_pdata {
diff --git a/drivers/media/pci/intel/ipu6/ipu7-isys-csi-phy.c
b/drivers/media/pci/intel/ipu6/ipu7-isys-csi-phy.c
index 10273c687faa..ac4f94764407 100644
--- a/drivers/media/pci/intel/ipu6/ipu7-isys-csi-phy.c
+++ b/drivers/media/pci/intel/ipu6/ipu7-isys-csi-phy.c
@@ -167,7 +167,8 @@ static void gpreg_write(struct ipu6_isys *isys, u32 id, u32
addr, u32 data)
{
void __iomem *isys_base = isys->pdata->base;
u32 gpreg = isys->pdata->ipdata->csi2.gpreg;
- void __iomem *base = isys_base + gpreg + 0x1000 * id;
+ void __iomem *base = isys_base + gpreg +
+ isys->pdata->ipdata->csi2.gpreg_stride *
id;
struct device *dev = &isys->adev->auxdev.dev;
dev_dbg(dev, "gpreg write: reg 0x%lx = data 0x%08x",
@@ -344,7 +345,8 @@ static int ipu7_isys_phy_ready(struct ipu6_isys *isys, u32
id)
{
void __iomem *isys_base = isys->pdata->base;
u32 gpreg_offset = isys->pdata->ipdata->csi2.gpreg;
- void __iomem *gpreg = isys_base + gpreg_offset + 0x1000 * id;
+ void __iomem *gpreg = isys_base + gpreg_offset +
+ isys->pdata->ipdata->csi2.gpreg_stride *
id;
struct device *dev = &isys->adev->auxdev.dev;
u32 phy_ready;
u32 reg, rext;
diff --git a/drivers/media/pci/intel/ipu6/ipu7-isys-csi2-regs.h
b/drivers/media/pci/intel/ipu6/ipu7-isys-csi2-regs.h
index 3859401d4802..4f7f33b9d661 100644
--- a/drivers/media/pci/intel/ipu6/ipu7-isys-csi2-regs.h
+++ b/drivers/media/pci/intel/ipu6/ipu7-isys-csi2-regs.h
@@ -968,7 +968,9 @@
/* software config the phy */
#define IPU7_IS_IO_CSI2_GPREGS_BASE (IPU7_IS_IO_BASE + 0x53400)
+#define IPU7_IS_IO_CSI2_GPREGS_STRIDE 0x1000
#define IPU8_IS_IO_CSI2_GPREGS_BASE (IPU7_IS_IO_BASE + 0x40e00)
+#define IPU8_IS_IO_CSI2_GPREGS_STRIDE 0x2000
#define IPU7_CSI_ADAPT_LAYER_SRST 0x0
#define IPU7_MPF_SRST_RST 0x4
#define IPU7_CSI_ERR_IRQ_CTRL_SRST 0x8
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
