2 files changed, 8 insertions, 0 deletions

diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
index 3e503396aaa4..52c024a334df 100644
--- a/drivers/media/i2c/ov7670.c
+++ b/drivers/media/i2c/ov7670.c
@@ -231,6 +231,7 @@ struct ov7670_info {
         u8 clkrc;                       /* Clock divider value */
         bool use_smbus;                 /* Use smbus I/O instead of I2C */
         bool pll_bypass;
+        bool pclk_hb_disable;
         const struct ov7670_devtype *devtype; /* Device specifics */
 };
 
@@ -1712,6 +1713,9 @@ static int ov7670_probe(struct i2c_client *client,
                  */
                 if (config->pll_bypass && id->driver_data != MODEL_OV7670)
                         info->pll_bypass = true;
+
+                if (config->pclk_hb_disable)
+                        info->pclk_hb_disable = true;
         }
 
         /* Make sure it's an ov7670 */
@@ -1736,6 +1740,9 @@ static int ov7670_probe(struct i2c_client *client,
         tpf.denominator = 30;
         info->devtype->set_framerate(sd, &tpf);
 
+        if (info->pclk_hb_disable)
+                ov7670_write(sd, REG_COM10, COM10_PCLK_HB);
+
         return 0;
 }
 
diff --git a/include/media/ov7670.h b/include/media/ov7670.h
index a68c8bb3ceba..1913d5123072 100644
--- a/include/media/ov7670.h
+++ b/include/media/ov7670.h
@@ -16,6 +16,7 @@ struct ov7670_config {
         int clock_speed;                /* External clock speed (MHz) */
         bool use_smbus;                 /* Use smbus I/O instead of I2C */
         bool pll_bypass;                /* Choose whether to bypass the PLL */
+        bool pclk_hb_disable;           /* Disable toggling pixclk during horizontal blanking */
 };
 
 #endif