On Thu Aug 27 15:32:55 2026 +0300, Antti Laakso wrote:
> The ipu6_buttress_ipc structure is called as cse sometimes,
> rename it to ipc for consistency.
>
> 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.c | 33 ++++++++++++++--------------
drivers/media/pci/intel/ipu6/ipu6-buttress.h | 2 +-
drivers/media/pci/intel/ipu6/ipu6.c | 4 ++--
3 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6-buttress.c
b/drivers/media/pci/intel/ipu6/ipu6-buttress.c
index e0ecb4c8b081..cbe356589a9d 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-buttress.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.c
@@ -221,7 +221,7 @@ static int ipu6_buttress_ipc_send_bulk(struct ipu6_device
*isp,
unsigned long tx_timeout_jiffies, rx_timeout_jiffies;
unsigned int i, retry = BUTTRESS_IPC_CMD_SEND_RETRY;
struct ipu6_buttress *b = &isp->buttress;
- struct ipu6_buttress_ipc *ipc = &b->cse;
+ struct ipu6_buttress_ipc *ipc = &b->ipc;
u32 val;
int ret;
int tout;
@@ -378,14 +378,15 @@ irqreturn_t ipu6_buttress_isr(int irq, void *isp_ptr)
if (irq_status & BUTTRESS_ISR_IPC_FROM_CSE_IS_WAITING) {
dev_dbg(&isp->pdev->dev,
"BUTTRESS_ISR_IPC_FROM_CSE_IS_WAITING\n");
- ipu6_buttress_ipc_recv(isp, &b->cse, &b->cse.recv_data);
- complete(&b->cse.recv_complete);
+
+ ipu6_buttress_ipc_recv(isp, &b->ipc, &b->ipc.recv_data);
+ complete(&b->ipc.recv_complete);
}
if (irq_status & BUTTRESS_ISR_IPC_EXEC_DONE_BY_CSE) {
dev_dbg(&isp->pdev->dev,
"BUTTRESS_ISR_IPC_EXEC_DONE_BY_CSE\n");
- complete(&b->cse.send_complete);
+ complete(&b->ipc.send_complete);
}
if (irq_status & BUTTRESS_ISR_SAI_VIOLATION &&
@@ -830,17 +831,17 @@ int ipu6_buttress_init(struct ipu6_device *isp)
mutex_init(&b->auth_mutex);
mutex_init(&b->cons_mutex);
mutex_init(&b->ipc_mutex);
- init_completion(&b->cse.send_complete);
- init_completion(&b->cse.recv_complete);
-
- b->cse.nack = BUTTRESS_CSE2IUDATA0_IPC_NACK;
- b->cse.nack_mask = BUTTRESS_CSE2IUDATA0_IPC_NACK_MASK;
- b->cse.csr_in = BUTTRESS_REG_CSE2IUCSR;
- b->cse.csr_out = BUTTRESS_REG_IU2CSECSR;
- b->cse.db0_in = BUTTRESS_REG_CSE2IUDB0;
- b->cse.db0_out = BUTTRESS_REG_IU2CSEDB0;
- b->cse.data0_in = BUTTRESS_REG_CSE2IUDATA0;
- b->cse.data0_out = BUTTRESS_REG_IU2CSEDATA0;
+ init_completion(&b->ipc.send_complete);
+ init_completion(&b->ipc.recv_complete);
+
+ b->ipc.nack = BUTTRESS_CSE2IUDATA0_IPC_NACK;
+ b->ipc.nack_mask = BUTTRESS_CSE2IUDATA0_IPC_NACK_MASK;
+ b->ipc.csr_in = BUTTRESS_REG_CSE2IUCSR;
+ b->ipc.csr_out = BUTTRESS_REG_IU2CSECSR;
+ b->ipc.db0_in = BUTTRESS_REG_CSE2IUDB0;
+ b->ipc.db0_out = BUTTRESS_REG_IU2CSEDB0;
+ b->ipc.data0_in = BUTTRESS_REG_CSE2IUDATA0;
+ b->ipc.data0_out = BUTTRESS_REG_IU2CSEDATA0;
INIT_LIST_HEAD(&b->constraints);
@@ -877,7 +878,7 @@ int ipu6_buttress_init(struct ipu6_device *isp)
/* Retry couple of times in case of CSE initialization is delayed */
do {
- ret = ipu6_buttress_ipc_reset(isp, &b->cse);
+ ret = ipu6_buttress_ipc_reset(isp, &b->ipc);
if (ret) {
dev_warn(&isp->pdev->dev,
"IPC reset protocol failed, retrying\n");
diff --git a/drivers/media/pci/intel/ipu6/ipu6-buttress.h
b/drivers/media/pci/intel/ipu6/ipu6-buttress.h
index 51e5ad48db82..b1c1a10e3e6d 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-buttress.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-buttress.h
@@ -44,7 +44,7 @@ struct ipu6_buttress_ipc {
struct ipu6_buttress {
struct mutex power_mutex, auth_mutex, cons_mutex, ipc_mutex;
- struct ipu6_buttress_ipc cse;
+ struct ipu6_buttress_ipc ipc;
struct list_head constraints;
u32 wdt_cached_value;
bool force_suspend;
diff --git a/drivers/media/pci/intel/ipu6/ipu6.c
b/drivers/media/pci/intel/ipu6/ipu6.c
index 6d3235352a1c..efb58bc4d127 100644
--- a/drivers/media/pci/intel/ipu6/ipu6.c
+++ b/drivers/media/pci/intel/ipu6/ipu6.c
@@ -765,7 +765,7 @@ static int ipu6_resume(struct device *dev)
ipu6_buttress_restore(isp);
- ret = ipu6_buttress_ipc_reset(isp, &b->cse);
+ ret = ipu6_buttress_ipc_reset(isp, &b->ipc);
if (ret)
dev_err(&isp->pdev->dev, "IPC reset protocol failed!\n");
@@ -797,7 +797,7 @@ static int ipu6_runtime_resume(struct device *dev)
struct ipu6_buttress *b = &isp->buttress;
isp->need_ipc_reset = false;
- ret = ipu6_buttress_ipc_reset(isp, &b->cse);
+ ret = ipu6_buttress_ipc_reset(isp, &b->ipc);
if (ret)
dev_err(&isp->pdev->dev, "IPC reset protocol failed\n");
}
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
