Commit 83453a7c authored by Katsuya Matsubara's avatar Katsuya Matsubara Committed by Mauro Carvalho Chehab

[media] vsp1: Use the maximum number of entities defined in platform data

The VSP1 driver allows to define the maximum number of each module
such as RPF, WPF, and UDS in a platform data definition.
This suppresses operations for nonexistent or unused modules.
Signed-off-by: default avatarKatsuya Matsubara <matsu@igel.co.jp>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent db32eb6c
...@@ -35,7 +35,7 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data) ...@@ -35,7 +35,7 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
unsigned int i; unsigned int i;
for (i = 0; i < VPS1_MAX_WPF; ++i) { for (i = 0; i < vsp1->pdata->wpf_count; ++i) {
struct vsp1_rwpf *wpf = vsp1->wpf[i]; struct vsp1_rwpf *wpf = vsp1->wpf[i];
struct vsp1_pipeline *pipe; struct vsp1_pipeline *pipe;
u32 status; u32 status;
...@@ -243,7 +243,7 @@ static int vsp1_device_init(struct vsp1_device *vsp1) ...@@ -243,7 +243,7 @@ static int vsp1_device_init(struct vsp1_device *vsp1)
/* Reset any channel that might be running. */ /* Reset any channel that might be running. */
status = vsp1_read(vsp1, VI6_STATUS); status = vsp1_read(vsp1, VI6_STATUS);
for (i = 0; i < VPS1_MAX_WPF; ++i) { for (i = 0; i < vsp1->pdata->wpf_count; ++i) {
unsigned int timeout; unsigned int timeout;
if (!(status & VI6_STATUS_SYS_ACT(i))) if (!(status & VI6_STATUS_SYS_ACT(i)))
...@@ -267,10 +267,10 @@ static int vsp1_device_init(struct vsp1_device *vsp1) ...@@ -267,10 +267,10 @@ static int vsp1_device_init(struct vsp1_device *vsp1)
vsp1_write(vsp1, VI6_CLK_DCSWT, (8 << VI6_CLK_DCSWT_CSTPW_SHIFT) | vsp1_write(vsp1, VI6_CLK_DCSWT, (8 << VI6_CLK_DCSWT_CSTPW_SHIFT) |
(8 << VI6_CLK_DCSWT_CSTRW_SHIFT)); (8 << VI6_CLK_DCSWT_CSTRW_SHIFT));
for (i = 0; i < VPS1_MAX_RPF; ++i) for (i = 0; i < vsp1->pdata->rpf_count; ++i)
vsp1_write(vsp1, VI6_DPR_RPF_ROUTE(i), VI6_DPR_NODE_UNUSED); vsp1_write(vsp1, VI6_DPR_RPF_ROUTE(i), VI6_DPR_NODE_UNUSED);
for (i = 0; i < VPS1_MAX_UDS; ++i) for (i = 0; i < vsp1->pdata->uds_count; ++i)
vsp1_write(vsp1, VI6_DPR_UDS_ROUTE(i), VI6_DPR_NODE_UNUSED); vsp1_write(vsp1, VI6_DPR_UDS_ROUTE(i), VI6_DPR_NODE_UNUSED);
vsp1_write(vsp1, VI6_DPR_SRU_ROUTE, VI6_DPR_NODE_UNUSED); vsp1_write(vsp1, VI6_DPR_SRU_ROUTE, VI6_DPR_NODE_UNUSED);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment