| Message ID | 20210511180728.23781-6-jonathan@marek.ca |
|---|---|
| State | Accepted |
| Commit | a6da362491e409de0978d733441e59db6584d69f |
| Headers | show |
| Series | CAMSS: SM8250 support (and some fixes) | expand |
On Tue, 11 May 2021 at 20:08, Jonathan Marek <jonathan@marek.ca> wrote: > > 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> > --- > 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 a81cc94c075f..2bc695819919 100644 > --- a/drivers/media/platform/qcom/camss/camss-csid-170.c > +++ b/drivers/media/platform/qcom/camss/camss-csid-170.c > @@ -443,12 +443,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)); > } Reviewed-by: Robert Foss <robert.foss@linaro.org>
diff --git a/drivers/media/platform/qcom/camss/camss-csid-170.c b/drivers/media/platform/qcom/camss/camss-csid-170.c index a81cc94c075f..2bc695819919 100644 --- a/drivers/media/platform/qcom/camss/camss-csid-170.c +++ b/drivers/media/platform/qcom/camss/camss-csid-170.c @@ -443,12 +443,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)); }
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> --- drivers/media/platform/qcom/camss/camss-csid-170.c | 6 ------ 1 file changed, 6 deletions(-)