media: gpio-ir-tx: allow transmission without carrier

Some IR protocols do not use a carrier.

Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/rc/gpio-ir-tx.c b/drivers/media/rc/gpio-ir-tx.c
index 66703989ae1853899ae0b914143e4a19567f1737..f33b443bfa47b06fe103620fc71aecef3342e8a3 100644 (file)
--- a/drivers/media/rc/gpio-ir-tx.c
+++ b/drivers/media/rc/gpio-ir-tx.c
@@ -42,7 +42,7 @@ static int gpio_ir_tx_set_carrier(struct rc_dev *dev, u32 carrier)
 {
        struct gpio_ir *gpio_ir = dev->priv;
 
-       if (!carrier)
+       if (carrier > 500000)
                return -EINVAL;
 
        gpio_ir->carrier = carrier;
@@ -50,10 +50,35 @@ static int gpio_ir_tx_set_carrier(struct rc_dev *dev, u32 carrier)
        return 0;
 }
 
-static int gpio_ir_tx(struct rc_dev *dev, unsigned int *txbuf,
-                     unsigned int count)
+static void gpio_ir_tx_unmodulated(struct gpio_ir *gpio_ir, uint *txbuf,
+                                  uint count)
+{
+       unsigned long flags;
+       ktime_t edge;
+       s32 delta;
+       int i;
+
+       spin_lock_irqsave(&gpio_ir->lock, flags);
+
+       edge = ktime_get();
+
+       for (i = 0; i < count; i++) {
+               gpiod_set_value(gpio_ir->gpio, !(i % 2));
+
+               edge = ktime_add_us(edge, txbuf[i]);
+               delta = ktime_us_delta(edge, ktime_get());
+               if (delta > 0)
+                       udelay(delta);
+       }
+
+       gpiod_set_value(gpio_ir->gpio, 0);
+
+       spin_unlock_irqrestore(&gpio_ir->lock, flags);
+}
+
+static void gpio_ir_tx_modulated(struct gpio_ir *gpio_ir, uint *txbuf,
+                                uint count)
 {
-       struct gpio_ir *gpio_ir = dev->priv;
        unsigned long flags;
        ktime_t edge;
        /*
@@ -105,6 +130,17 @@ static int gpio_ir_tx(struct rc_dev *dev, unsigned int *txbuf,
        }
 
        spin_unlock_irqrestore(&gpio_ir->lock, flags);
+}
+
+static int gpio_ir_tx(struct rc_dev *dev, unsigned int *txbuf,
+                     unsigned int count)
+{
+       struct gpio_ir *gpio_ir = dev->priv;
+
+       if (gpio_ir->carrier)
+               gpio_ir_tx_modulated(gpio_ir, txbuf, count);
+       else
+               gpio_ir_tx_unmodulated(gpio_ir, txbuf, count);
 
        return count;
 }