media: bcm2835-unicam: Disable trigger mode operation

[ Upstream commit 697a252bb2ea414cc1c0b4cf4e3d94a879eaf162 ]

The imx219/imx708 sensors frequently generate a single corrupt frame
(image or embedded data) when the sensor first starts. This can either
be a missing line, or invalid samples within the line. This only occurrs
using the upstream Unicam kernel driver.

Disabling trigger mode elimiates this corruption. Since trigger mode is
a legacy feature copied from the firmware driver and not expected to be
needed, remove it. Tested on the Raspberry Pi cameras and shows no ill
effects.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/broadcom/bcm2835-unicam.c b/drivers/media/platform/broadcom/bcm2835-unicam.c
index a1d93c14553d80e7501fdb583c9b9c537dbc31db..9f81e1582a3005d3b85f1e147c042dedc053f4b9 100644 (file)
--- a/drivers/media/platform/broadcom/bcm2835-unicam.c
+++ b/drivers/media/platform/broadcom/bcm2835-unicam.c
@@ -816,11 +816,6 @@ static irqreturn_t unicam_isr(int irq, void *dev)
                }
        }
 
-       if (unicam_reg_read(unicam, UNICAM_ICTL) & UNICAM_FCM) {
-               /* Switch out of trigger mode if selected */
-               unicam_reg_write_field(unicam, UNICAM_ICTL, 1, UNICAM_TFC);
-               unicam_reg_write_field(unicam, UNICAM_ICTL, 0, UNICAM_FCM);
-       }
        return IRQ_HANDLED;
 }
 
@@ -984,8 +979,7 @@ static void unicam_start_rx(struct unicam_device *unicam,
 
        unicam_reg_write_field(unicam, UNICAM_ANA, 0, UNICAM_DDL);
 
-       /* Always start in trigger frame capture mode (UNICAM_FCM set) */
-       val = UNICAM_FSIE | UNICAM_FEIE | UNICAM_FCM | UNICAM_IBOB;
+       val = UNICAM_FSIE | UNICAM_FEIE | UNICAM_IBOB;
        line_int_freq = max(fmt->height >> 2, 128);
        unicam_set_field(&val, line_int_freq, UNICAM_LCIE_MASK);
        unicam_reg_write(unicam, UNICAM_ICTL, val);