* [PATCH v3 0/3] media: rc: add support for Amlogic Meson IR receiver
@ 2014-11-18 20:22 Beniamino Galvani
2014-11-18 20:22 ` [PATCH v3 1/3] media: rc: meson: document device tree bindings Beniamino Galvani
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Beniamino Galvani @ 2014-11-18 20:22 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-media, Carlo Caione, Sean Young, linux-kernel,
linux-arm-kernel, devicetree, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala, Jerry Cao, Victor Wan,
Beniamino Galvani
Hi,
this is a driver for the infrared receiver available in Amlogic Meson6
and Meson8 SoCs. The device can operate in two modes: "NEC" mode in
which the hardware decodes frames using the NEC IR protocol, and
"general" mode in which the receiver simply reports the duration of
pulses and spaces for software decoding.
In order to have the maximum compatibility with different protocols
the driver implements software decoding.
Changes since v2 [ https://lkml.org/lkml/2014/10/12/149 ]:
- avoid calling rc_free_device() twice in probe error path
Changes since v1 [ https://lkml.org/lkml/2014/11/9/20 ]:
- added COMPILE_TEST to allow compilation for other architectures
- added missing header files
- removed bogus vendor, product and version assignments
- added file path to Meson entry in MAINTAINERS
- reordered patches
Beniamino Galvani (3):
media: rc: meson: document device tree bindings
media: rc: add driver for Amlogic Meson IR remote receiver
ARM: dts: meson: add IR receiver node
.../devicetree/bindings/media/meson-ir.txt | 14 ++
MAINTAINERS | 1 +
arch/arm/boot/dts/meson.dtsi | 7 +
drivers/media/rc/Kconfig | 11 ++
drivers/media/rc/Makefile | 1 +
drivers/media/rc/meson-ir.c | 216 +++++++++++++++++++++
6 files changed, 250 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/meson-ir.txt
create mode 100644 drivers/media/rc/meson-ir.c
--
1.9.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3 1/3] media: rc: meson: document device tree bindings 2014-11-18 20:22 [PATCH v3 0/3] media: rc: add support for Amlogic Meson IR receiver Beniamino Galvani @ 2014-11-18 20:22 ` Beniamino Galvani 2014-11-18 20:22 ` [PATCH v3 2/3] media: rc: add driver for Amlogic Meson IR remote receiver Beniamino Galvani 2014-11-18 20:22 ` [PATCH v3 3/3] ARM: dts: meson: add IR receiver node Beniamino Galvani 2 siblings, 0 replies; 6+ messages in thread From: Beniamino Galvani @ 2014-11-18 20:22 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linux-media, Carlo Caione, Sean Young, linux-kernel, linux-arm-kernel, devicetree, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Jerry Cao, Victor Wan, Beniamino Galvani This adds binding documentation for the infrared remote control receiver available in Amlogic Meson SoCs. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> --- Documentation/devicetree/bindings/media/meson-ir.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/meson-ir.txt diff --git a/Documentation/devicetree/bindings/media/meson-ir.txt b/Documentation/devicetree/bindings/media/meson-ir.txt new file mode 100644 index 0000000..407848e --- /dev/null +++ b/Documentation/devicetree/bindings/media/meson-ir.txt @@ -0,0 +1,14 @@ +* Amlogic Meson IR remote control receiver + +Required properties: + - compatible : should be "amlogic,meson6-ir" + - reg : physical base address and length of the device registers + - interrupts : a single specifier for the interrupt from the device + +Example: + + ir-receiver@c8100480 { + compatible= "amlogic,meson6-ir"; + reg = <0xc8100480 0x20>; + interrupts = <0 15 1>; + }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/3] media: rc: add driver for Amlogic Meson IR remote receiver 2014-11-18 20:22 [PATCH v3 0/3] media: rc: add support for Amlogic Meson IR receiver Beniamino Galvani 2014-11-18 20:22 ` [PATCH v3 1/3] media: rc: meson: document device tree bindings Beniamino Galvani @ 2014-11-18 20:22 ` Beniamino Galvani 2014-11-26 15:04 ` Mauro Carvalho Chehab 2014-11-18 20:22 ` [PATCH v3 3/3] ARM: dts: meson: add IR receiver node Beniamino Galvani 2 siblings, 1 reply; 6+ messages in thread From: Beniamino Galvani @ 2014-11-18 20:22 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linux-media, Carlo Caione, Sean Young, linux-kernel, linux-arm-kernel, devicetree, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Jerry Cao, Victor Wan, Beniamino Galvani Amlogic Meson SoCs include a infrared remote control receiver that can operate in two modes: "NEC" mode in which the hardware decodes frames using the NEC IR protocol, and "general" mode in which the receiver simply reports the duration of pulses and spaces for software decoding. This is a driver for the IR receiver that implements software decoding of received frames. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> --- MAINTAINERS | 1 + drivers/media/rc/Kconfig | 11 +++ drivers/media/rc/Makefile | 1 + drivers/media/rc/meson-ir.c | 216 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 229 insertions(+) create mode 100644 drivers/media/rc/meson-ir.c diff --git a/MAINTAINERS b/MAINTAINERS index 0662378..f1bc045 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -850,6 +850,7 @@ ARM/Amlogic MesonX SoC support M: Carlo Caione <carlo@caione.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained +F: drivers/media/rc/meson-ir.c N: meson[x68] ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig index 1aea732..ddfab25 100644 --- a/drivers/media/rc/Kconfig +++ b/drivers/media/rc/Kconfig @@ -223,6 +223,17 @@ config IR_FINTEK To compile this driver as a module, choose M here: the module will be called fintek-cir. +config IR_MESON + tristate "Amlogic Meson IR remote receiver" + depends on RC_CORE + depends on ARCH_MESON || COMPILE_TEST + ---help--- + Say Y if you want to use the IR remote receiver available + on Amlogic Meson SoCs. + + To compile this driver as a module, choose M here: the + module will be called meson-ir. + config IR_NUVOTON tristate "Nuvoton w836x7hg Consumer Infrared Transceiver" depends on PNP diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile index 8f509e0..379a5c0 100644 --- a/drivers/media/rc/Makefile +++ b/drivers/media/rc/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_IR_IMON) += imon.o obj-$(CONFIG_IR_ITE_CIR) += ite-cir.o obj-$(CONFIG_IR_MCEUSB) += mceusb.o obj-$(CONFIG_IR_FINTEK) += fintek-cir.o +obj-$(CONFIG_IR_MESON) += meson-ir.o obj-$(CONFIG_IR_NUVOTON) += nuvoton-cir.o obj-$(CONFIG_IR_ENE) += ene_ir.o obj-$(CONFIG_IR_REDRAT3) += redrat3.o diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c new file mode 100644 index 0000000..fcc3b82 --- /dev/null +++ b/drivers/media/rc/meson-ir.c @@ -0,0 +1,216 @@ +/* + * Driver for Amlogic Meson IR remote receiver + * + * Copyright (C) 2014 Beniamino Galvani <b.galvani@gmail.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <linux/device.h> +#include <linux/err.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/spinlock.h> + +#include <media/rc-core.h> + +#define DRIVER_NAME "meson-ir" + +#define IR_DEC_LDR_ACTIVE 0x00 +#define IR_DEC_LDR_IDLE 0x04 +#define IR_DEC_LDR_REPEAT 0x08 +#define IR_DEC_BIT_0 0x0c +#define IR_DEC_REG0 0x10 +#define IR_DEC_FRAME 0x14 +#define IR_DEC_STATUS 0x18 +#define IR_DEC_REG1 0x1c + +#define REG0_RATE_MASK (BIT(11) - 1) + +#define REG1_MODE_MASK (BIT(7) | BIT(8)) +#define REG1_MODE_NEC (0 << 7) +#define REG1_MODE_GENERAL (2 << 7) + +#define REG1_TIME_IV_SHIFT 16 +#define REG1_TIME_IV_MASK ((BIT(13) - 1) << REG1_TIME_IV_SHIFT) + +#define REG1_IRQSEL_MASK (BIT(2) | BIT(3)) +#define REG1_IRQSEL_NEC_MODE (0 << 2) +#define REG1_IRQSEL_RISE_FALL (1 << 2) +#define REG1_IRQSEL_FALL (2 << 2) +#define REG1_IRQSEL_RISE (3 << 2) + +#define REG1_RESET BIT(0) +#define REG1_ENABLE BIT(15) + +#define STATUS_IR_DEC_IN BIT(8) + +#define MESON_TRATE 10 /* us */ + +struct meson_ir { + void __iomem *reg; + struct rc_dev *rc; + int irq; + spinlock_t lock; +}; + +static void meson_ir_set_mask(struct meson_ir *ir, unsigned int reg, + u32 mask, u32 value) +{ + u32 data; + + data = readl(ir->reg + reg); + data &= ~mask; + data |= (value & mask); + writel(data, ir->reg + reg); +} + +static irqreturn_t meson_ir_irq(int irqno, void *dev_id) +{ + struct meson_ir *ir = dev_id; + u32 duration; + DEFINE_IR_RAW_EVENT(rawir); + + spin_lock(&ir->lock); + + duration = readl(ir->reg + IR_DEC_REG1); + duration = (duration & REG1_TIME_IV_MASK) >> REG1_TIME_IV_SHIFT; + rawir.duration = US_TO_NS(duration * MESON_TRATE); + + rawir.pulse = !!(readl(ir->reg + IR_DEC_STATUS) & STATUS_IR_DEC_IN); + + ir_raw_event_store_with_filter(ir->rc, &rawir); + ir_raw_event_handle(ir->rc); + + spin_unlock(&ir->lock); + + return IRQ_HANDLED; +} + +static int meson_ir_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *node = dev->of_node; + struct resource *res; + const char *map_name; + struct meson_ir *ir; + int ret; + + ir = devm_kzalloc(dev, sizeof(struct meson_ir), GFP_KERNEL); + if (!ir) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ir->reg = devm_ioremap_resource(dev, res); + if (IS_ERR(ir->reg)) { + dev_err(dev, "failed to map registers\n"); + return PTR_ERR(ir->reg); + } + + ir->irq = platform_get_irq(pdev, 0); + if (ir->irq < 0) { + dev_err(dev, "no irq resource\n"); + return ir->irq; + } + + ir->rc = rc_allocate_device(); + if (!ir->rc) { + dev_err(dev, "failed to allocate rc device\n"); + return -ENOMEM; + } + + ir->rc->priv = ir; + ir->rc->input_name = DRIVER_NAME; + ir->rc->input_phys = DRIVER_NAME "/input0"; + ir->rc->input_id.bustype = BUS_HOST; + map_name = of_get_property(node, "linux,rc-map-name", NULL); + ir->rc->map_name = map_name ? map_name : RC_MAP_EMPTY; + ir->rc->dev.parent = dev; + ir->rc->driver_type = RC_DRIVER_IR_RAW; + ir->rc->allowed_protocols = RC_BIT_ALL; + ir->rc->rx_resolution = US_TO_NS(MESON_TRATE); + ir->rc->timeout = MS_TO_NS(200); + ir->rc->driver_name = DRIVER_NAME; + + spin_lock_init(&ir->lock); + platform_set_drvdata(pdev, ir); + + ret = rc_register_device(ir->rc); + if (ret) { + dev_err(dev, "failed to register rc device\n"); + goto out_free; + } + + ret = devm_request_irq(dev, ir->irq, meson_ir_irq, 0, "ir-meson", ir); + if (ret) { + dev_err(dev, "failed to request irq\n"); + goto out_unreg; + } + + /* Reset the decoder */ + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, REG1_RESET); + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, 0); + /* Set general operation mode */ + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_MODE_MASK, REG1_MODE_GENERAL); + /* Set rate */ + meson_ir_set_mask(ir, IR_DEC_REG0, REG0_RATE_MASK, MESON_TRATE - 1); + /* IRQ on rising and falling edges */ + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_IRQSEL_MASK, + REG1_IRQSEL_RISE_FALL); + /* Enable the decoder */ + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_ENABLE, REG1_ENABLE); + + dev_info(dev, "receiver initialized\n"); + + return 0; +out_unreg: + rc_unregister_device(ir->rc); + ir->rc = NULL; +out_free: + rc_free_device(ir->rc); + + return ret; +} + +static int meson_ir_remove(struct platform_device *pdev) +{ + struct meson_ir *ir = platform_get_drvdata(pdev); + unsigned long flags; + + /* Disable the decoder */ + spin_lock_irqsave(&ir->lock, flags); + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_ENABLE, 0); + spin_unlock_irqrestore(&ir->lock, flags); + + rc_unregister_device(ir->rc); + + return 0; +} + +static const struct of_device_id meson_ir_match[] = { + { .compatible = "amlogic,meson6-ir" }, + { }, +}; + +static struct platform_driver meson_ir_driver = { + .probe = meson_ir_probe, + .remove = meson_ir_remove, + .driver = { + .name = DRIVER_NAME, + .of_match_table = meson_ir_match, + }, +}; + +module_platform_driver(meson_ir_driver); + +MODULE_DESCRIPTION("Amlogic Meson IR remote receiver driver"); +MODULE_AUTHOR("Beniamino Galvani <b.galvani@gmail.com>"); +MODULE_LICENSE("GPL v2"); -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/3] media: rc: add driver for Amlogic Meson IR remote receiver 2014-11-18 20:22 ` [PATCH v3 2/3] media: rc: add driver for Amlogic Meson IR remote receiver Beniamino Galvani @ 2014-11-26 15:04 ` Mauro Carvalho Chehab [not found] ` <20141126130451.5789e7f9-+RedX5hVuTR+urZeOPWqwQ@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Mauro Carvalho Chehab @ 2014-11-26 15:04 UTC (permalink / raw) To: Beniamino Galvani, Carlo Caione Cc: linux-media, Sean Young, linux-kernel, linux-arm-kernel, devicetree, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Jerry Cao, Victor Wan Em Tue, 18 Nov 2014 21:22:34 +0100 Beniamino Galvani <b.galvani@gmail.com> escreveu: > Amlogic Meson SoCs include a infrared remote control receiver that can > operate in two modes: "NEC" mode in which the hardware decodes frames > using the NEC IR protocol, and "general" mode in which the receiver > simply reports the duration of pulses and spaces for software > decoding. > > This is a driver for the IR receiver that implements software decoding > of received frames. > > Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> > --- > MAINTAINERS | 1 + > drivers/media/rc/Kconfig | 11 +++ > drivers/media/rc/Makefile | 1 + > drivers/media/rc/meson-ir.c | 216 ++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 229 insertions(+) > create mode 100644 drivers/media/rc/meson-ir.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index 0662378..f1bc045 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -850,6 +850,7 @@ ARM/Amlogic MesonX SoC support > M: Carlo Caione <carlo@caione.org> > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > S: Maintained > +F: drivers/media/rc/meson-ir.c > N: meson[x68] Hmm... you're putting this driver at Carlo's maintenance shoulders. I need his ack in order to apply this patch. Regards, Mauro > > ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES > diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig > index 1aea732..ddfab25 100644 > --- a/drivers/media/rc/Kconfig > +++ b/drivers/media/rc/Kconfig > @@ -223,6 +223,17 @@ config IR_FINTEK > To compile this driver as a module, choose M here: the > module will be called fintek-cir. > > +config IR_MESON > + tristate "Amlogic Meson IR remote receiver" > + depends on RC_CORE > + depends on ARCH_MESON || COMPILE_TEST > + ---help--- > + Say Y if you want to use the IR remote receiver available > + on Amlogic Meson SoCs. > + > + To compile this driver as a module, choose M here: the > + module will be called meson-ir. > + > config IR_NUVOTON > tristate "Nuvoton w836x7hg Consumer Infrared Transceiver" > depends on PNP > diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile > index 8f509e0..379a5c0 100644 > --- a/drivers/media/rc/Makefile > +++ b/drivers/media/rc/Makefile > @@ -22,6 +22,7 @@ obj-$(CONFIG_IR_IMON) += imon.o > obj-$(CONFIG_IR_ITE_CIR) += ite-cir.o > obj-$(CONFIG_IR_MCEUSB) += mceusb.o > obj-$(CONFIG_IR_FINTEK) += fintek-cir.o > +obj-$(CONFIG_IR_MESON) += meson-ir.o > obj-$(CONFIG_IR_NUVOTON) += nuvoton-cir.o > obj-$(CONFIG_IR_ENE) += ene_ir.o > obj-$(CONFIG_IR_REDRAT3) += redrat3.o > diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c > new file mode 100644 > index 0000000..fcc3b82 > --- /dev/null > +++ b/drivers/media/rc/meson-ir.c > @@ -0,0 +1,216 @@ > +/* > + * Driver for Amlogic Meson IR remote receiver > + * > + * Copyright (C) 2014 Beniamino Galvani <b.galvani@gmail.com> > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * version 2 as published by the Free Software Foundation. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program. If not, see <http://www.gnu.org/licenses/>. > + */ > + > +#include <linux/device.h> > +#include <linux/err.h> > +#include <linux/interrupt.h> > +#include <linux/io.h> > +#include <linux/module.h> > +#include <linux/of_platform.h> > +#include <linux/platform_device.h> > +#include <linux/spinlock.h> > + > +#include <media/rc-core.h> > + > +#define DRIVER_NAME "meson-ir" > + > +#define IR_DEC_LDR_ACTIVE 0x00 > +#define IR_DEC_LDR_IDLE 0x04 > +#define IR_DEC_LDR_REPEAT 0x08 > +#define IR_DEC_BIT_0 0x0c > +#define IR_DEC_REG0 0x10 > +#define IR_DEC_FRAME 0x14 > +#define IR_DEC_STATUS 0x18 > +#define IR_DEC_REG1 0x1c > + > +#define REG0_RATE_MASK (BIT(11) - 1) > + > +#define REG1_MODE_MASK (BIT(7) | BIT(8)) > +#define REG1_MODE_NEC (0 << 7) > +#define REG1_MODE_GENERAL (2 << 7) > + > +#define REG1_TIME_IV_SHIFT 16 > +#define REG1_TIME_IV_MASK ((BIT(13) - 1) << REG1_TIME_IV_SHIFT) > + > +#define REG1_IRQSEL_MASK (BIT(2) | BIT(3)) > +#define REG1_IRQSEL_NEC_MODE (0 << 2) > +#define REG1_IRQSEL_RISE_FALL (1 << 2) > +#define REG1_IRQSEL_FALL (2 << 2) > +#define REG1_IRQSEL_RISE (3 << 2) > + > +#define REG1_RESET BIT(0) > +#define REG1_ENABLE BIT(15) > + > +#define STATUS_IR_DEC_IN BIT(8) > + > +#define MESON_TRATE 10 /* us */ > + > +struct meson_ir { > + void __iomem *reg; > + struct rc_dev *rc; > + int irq; > + spinlock_t lock; > +}; > + > +static void meson_ir_set_mask(struct meson_ir *ir, unsigned int reg, > + u32 mask, u32 value) > +{ > + u32 data; > + > + data = readl(ir->reg + reg); > + data &= ~mask; > + data |= (value & mask); > + writel(data, ir->reg + reg); > +} > + > +static irqreturn_t meson_ir_irq(int irqno, void *dev_id) > +{ > + struct meson_ir *ir = dev_id; > + u32 duration; > + DEFINE_IR_RAW_EVENT(rawir); > + > + spin_lock(&ir->lock); > + > + duration = readl(ir->reg + IR_DEC_REG1); > + duration = (duration & REG1_TIME_IV_MASK) >> REG1_TIME_IV_SHIFT; > + rawir.duration = US_TO_NS(duration * MESON_TRATE); > + > + rawir.pulse = !!(readl(ir->reg + IR_DEC_STATUS) & STATUS_IR_DEC_IN); > + > + ir_raw_event_store_with_filter(ir->rc, &rawir); > + ir_raw_event_handle(ir->rc); > + > + spin_unlock(&ir->lock); > + > + return IRQ_HANDLED; > +} > + > +static int meson_ir_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *node = dev->of_node; > + struct resource *res; > + const char *map_name; > + struct meson_ir *ir; > + int ret; > + > + ir = devm_kzalloc(dev, sizeof(struct meson_ir), GFP_KERNEL); > + if (!ir) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + ir->reg = devm_ioremap_resource(dev, res); > + if (IS_ERR(ir->reg)) { > + dev_err(dev, "failed to map registers\n"); > + return PTR_ERR(ir->reg); > + } > + > + ir->irq = platform_get_irq(pdev, 0); > + if (ir->irq < 0) { > + dev_err(dev, "no irq resource\n"); > + return ir->irq; > + } > + > + ir->rc = rc_allocate_device(); > + if (!ir->rc) { > + dev_err(dev, "failed to allocate rc device\n"); > + return -ENOMEM; > + } > + > + ir->rc->priv = ir; > + ir->rc->input_name = DRIVER_NAME; > + ir->rc->input_phys = DRIVER_NAME "/input0"; > + ir->rc->input_id.bustype = BUS_HOST; > + map_name = of_get_property(node, "linux,rc-map-name", NULL); > + ir->rc->map_name = map_name ? map_name : RC_MAP_EMPTY; > + ir->rc->dev.parent = dev; > + ir->rc->driver_type = RC_DRIVER_IR_RAW; > + ir->rc->allowed_protocols = RC_BIT_ALL; > + ir->rc->rx_resolution = US_TO_NS(MESON_TRATE); > + ir->rc->timeout = MS_TO_NS(200); > + ir->rc->driver_name = DRIVER_NAME; > + > + spin_lock_init(&ir->lock); > + platform_set_drvdata(pdev, ir); > + > + ret = rc_register_device(ir->rc); > + if (ret) { > + dev_err(dev, "failed to register rc device\n"); > + goto out_free; > + } > + > + ret = devm_request_irq(dev, ir->irq, meson_ir_irq, 0, "ir-meson", ir); > + if (ret) { > + dev_err(dev, "failed to request irq\n"); > + goto out_unreg; > + } > + > + /* Reset the decoder */ > + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, REG1_RESET); > + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, 0); > + /* Set general operation mode */ > + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_MODE_MASK, REG1_MODE_GENERAL); > + /* Set rate */ > + meson_ir_set_mask(ir, IR_DEC_REG0, REG0_RATE_MASK, MESON_TRATE - 1); > + /* IRQ on rising and falling edges */ > + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_IRQSEL_MASK, > + REG1_IRQSEL_RISE_FALL); > + /* Enable the decoder */ > + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_ENABLE, REG1_ENABLE); > + > + dev_info(dev, "receiver initialized\n"); > + > + return 0; > +out_unreg: > + rc_unregister_device(ir->rc); > + ir->rc = NULL; > +out_free: > + rc_free_device(ir->rc); > + > + return ret; > +} > + > +static int meson_ir_remove(struct platform_device *pdev) > +{ > + struct meson_ir *ir = platform_get_drvdata(pdev); > + unsigned long flags; > + > + /* Disable the decoder */ > + spin_lock_irqsave(&ir->lock, flags); > + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_ENABLE, 0); > + spin_unlock_irqrestore(&ir->lock, flags); > + > + rc_unregister_device(ir->rc); > + > + return 0; > +} > + > +static const struct of_device_id meson_ir_match[] = { > + { .compatible = "amlogic,meson6-ir" }, > + { }, > +}; > + > +static struct platform_driver meson_ir_driver = { > + .probe = meson_ir_probe, > + .remove = meson_ir_remove, > + .driver = { > + .name = DRIVER_NAME, > + .of_match_table = meson_ir_match, > + }, > +}; > + > +module_platform_driver(meson_ir_driver); > + > +MODULE_DESCRIPTION("Amlogic Meson IR remote receiver driver"); > +MODULE_AUTHOR("Beniamino Galvani <b.galvani@gmail.com>"); > +MODULE_LICENSE("GPL v2"); ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20141126130451.5789e7f9-+RedX5hVuTR+urZeOPWqwQ@public.gmane.org>]
* Re: [PATCH v3 2/3] media: rc: add driver for Amlogic Meson IR remote receiver [not found] ` <20141126130451.5789e7f9-+RedX5hVuTR+urZeOPWqwQ@public.gmane.org> @ 2014-11-26 15:11 ` Carlo Caione 0 siblings, 0 replies; 6+ messages in thread From: Carlo Caione @ 2014-11-26 15:11 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: Beniamino Galvani, Carlo Caione, linux-media-u79uwXL29TY76Z2rM5mHXA, Sean Young, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel, devicetree, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Jerry Cao, Victor Wan On Wed, Nov 26, 2014 at 4:04 PM, Mauro Carvalho Chehab <mchehab-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org> wrote: > Em Tue, 18 Nov 2014 21:22:34 +0100 > Beniamino Galvani <b.galvani-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> escreveu: > >> Amlogic Meson SoCs include a infrared remote control receiver that can >> operate in two modes: "NEC" mode in which the hardware decodes frames >> using the NEC IR protocol, and "general" mode in which the receiver >> simply reports the duration of pulses and spaces for software >> decoding. >> >> This is a driver for the IR receiver that implements software decoding >> of received frames. >> >> Signed-off-by: Beniamino Galvani <b.galvani-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> >> --- >> MAINTAINERS | 1 + >> drivers/media/rc/Kconfig | 11 +++ >> drivers/media/rc/Makefile | 1 + >> drivers/media/rc/meson-ir.c | 216 ++++++++++++++++++++++++++++++++++++++++++++ >> 4 files changed, 229 insertions(+) >> create mode 100644 drivers/media/rc/meson-ir.c >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 0662378..f1bc045 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -850,6 +850,7 @@ ARM/Amlogic MesonX SoC support >> M: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org> >> L: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org (moderated for non-subscribers) >> S: Maintained >> +F: drivers/media/rc/meson-ir.c >> N: meson[x68] > > Hmm... you're putting this driver at Carlo's maintenance shoulders. > > I need his ack in order to apply this patch. Acked-by: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org> -- Carlo Caione -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 3/3] ARM: dts: meson: add IR receiver node 2014-11-18 20:22 [PATCH v3 0/3] media: rc: add support for Amlogic Meson IR receiver Beniamino Galvani 2014-11-18 20:22 ` [PATCH v3 1/3] media: rc: meson: document device tree bindings Beniamino Galvani 2014-11-18 20:22 ` [PATCH v3 2/3] media: rc: add driver for Amlogic Meson IR remote receiver Beniamino Galvani @ 2014-11-18 20:22 ` Beniamino Galvani 2 siblings, 0 replies; 6+ messages in thread From: Beniamino Galvani @ 2014-11-18 20:22 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linux-media, Carlo Caione, Sean Young, linux-kernel, linux-arm-kernel, devicetree, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Jerry Cao, Victor Wan, Beniamino Galvani This adds a node for the IR remote control receiver to the Amlogic Meson DTS. Signed-off-by: Beniamino Galvani <b.galvani@gmail.com> --- arch/arm/boot/dts/meson.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index e6539ea..6a37f15 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -106,5 +106,12 @@ clocks = <&clk81>; status = "disabled"; }; + + ir_receiver: ir-receiver@c8100480 { + compatible= "amlogic,meson6-ir"; + reg = <0xc8100480 0x20>; + interrupts = <0 15 1>; + status = "disabled"; + }; }; }; /* end of / */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-26 15:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-18 20:22 [PATCH v3 0/3] media: rc: add support for Amlogic Meson IR receiver Beniamino Galvani
2014-11-18 20:22 ` [PATCH v3 1/3] media: rc: meson: document device tree bindings Beniamino Galvani
2014-11-18 20:22 ` [PATCH v3 2/3] media: rc: add driver for Amlogic Meson IR remote receiver Beniamino Galvani
2014-11-26 15:04 ` Mauro Carvalho Chehab
[not found] ` <20141126130451.5789e7f9-+RedX5hVuTR+urZeOPWqwQ@public.gmane.org>
2014-11-26 15:11 ` Carlo Caione
2014-11-18 20:22 ` [PATCH v3 3/3] ARM: dts: meson: add IR receiver node Beniamino Galvani
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).