media: ddbridge: fix gap handling

Force gap setting if given by attribute and enable gap for older regmaps.
Also, setting a gap value of 128 via sysfs will now disable gap.

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
index c290d3fecc8dd4550387249fafd24dc029a8f1a5..98a12c644e4402df2400f3255b772f9f7849cee4 100644 (file)
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -336,6 +336,7 @@ static void calc_con(struct ddb_output *output, u32 *con, u32 *con2, u32 flags)
        if (output->port->gap != 0xffffffff) {
                flags |= 1;
                gap = output->port->gap;
+               max_bitrate = 0;
        }
        if (dev->link[0].info->type == DDB_OCTOPUS_CI && output->port->nr > 1) {
                *con = 0x10c;
@@ -372,6 +373,7 @@ static void calc_con(struct ddb_output *output, u32 *con, u32 *con2, u32 flags)
                                *con |= 0x810; /* 96 MBit/s and gap */
                                max_bitrate = 96000;
                        }
+                       *con |= 0x10; /* enable gap */
                }
        }
        if (max_bitrate > 0) {
@@ -3203,8 +3205,10 @@ static ssize_t gap_store(struct device *device, struct device_attribute *attr,
 
        if (sscanf(buf, "%u\n", &val) != 1)
                return -EINVAL;
-       if (val > 20)
+       if (val > 128)
                return -EINVAL;
+       if (val == 128)
+               val = 0xffffffff;
        dev->port[num].gap = val;
        return count;
 }