| From 28ca68a2fc791812e8133e5d6971416f6b9e74ef Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 22 Dec 2021 01:37:38 +0100 |
| Subject: media: camss: csid-170: don't enable unused irqs |
| |
| From: Jonathan Marek <jonathan@marek.ca> |
| |
| [ Upstream commit a6da362491e409de0978d733441e59db6584d69f ] |
| |
| csid_isr() only checks for the reset irq, so enabling any other irqs |
| doesn't make sense. The "RDI irq" comment is also wrong, the register |
| should be CSID_CSI2_RDIN_IRQ_MASK. Without this fix there may be an |
| excessive amount of irqs. |
| |
| Fixes: eebe6d00e9bf ("media: camss: Add support for CSID hardware version Titan 170") |
| Signed-off-by: Jonathan Marek <jonathan@marek.ca> |
| Reviewed-by: Robert Foss <robert.foss@linaro.org> |
| Tested-by: Julian Grahsl <jgrahsl@snap.com> |
| Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> |
| Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/qcom/camss/camss-csid-170.c | 6 ------ |
| 1 file changed, 6 deletions(-) |
| |
| diff --git a/drivers/media/platform/qcom/camss/camss-csid-170.c b/drivers/media/platform/qcom/camss/camss-csid-170.c |
| index aa65043c3303..a006c8dbceb1 100644 |
| --- a/drivers/media/platform/qcom/camss/camss-csid-170.c |
| +++ b/drivers/media/platform/qcom/camss/camss-csid-170.c |
| @@ -444,12 +444,6 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable) |
| val |= 1 << CSI2_RX_CFG1_MISR_EN; |
| writel_relaxed(val, csid->base + CSID_CSI2_RX_CFG1); // csi2_vc_mode_shift_val ? |
| |
| - /* error irqs start at BIT(11) */ |
| - writel_relaxed(~0u, csid->base + CSID_CSI2_RX_IRQ_MASK); |
| - |
| - /* RDI irq */ |
| - writel_relaxed(~0u, csid->base + CSID_TOP_IRQ_MASK); |
| - |
| val = 1 << RDI_CTRL_HALT_CMD; |
| writel_relaxed(val, csid->base + CSID_RDI_CTRL(0)); |
| } |
| -- |
| 2.34.1 |
| |
