1 files changed, 37 insertions, 11 deletions

diff --git a/drivers/media/video/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c
index 19253e6b8673..ceb63653c926 100644
--- a/drivers/media/video/cx18/cx18-gpio.c
+++ b/drivers/media/video/cx18/cx18-gpio.c
@@ -44,31 +44,57 @@
  * gpio13: cs5345 reset pin
 */
 
+static void gpio_write(struct cx18 *cx)
+{
+        u32 dir = cx->gpio_dir;
+        u32 val = cx->gpio_val;
+
+        write_reg((dir & 0xffff) << 16, CX18_REG_GPIO_DIR1);
+        write_reg(((dir & 0xffff) << 16) | (val & 0xffff),
+                        CX18_REG_GPIO_OUT1);
+        write_reg(dir & 0xffff0000, CX18_REG_GPIO_DIR2);
+        write_reg((dir & 0xffff0000) | ((val & 0xffff0000) >> 16),
+                        CX18_REG_GPIO_OUT2);
+}
+
 void cx18_gpio_init(struct cx18 *cx)
 {
-        if (cx->card->gpio_init.direction == 0)
+        cx->gpio_dir = cx->card->gpio_init.direction;
+        cx->gpio_val = cx->card->gpio_init.initial_value;
+
+        if (cx->card->tuners[0].tuner == TUNER_XC2028) {
+                cx->gpio_dir |= 1 << cx->card->xceive_pin;
+                cx->gpio_val |= 1 << cx->card->xceive_pin;
+        }
+
+        if (cx->gpio_dir == 0)
                 return;
 
-        CX18_DEBUG_INFO("GPIO initial dir: %08x out: %08x\n",
-                   read_reg(CX18_REG_GPIO_DIR1), read_reg(CX18_REG_GPIO_OUT1));
+        CX18_DEBUG_INFO("GPIO initial dir: %08x/%08x out: %08x/%08x\n",
+                   read_reg(CX18_REG_GPIO_DIR1), read_reg(CX18_REG_GPIO_DIR2),
+                   read_reg(CX18_REG_GPIO_OUT1), read_reg(CX18_REG_GPIO_OUT2));
 
-        /* init output data then direction */
-        write_reg(cx->card->gpio_init.direction << 16, CX18_REG_GPIO_DIR1);
-        write_reg(0, CX18_REG_GPIO_DIR2);
-        write_reg((cx->card->gpio_init.direction << 16) |
-                        cx->card->gpio_init.initial_value, CX18_REG_GPIO_OUT1);
-        write_reg(0, CX18_REG_GPIO_OUT2);
+        gpio_write(cx);
 }
 
 /* Xceive tuner reset function */
 int cx18_reset_tuner_gpio(void *dev, int cmd, int value)
 {
         struct i2c_algo_bit_data *algo = dev;
-        struct cx18 *cx = algo->data;
-/*      int curdir, curout;*/
+        struct cx18_i2c_algo_callback_data *cb_data = algo->data;
+        struct cx18 *cx = cb_data->cx;
 
         if (cmd != XC2028_TUNER_RESET)
                 return 0;
         CX18_DEBUG_INFO("Resetting tuner\n");
+
+        cx->gpio_val &= ~(1 << cx->card->xceive_pin);
+
+        gpio_write(cx);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
+
+        cx->gpio_val |= 1 << cx->card->xceive_pin;
+        gpio_write(cx);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
         return 0;
 }