2 files changed, 27 insertions, 16 deletions

diff --git a/drivers/media/usb/au0828/au0828-cards.c b/drivers/media/usb/au0828/au0828-cards.c
index 7fdadf9bc90b..3a7924044a87 100644
--- a/drivers/media/usb/au0828/au0828-cards.c
+++ b/drivers/media/usb/au0828/au0828-cards.c
@@ -46,7 +46,7 @@ struct au0828_board au0828_boards[] = {
                 .name   = "Hauppauge HVR850",
                 .tuner_type = TUNER_XC5000,
                 .tuner_addr = 0x61,
-                .i2c_clk_divider = AU0828_I2C_CLK_20KHZ,
+                .i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
                 .input = {
                         {
                                 .type = AU0828_VMUX_TELEVISION,
@@ -77,7 +77,7 @@ struct au0828_board au0828_boards[] = {
                    stretch fits inside of a normal clock cycle, or else the
                    au0828 fails to set the STOP bit.  A 30 KHz clock puts the
                    clock pulse width at 18us */
-                .i2c_clk_divider = AU0828_I2C_CLK_20KHZ,
+                .i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
                 .input = {
                         {
                                 .type = AU0828_VMUX_TELEVISION,
@@ -108,7 +108,7 @@ struct au0828_board au0828_boards[] = {
                 .name   = "DViCO FusionHDTV USB",
                 .tuner_type = UNSET,
                 .tuner_addr = ADDR_UNSET,
-                .i2c_clk_divider = AU0828_I2C_CLK_20KHZ,
+                .i2c_clk_divider = AU0828_I2C_CLK_250KHZ,
         },
         [AU0828_BOARD_HAUPPAUGE_WOODBURY] = {
                 .name = "Hauppauge Woodbury",
diff --git a/drivers/media/usb/au0828/au0828-i2c.c b/drivers/media/usb/au0828/au0828-i2c.c
index 17ec3651b10e..daaeaf1b089c 100644
--- a/drivers/media/usb/au0828/au0828-i2c.c
+++ b/drivers/media/usb/au0828/au0828-i2c.c
@@ -141,25 +141,27 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
 {
         int i, strobe = 0;
         struct au0828_dev *dev = i2c_adap->algo_data;
+        u8 i2c_speed = dev->board.i2c_clk_divider;
 
         dprintk(4, "%s()\n", __func__);
 
         au0828_write(dev, AU0828_I2C_MULTIBYTE_MODE_2FF, 0x01);
 
-        /* Set the I2C clock */
         if (((dev->board.tuner_type == TUNER_XC5000) ||
              (dev->board.tuner_type == TUNER_XC5000C)) &&
-            (dev->board.tuner_addr == msg->addr) &&
-            (msg->len == 64)) {
-                /* Hack to speed up firmware load.  The xc5000 lets us do up
-                   to 400 KHz when in firmware download mode */
-                au0828_write(dev, AU0828_I2C_CLK_DIVIDER_202,
-                             AU0828_I2C_CLK_250KHZ);
-        } else {
-                /* Use the i2c clock speed in the board configuration */
-                au0828_write(dev, AU0828_I2C_CLK_DIVIDER_202,
-                             dev->board.i2c_clk_divider);
+            (dev->board.tuner_addr == msg->addr)) {
+                /*
+                 * Due to I2C clock stretch, we need to use a lower speed
+                 * on xc5000 for commands. However, firmware transfer can
+                 * speed up to 400 KHz.
+                 */
+                if (msg->len == 64)
+                        i2c_speed = AU0828_I2C_CLK_250KHZ;
+                else
+                        i2c_speed = AU0828_I2C_CLK_20KHZ;
         }
+        /* Set the I2C clock */
+        au0828_write(dev, AU0828_I2C_CLK_DIVIDER_202, i2c_speed);
 
         /* Hardware needs 8 bit addresses */
         au0828_write(dev, AU0828_I2C_DEST_ADDR_203, msg->addr << 1);
@@ -228,15 +230,24 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap,
         const struct i2c_msg *msg, int joined)
 {
         struct au0828_dev *dev = i2c_adap->algo_data;
+        u8 i2c_speed = dev->board.i2c_clk_divider;
         int i;
 
         dprintk(4, "%s()\n", __func__);
 
         au0828_write(dev, AU0828_I2C_MULTIBYTE_MODE_2FF, 0x01);
 
+        /*
+         * Due to xc5000c clock stretch, we cannot use full speed at
+         * readings from xc5000, as otherwise they'll fail.
+         */
+        if (((dev->board.tuner_type == TUNER_XC5000) ||
+             (dev->board.tuner_type == TUNER_XC5000C)) &&
+            (dev->board.tuner_addr == msg->addr))
+                i2c_speed = AU0828_I2C_CLK_20KHZ;
+
         /* Set the I2C clock */
-        au0828_write(dev, AU0828_I2C_CLK_DIVIDER_202,
-                     dev->board.i2c_clk_divider);
+        au0828_write(dev, AU0828_I2C_CLK_DIVIDER_202, i2c_speed);
 
         /* Hardware needs 8 bit addresses */
         au0828_write(dev, AU0828_I2C_DEST_ADDR_203, msg->addr << 1);