Merge tag 'media/v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - Documentation improvements: conversion of all non-DocBook documents
   to Sphinx and lots of fixes to the uAPI media book

 - New PCI driver for Techwell TW5864 media grabber boards

 - New SoC driver for ATMEL Image Sensor Controller

 - Removal of some obsolete SoC drivers (s5p-tv driver and soc_camera
   drivers)

 - Addition of ST CEC driver

 - Lots of drivers fixes, improvements and additions

* tag 'media/v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (464 commits)
  [media] ttusb_dec: avoid the risk of go past buffer
  [media] cx23885: Fix some smatch warnings
  [media] si2165: switch to regmap
  [media] si2165: use i2c_client->dev instead of i2c_adapter->dev for logging
  [media] si2165: Remove legacy attach
  [media] cx231xx: attach si2165 driver via i2c_client
  [media] cx231xx: Prepare for attaching new style i2c_client DVB demod drivers
  [media] cx23885: attach si2165 driver via i2c_client
  [media] si2165: support i2c_client attach
  [media] si2165: avoid division by zero
  [media] rcar-vin: add R-Car gen2 fallback compatibility string
  [media] lgdt3306a: remove 20*50 msec unnecessary timeout
  [media] cx25821: Remove deprecated create_singlethread_workqueue
  [media] cx25821: Drop Freeing of Workqueue
  [media] cxd2841er: force 8MHz bandwidth for DVB-C if specified bw not supported
  [media] redrat3: hardware-specific parameters
  [media] redrat3: remove hw_timeout member
  [media] cxd2841er: BER and SNR reading for ISDB-T
  [media] dvb-usb: avoid link error with dib3000m{b,c|
  [media] dvb-usb: split out common parts of dibusb
  ...

9 files changed, 97 insertions, 55 deletions

diff --git a/drivers/media/rc/igorplugusb.c b/drivers/media/rc/igorplugusb.c
index e0c531fa01da..5cf983be07a2 100644
--- a/drivers/media/rc/igorplugusb.c
+++ b/drivers/media/rc/igorplugusb.c
@@ -203,7 +203,8 @@ static int igorplugusb_probe(struct usb_interface *intf,
          * This device can only store 36 pulses + spaces, which is not enough
          * for the NEC protocol and many others.
          */
-        rc->allowed_protocols = RC_BIT_ALL & ~(RC_BIT_NEC | RC_BIT_RC6_6A_20 |
+        rc->allowed_protocols = RC_BIT_ALL & ~(RC_BIT_NEC | RC_BIT_NECX |
+                        RC_BIT_NEC32 | RC_BIT_RC6_6A_20 |
                         RC_BIT_RC6_6A_24 | RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE |
                         RC_BIT_SONY20 | RC_BIT_MCE_KBD | RC_BIT_SANYO);
 
diff --git a/drivers/media/rc/img-ir/img-ir-nec.c b/drivers/media/rc/img-ir/img-ir-nec.c
index 27a7ea8f1260..09314933ea08 100644
--- a/drivers/media/rc/img-ir/img-ir-nec.c
+++ b/drivers/media/rc/img-ir/img-ir-nec.c
@@ -34,19 +34,21 @@ static int img_ir_nec_scancode(int len, u64 raw, u64 enabled_protocols,
                                 bitrev8(addr_inv) << 16 |
                                 bitrev8(data)     <<  8 |
                                 bitrev8(data_inv);
+                request->protocol = RC_TYPE_NEC32;
         } else if ((addr_inv ^ addr) != 0xff) {
                 /* Extended NEC */
                 /* scan encoding: AAaaDD */
                 request->scancode = addr     << 16 |
                                 addr_inv <<  8 |
                                 data;
+                request->protocol = RC_TYPE_NECX;
         } else {
                 /* Normal NEC */
                 /* scan encoding: AADD */
                 request->scancode = addr << 8 |
                                 data;
+                request->protocol = RC_TYPE_NEC;
         }
-        request->protocol = RC_TYPE_NEC;
         return IMG_IR_SCANCODE;
 }
 
@@ -109,7 +111,7 @@ static int img_ir_nec_filter(const struct rc_scancode_filter *in,
  *        http://wiki.altium.com/display/ADOH/NEC+Infrared+Transmission+Protocol
  */
 struct img_ir_decoder img_ir_nec = {
-        .type = RC_BIT_NEC,
+        .type = RC_BIT_NEC | RC_BIT_NECX | RC_BIT_NEC32,
         .control = {
                 .decoden = 1,
                 .code_type = IMG_IR_CODETYPE_PULSEDIST,
diff --git a/drivers/media/rc/ir-nec-decoder.c b/drivers/media/rc/ir-nec-decoder.c
index bea0d1eedee0..2a9d155548ab 100644
--- a/drivers/media/rc/ir-nec-decoder.c
+++ b/drivers/media/rc/ir-nec-decoder.c
@@ -49,6 +49,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
 {
         struct nec_dec *data = &dev->raw->nec;
         u32 scancode;
+        enum rc_type rc_type;
         u8 address, not_address, command, not_command;
         bool send_32bits = false;
 
@@ -171,22 +172,25 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
                          * least Apple and TiVo remotes */
                         scancode = data->bits;
                         IR_dprintk(1, "NEC (modified) scancode 0x%08x\n", scancode);
+                        rc_type = RC_TYPE_NEC32;
                 } else if ((address ^ not_address) != 0xff) {
                         /* Extended NEC */
                         scancode = address     << 16 |
                                    not_address <<  8 |
                                    command;
                         IR_dprintk(1, "NEC (Ext) scancode 0x%06x\n", scancode);
+                        rc_type = RC_TYPE_NECX;
                 } else {
                         /* Normal NEC */
                         scancode = address << 8 | command;
                         IR_dprintk(1, "NEC scancode 0x%04x\n", scancode);
+                        rc_type = RC_TYPE_NEC;
                 }
 
                 if (data->is_nec_x)
                         data->necx_repeat = true;
 
-                rc_keydown(dev, RC_TYPE_NEC, scancode, 0);
+                rc_keydown(dev, rc_type, scancode, 0);
                 data->state = STATE_INACTIVE;
                 return 0;
         }
@@ -198,7 +202,7 @@ static int ir_nec_decode(struct rc_dev *dev, struct ir_raw_event ev)
 }
 
 static struct ir_raw_handler nec_handler = {
-        .protocols      = RC_BIT_NEC,
+        .protocols      = RC_BIT_NEC | RC_BIT_NECX | RC_BIT_NEC32,
         .decode         = ir_nec_decode,
 };
 
diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
index e0e2edefa651..5cc54c967a80 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
+++ b/drivers/media/rc/ir-rc6-decoder.c
@@ -248,7 +248,7 @@ again:
                                 toggle = 0;
                                 break;
                         case 24:
-                                protocol = RC_BIT_RC6_6A_24;
+                                protocol = RC_TYPE_RC6_6A_24;
                                 toggle = 0;
                                 break;
                         case 32:
@@ -257,7 +257,7 @@ again:
                                         toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK);
                                         scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
                                 } else {
-                                        protocol = RC_BIT_RC6_6A_32;
+                                        protocol = RC_TYPE_RC6_6A_32;
                                         toggle = 0;
                                 }
                                 break;
diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index 00215f343819..04fedaa75612 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -769,21 +769,11 @@ static void nvt_process_rx_ir_data(struct nvt_dev *nvt)
                         rawir.pulse ? "pulse" : "space", rawir.duration);
 
                 ir_raw_event_store_with_filter(nvt->rdev, &rawir);
-
-                /*
-                 * BUF_PULSE_BIT indicates end of IR data, BUF_REPEAT_BYTE
-                 * indicates end of IR signal, but new data incoming. In both
-                 * cases, it means we're ready to call ir_raw_event_handle
-                 */
-                if ((sample == BUF_PULSE_BIT) && (i + 1 < nvt->pkts)) {
-                        nvt_dbg("Calling ir_raw_event_handle (signal end)\n");
-                        ir_raw_event_handle(nvt->rdev);
-                }
         }
 
         nvt->pkts = 0;
 
-        nvt_dbg("Calling ir_raw_event_handle (buffer empty)\n");
+        nvt_dbg("Calling ir_raw_event_handle\n");
         ir_raw_event_handle(nvt->rdev);
 
         nvt_dbg_verbose("%s done", __func__);
@@ -801,8 +791,7 @@ static void nvt_handle_rx_fifo_overrun(struct nvt_dev *nvt)
 /* copy data from hardware rx fifo into driver buffer */
 static void nvt_get_rx_ir_data(struct nvt_dev *nvt)
 {
-        u8 fifocount, val;
-        unsigned int b_idx;
+        u8 fifocount;
         int i;
 
         /* Get count of how many bytes to read from RX FIFO */
@@ -810,21 +799,11 @@ static void nvt_get_rx_ir_data(struct nvt_dev *nvt)
 
         nvt_dbg("attempting to fetch %u bytes from hw rx fifo", fifocount);
 
-        b_idx = nvt->pkts;
-
-        /* This should never happen, but lets check anyway... */
-        if (b_idx + fifocount > RX_BUF_LEN) {
-                nvt_process_rx_ir_data(nvt);
-                b_idx = 0;
-        }
-
         /* Read fifocount bytes from CIR Sample RX FIFO register */
-        for (i = 0; i < fifocount; i++) {
-                val = nvt_cir_reg_read(nvt, CIR_SRXFIFO);
-                nvt->buf[b_idx + i] = val;
-        }
+        for (i = 0; i < fifocount; i++)
+                nvt->buf[i] = nvt_cir_reg_read(nvt, CIR_SRXFIFO);
 
-        nvt->pkts += fifocount;
+        nvt->pkts = fifocount;
         nvt_dbg("%s: pkts now %d", __func__, nvt->pkts);
 
         nvt_process_rx_ir_data(nvt);
@@ -886,6 +865,15 @@ static irqreturn_t nvt_cir_isr(int irq, void *data)
         status = nvt_cir_reg_read(nvt, CIR_IRSTS);
         iren = nvt_cir_reg_read(nvt, CIR_IREN);
 
+        /* At least NCT6779D creates a spurious interrupt when the
+         * logical device is being disabled.
+         */
+        if (status == 0xff && iren == 0xff) {
+                spin_unlock_irqrestore(&nvt->nvt_lock, flags);
+                nvt_dbg_verbose("Spurious interrupt detected");
+                return IRQ_HANDLED;
+        }
+
         /* IRQ may be shared with CIR WAKE, therefore check for each
          * status bit whether the related interrupt source is enabled
          */
diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
index 144304c94606..205ecc602e34 100644
--- a/drivers/media/rc/rc-ir-raw.c
+++ b/drivers/media/rc/rc-ir-raw.c
@@ -26,6 +26,7 @@ static LIST_HEAD(ir_raw_client_list);
 /* Used to handle IR raw handler extensions */
 static DEFINE_MUTEX(ir_raw_handler_lock);
 static LIST_HEAD(ir_raw_handler_list);
+static DEFINE_MUTEX(available_protocols_lock);
 static u64 available_protocols;
 
 static int ir_raw_event_thread(void *data)
@@ -234,9 +235,9 @@ u64
 ir_raw_get_allowed_protocols(void)
 {
         u64 protocols;
-        mutex_lock(&ir_raw_handler_lock);
+        mutex_lock(&available_protocols_lock);
         protocols = available_protocols;
-        mutex_unlock(&ir_raw_handler_lock);
+        mutex_unlock(&available_protocols_lock);
         return protocols;
 }
 
@@ -330,7 +331,9 @@ int ir_raw_handler_register(struct ir_raw_handler *ir_raw_handler)
         if (ir_raw_handler->raw_register)
                 list_for_each_entry(raw, &ir_raw_client_list, list)
                         ir_raw_handler->raw_register(raw->dev);
+        mutex_lock(&available_protocols_lock);
         available_protocols |= ir_raw_handler->protocols;
+        mutex_unlock(&available_protocols_lock);
         mutex_unlock(&ir_raw_handler_lock);
 
         return 0;
@@ -349,7 +352,9 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler)
                 if (ir_raw_handler->raw_unregister)
                         ir_raw_handler->raw_unregister(raw->dev);
         }
+        mutex_lock(&available_protocols_lock);
         available_protocols &= ~protocols;
+        mutex_unlock(&available_protocols_lock);
         mutex_unlock(&ir_raw_handler_lock);
 }
 EXPORT_SYMBOL(ir_raw_handler_unregister);
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 8e7f2929fa6f..d9c1f2ff7119 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -795,7 +795,9 @@ static const struct {
         { RC_BIT_UNKNOWN,       "unknown",      NULL                    },
         { RC_BIT_RC5 |
           RC_BIT_RC5X,          "rc-5",         "ir-rc5-decoder"        },
-        { RC_BIT_NEC,           "nec",          "ir-nec-decoder"        },
+        { RC_BIT_NEC |
+          RC_BIT_NECX |
+          RC_BIT_NEC32,         "nec",          "ir-nec-decoder"        },
         { RC_BIT_RC6_0 |
           RC_BIT_RC6_6A_20 |
           RC_BIT_RC6_6A_24 |
@@ -1460,6 +1462,10 @@ int rc_register_device(struct rc_dev *dev)
         dev->input_dev->phys = dev->input_phys;
         dev->input_dev->name = dev->input_name;
 
+        rc = input_register_device(dev->input_dev);
+        if (rc)
+                goto out_table;
+
         /*
          * Default delay of 250ms is too short for some protocols, especially
          * since the timeout is currently set to 250ms. Increase it to 500ms,
@@ -1475,11 +1481,6 @@ int rc_register_device(struct rc_dev *dev)
          */
         dev->input_dev->rep[REP_PERIOD] = 125;
 
-        /* rc_open will be called here */
-        rc = input_register_device(dev->input_dev);
-        if (rc)
-                goto out_table;
-
         path = kobject_get_path(&dev->dev.kobj, GFP_KERNEL);
         dev_info(&dev->dev, "%s as %s\n",
                 dev->input_name ?: "Unspecified device", path ?: "N/A");
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index ec8016d9b009..05ba47bc0b61 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -124,6 +124,41 @@
 #define USB_RR3USB_PRODUCT_ID   0x0001
 #define USB_RR3IIUSB_PRODUCT_ID 0x0005
 
+
+/*
+ * The redrat3 encodes an IR signal as set of different lengths and a set
+ * of indices into those lengths. This sets how much two lengths must
+ * differ before they are considered distinct, the value is specified
+ * in microseconds.
+ * Default 5, value 0 to 127.
+ */
+static int length_fuzz = 5;
+module_param(length_fuzz, uint, 0644);
+MODULE_PARM_DESC(length_fuzz, "Length Fuzz (0-127)");
+
+/*
+ * When receiving a continuous ir stream (for example when a user is
+ * holding a button down on a remote), this specifies the minimum size
+ * of a space when the redrat3 sends a irdata packet to the host. Specified
+ * in miliseconds. Default value 18ms.
+ * The value can be between 2 and 30 inclusive.
+ */
+static int minimum_pause = 18;
+module_param(minimum_pause, uint, 0644);
+MODULE_PARM_DESC(minimum_pause, "Minimum Pause in ms (2-30)");
+
+/*
+ * The carrier frequency is measured during the first pulse of the IR
+ * signal. The larger the number of periods used To measure, the more
+ * accurate the result is likely to be, however some signals have short
+ * initial pulses, so in some case it may be necessary to reduce this value.
+ * Default 8, value 1 to 255.
+ */
+static int periods_measure_carrier = 8;
+module_param(periods_measure_carrier, uint, 0644);
+MODULE_PARM_DESC(periods_measure_carrier, "Number of Periods to Measure Carrier (1-255)");
+
+
 struct redrat3_header {
         __be16 length;
         __be16 transfer_type;
@@ -188,9 +223,6 @@ struct redrat3_dev {
         /* usb dma */
         dma_addr_t dma_in;
 
-        /* rx signal timeout */
-        u32 hw_timeout;
-
         /* Is the device currently transmitting?*/
         bool transmitting;
 
@@ -372,7 +404,7 @@ static void redrat3_process_ir_data(struct redrat3_dev *rr3)
         /* add a trailing space */
         rawir.pulse = false;
         rawir.timeout = true;
-        rawir.duration = US_TO_NS(rr3->hw_timeout);
+        rawir.duration = rr3->rc->timeout;
         dev_dbg(dev, "storing trailing timeout with duration %d\n",
                                                         rawir.duration);
         ir_raw_event_store_with_filter(rr3->rc, &rawir);
@@ -480,7 +512,7 @@ static int redrat3_set_timeout(struct rc_dev *rc_dev, unsigned int timeoutns)
         struct redrat3_dev *rr3 = rc_dev->priv;
         struct usb_device *udev = rr3->udev;
         struct device *dev = rr3->dev;
-        u32 *timeout;
+        __be32 *timeout;
         int ret;
 
         timeout = kmalloc(sizeof(*timeout), GFP_KERNEL);
@@ -495,10 +527,9 @@ static int redrat3_set_timeout(struct rc_dev *rc_dev, unsigned int timeoutns)
         dev_dbg(dev, "set ir parm timeout %d ret 0x%02x\n",
                                                 be32_to_cpu(*timeout), ret);
 
-        if (ret == sizeof(*timeout)) {
-                rr3->hw_timeout = timeoutns / 1000;
+        if (ret == sizeof(*timeout))
                 ret = 0;
-        } else if (ret >= 0)
+        else if (ret >= 0)
                 ret = -EIO;
 
         kfree(timeout);
@@ -529,12 +560,25 @@ static void redrat3_reset(struct redrat3_dev *rr3)
                              RR3_CPUCS_REG_ADDR, 0, val, len, HZ * 25);
         dev_dbg(dev, "reset returned 0x%02x\n", rc);
 
-        *val = 5;
+        *val = length_fuzz;
         rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM,
                              USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
                              RR3_IR_IO_LENGTH_FUZZ, 0, val, len, HZ * 25);
         dev_dbg(dev, "set ir parm len fuzz %d rc 0x%02x\n", *val, rc);
 
+        *val = (65536 - (minimum_pause * 2000)) / 256;
+        rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM,
+                             USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
+                             RR3_IR_IO_MIN_PAUSE, 0, val, len, HZ * 25);
+        dev_dbg(dev, "set ir parm min pause %d rc 0x%02x\n", *val, rc);
+
+        *val = periods_measure_carrier;
+        rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM,
+                             USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
+                             RR3_IR_IO_PERIODS_MF, 0, val, len, HZ * 25);
+        dev_dbg(dev, "set ir parm periods measure carrier %d rc 0x%02x", *val,
+                                                                        rc);
+
         *val = RR3_DRIVER_MAXLENS;
         rc = usb_control_msg(udev, txpipe, RR3_SET_IR_PARAM,
                              USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
@@ -889,7 +933,7 @@ static struct rc_dev *redrat3_init_rc_dev(struct redrat3_dev *rr3)
         rc->allowed_protocols = RC_BIT_ALL;
         rc->min_timeout = MS_TO_NS(RR3_RX_MIN_TIMEOUT);
         rc->max_timeout = MS_TO_NS(RR3_RX_MAX_TIMEOUT);
-        rc->timeout = US_TO_NS(rr3->hw_timeout);
+        rc->timeout = US_TO_NS(redrat3_get_timeout(rr3));
         rc->s_timeout = redrat3_set_timeout;
         rc->tx_ir = redrat3_transmit_ir;
         rc->s_tx_carrier = redrat3_set_tx_carrier;
@@ -998,9 +1042,6 @@ static int redrat3_dev_probe(struct usb_interface *intf,
         if (retval < 0)
                 goto error;
 
-        /* store current hardware timeout, in µs */
-        rr3->hw_timeout = redrat3_get_timeout(rr3);
-
         /* default.. will get overridden by any sends with a freq defined */
         rr3->carrier = 38000;
 
diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c
index 815243c65bc3..4004260a7c69 100644
--- a/drivers/media/rc/streamzap.c
+++ b/drivers/media/rc/streamzap.c
@@ -499,7 +499,7 @@ static int streamzap_resume(struct usb_interface *intf)
         struct streamzap_ir *sz = usb_get_intfdata(intf);
 
         if (usb_submit_urb(sz->urb_in, GFP_ATOMIC)) {
-                dev_err(sz->dev, "Error sumbiting urb\n");
+                dev_err(sz->dev, "Error submitting urb\n");
                 return -EIO;
         }