diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2014-01-10 19:31:11 -0700 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-09 22:42:32 +0100 |
| commit | 84dba626f1be915fe4383162a5b1f5a54bc900b6 (patch) | |
| tree | f6207612b8913f8bbf6a1d75500f12e6ceb75c49 /drivers/media/platform | |
| parent | c48b537805d826d8f3c0fb35e8172325d696dffa (diff) | |
ov5640_mipi: simplify mipi clock wait loop
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit fc51873dfc9cc3f5ef0fcc63b77cfb932002705d)
(cherry picked from commit 66d988349477f4789b90db00506d642bd27002dd)
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/mxc/capture/ov5640_mipi.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/drivers/media/platform/mxc/capture/ov5640_mipi.c b/drivers/media/platform/mxc/capture/ov5640_mipi.c index 2c39bbf27e57..6f05fd22bb65 100644 --- a/drivers/media/platform/mxc/capture/ov5640_mipi.c +++ b/drivers/media/platform/mxc/capture/ov5640_mipi.c @@ -1431,37 +1431,33 @@ static int ov5640_init_mode(enum ov5640_frame_rate frame_rate, msleep(msec_wait4stable); if (mipi_csi2_info) { - unsigned int i; - - i = 0; + unsigned int i = 0; /* wait for mipi sensor ready */ - mipi_reg = mipi_csi2_dphy_status(mipi_csi2_info); - while ((mipi_reg == 0x200) && (i < 10)) { + while (1) { mipi_reg = mipi_csi2_dphy_status(mipi_csi2_info); - i++; + if (mipi_reg != 0x200) + break; + if (i++ >= 20) { + pr_err("mipi csi2 can not receive sensor clk! %x\n", mipi_reg); + return -1; + } msleep(10); } - if (i >= 10) { - pr_err("mipi csi2 can not receive sensor clk!\n"); - return -1; - } - i = 0; - /* wait for mipi stable */ - mipi_reg = mipi_csi2_get_error1(mipi_csi2_info); - while ((mipi_reg != 0x0) && (i < 10)) { + while (1) { mipi_reg = mipi_csi2_get_error1(mipi_csi2_info); - i++; + if (!mipi_reg) + break; + if (i++ >= 20) { + pr_err("mipi csi2 can not receive data correctly!\n"); + return -1; + } msleep(10); } - if (i >= 10) { - pr_err("mipi csi2 can not reveive data correctly!\n"); - return -1; - } } err: return retval; |