* [PATCH v7 1/3] media: dt: bindings: Add binding for tango HW IR decoder
@ 2017-10-05 14:44 Marc Gonzalez
2017-10-05 14:52 ` [PATCH v7 2/3] media: rc: Add driver " Marc Gonzalez
2017-10-05 14:54 ` [PATCH v7 3/3] media: rc: Add tango keymap Marc Gonzalez
0 siblings, 2 replies; 6+ messages in thread
From: Marc Gonzalez @ 2017-10-05 14:44 UTC (permalink / raw)
To: Sean Young, Rob Herring; +Cc: DT, linux-media, Mans Rullgard, Mason
Add DT binding for the HW IR decoder embedded in SMP86xx/SMP87xx.
Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
---
.../devicetree/bindings/media/tango-ir.txt | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/tango-ir.txt
diff --git a/Documentation/devicetree/bindings/media/tango-ir.txt b/Documentation/devicetree/bindings/media/tango-ir.txt
new file mode 100644
index 000000000000..a9f00c2bf897
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/tango-ir.txt
@@ -0,0 +1,21 @@
+Sigma Designs Tango IR NEC/RC-5/RC-6 decoder (SMP86xx and SMP87xx)
+
+Required properties:
+
+- compatible: "sigma,smp8642-ir"
+- reg: address/size of NEC+RC5 area, address/size of RC6 area
+- interrupts: spec for IR IRQ
+- clocks: spec for IR clock (typically the crystal oscillator)
+
+Optional properties:
+
+- linux,rc-map-name: see Documentation/devicetree/bindings/media/rc.txt
+
+Example:
+
+ ir@10518 {
+ compatible = "sigma,smp8642-ir";
+ reg = <0x10518 0x18>, <0x105e0 0x1c>;
+ interrupts = <21 IRQ_TYPE_EDGE_RISING>;
+ clocks = <&xtal>;
+ };
--
2.14.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v7 2/3] media: rc: Add driver for tango HW IR decoder
2017-10-05 14:44 [PATCH v7 1/3] media: dt: bindings: Add binding for tango HW IR decoder Marc Gonzalez
@ 2017-10-05 14:52 ` Marc Gonzalez
2017-10-05 14:54 ` [PATCH v7 3/3] media: rc: Add tango keymap Marc Gonzalez
1 sibling, 0 replies; 6+ messages in thread
From: Marc Gonzalez @ 2017-10-05 14:52 UTC (permalink / raw)
To: Sean Young; +Cc: linux-media, Mans Rullgard, Mason
From: Mans Rullgard <mans@mansr.com>
The tango HW IR decoder supports NEC, RC-5, RC-6 protocols.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
---
drivers/media/rc/Kconfig | 10 ++
drivers/media/rc/Makefile | 1 +
drivers/media/rc/tango-ir.c | 279 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 290 insertions(+)
create mode 100644 drivers/media/rc/tango-ir.c
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index d9ce8ff55d0c..e80d4362e769 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -469,6 +469,16 @@ config IR_SIR
To compile this driver as a module, choose M here: the module will
be called sir-ir.
+config IR_TANGO
+ tristate "Sigma Designs SMP86xx IR decoder"
+ depends on RC_CORE
+ depends on ARCH_TANGO || COMPILE_TEST
+ ---help---
+ Adds support for the HW IR decoder embedded on Sigma Designs
+ Tango-based systems (SMP86xx, SMP87xx).
+ The HW decoder supports NEC, RC-5, RC-6 IR protocols.
+ When compiled as a module, look for tango-ir.
+
config IR_ZX
tristate "ZTE ZX IR remote control"
depends on RC_CORE
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 9bc6a3980ed0..643797dc971b 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -44,3 +44,4 @@ obj-$(CONFIG_IR_SERIAL) += serial_ir.o
obj-$(CONFIG_IR_SIR) += sir_ir.o
obj-$(CONFIG_IR_MTK) += mtk-cir.o
obj-$(CONFIG_IR_ZX) += zx-irdec.o
+obj-$(CONFIG_IR_TANGO) += tango-ir.o
diff --git a/drivers/media/rc/tango-ir.c b/drivers/media/rc/tango-ir.c
new file mode 100644
index 000000000000..1bd4e3412a29
--- /dev/null
+++ b/drivers/media/rc/tango-ir.c
@@ -0,0 +1,279 @@
+/*
+ * Copyright (C) 2015 Mans Rullgard <mans@mansr.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/input.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/of.h>
+#include <media/rc-core.h>
+
+#define DRIVER_NAME "tango-ir"
+
+#define IR_NEC_CTRL 0x00
+#define IR_NEC_DATA 0x04
+#define IR_CTRL 0x08
+#define IR_RC5_CLK_DIV 0x0c
+#define IR_RC5_DATA 0x10
+#define IR_INT 0x14
+
+#define NEC_TIME_BASE 560
+#define RC5_TIME_BASE 1778
+
+#define RC6_CTRL 0x00
+#define RC6_CLKDIV 0x04
+#define RC6_DATA0 0x08
+#define RC6_DATA1 0x0c
+#define RC6_DATA2 0x10
+#define RC6_DATA3 0x14
+#define RC6_DATA4 0x18
+
+#define RC6_CARRIER 36000
+#define RC6_TIME_BASE 16
+
+#define NEC_CAP(n) ((n) << 24)
+#define GPIO_SEL(n) ((n) << 16)
+#define DISABLE_NEC (BIT(4) | BIT(8))
+#define ENABLE_RC5 (BIT(0) | BIT(9))
+#define ENABLE_RC6 (BIT(0) | BIT(7))
+#define ACK_IR_INT (BIT(0) | BIT(1))
+#define ACK_RC6_INT (BIT(31))
+
+struct tango_ir {
+ void __iomem *rc5_base;
+ void __iomem *rc6_base;
+ struct rc_dev *rc;
+ struct clk *clk;
+};
+
+static void tango_ir_handle_nec(struct tango_ir *ir)
+{
+ u32 v, code;
+ enum rc_proto proto;
+
+ v = readl_relaxed(ir->rc5_base + IR_NEC_DATA);
+ if (!v) {
+ rc_repeat(ir->rc);
+ return;
+ }
+
+ code = ir_nec_bytes_to_scancode(v, v >> 8, v >> 16, v >> 24, &proto);
+ rc_keydown(ir->rc, proto, code, 0);
+}
+
+static void tango_ir_handle_rc5(struct tango_ir *ir)
+{
+ u32 data, field, toggle, addr, cmd, code;
+
+ data = readl_relaxed(ir->rc5_base + IR_RC5_DATA);
+ if (data & BIT(31))
+ return;
+
+ field = data >> 12 & 1;
+ toggle = data >> 11 & 1;
+ addr = data >> 6 & 0x1f;
+ cmd = (data & 0x3f) | (field ^ 1) << 6;
+
+ code = RC_SCANCODE_RC5(addr, cmd);
+ rc_keydown(ir->rc, RC_PROTO_RC5, code, toggle);
+}
+
+static void tango_ir_handle_rc6(struct tango_ir *ir)
+{
+ u32 data0, data1, toggle, mode, addr, cmd, code;
+
+ data0 = readl_relaxed(ir->rc6_base + RC6_DATA0);
+ data1 = readl_relaxed(ir->rc6_base + RC6_DATA1);
+
+ mode = data0 >> 1 & 7;
+ if (mode != 0)
+ return;
+
+ toggle = data0 & 1;
+ addr = data0 >> 16;
+ cmd = data1;
+
+ code = RC_SCANCODE_RC6_0(addr, cmd);
+ rc_keydown(ir->rc, RC_PROTO_RC6_0, code, toggle);
+}
+
+static irqreturn_t tango_ir_irq(int irq, void *dev_id)
+{
+ struct tango_ir *ir = dev_id;
+ unsigned int rc5_stat;
+ unsigned int rc6_stat;
+
+ rc5_stat = readl_relaxed(ir->rc5_base + IR_INT);
+ writel_relaxed(rc5_stat, ir->rc5_base + IR_INT);
+
+ rc6_stat = readl_relaxed(ir->rc6_base + RC6_CTRL);
+ writel_relaxed(rc6_stat, ir->rc6_base + RC6_CTRL);
+
+ if (!(rc5_stat & 3) && !(rc6_stat & BIT(31)))
+ return IRQ_NONE;
+
+ if (rc5_stat & BIT(0))
+ tango_ir_handle_rc5(ir);
+
+ if (rc5_stat & BIT(1))
+ tango_ir_handle_nec(ir);
+
+ if (rc6_stat & BIT(31))
+ tango_ir_handle_rc6(ir);
+
+ return IRQ_HANDLED;
+}
+
+static int tango_change_protocol(struct rc_dev *dev, u64 *rc_type)
+{
+ struct tango_ir *ir = dev->priv;
+ u32 rc5_ctrl = DISABLE_NEC;
+ u32 rc6_ctrl = 0;
+
+ if (*rc_type & RC_PROTO_BIT_NEC)
+ rc5_ctrl = 0;
+
+ if (*rc_type & RC_PROTO_BIT_RC5)
+ rc5_ctrl |= ENABLE_RC5;
+
+ if (*rc_type & RC_PROTO_BIT_RC6_0)
+ rc6_ctrl = ENABLE_RC6;
+
+ writel_relaxed(rc5_ctrl, ir->rc5_base + IR_CTRL);
+ writel_relaxed(rc6_ctrl, ir->rc6_base + RC6_CTRL);
+
+ return 0;
+}
+
+static int tango_ir_probe(struct platform_device *pdev)
+{
+ const char *map_name = RC_MAP_EMPTY;
+ struct device *dev = &pdev->dev;
+ struct rc_dev *rc;
+ struct tango_ir *ir;
+ struct resource *rc5_res;
+ struct resource *rc6_res;
+ u64 clkrate, clkdiv;
+ int irq, err;
+ u32 val;
+
+ rc5_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!rc5_res)
+ return -EINVAL;
+
+ rc6_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ if (!rc6_res)
+ return -EINVAL;
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq <= 0)
+ return -EINVAL;
+
+ ir = devm_kzalloc(dev, sizeof(*ir), GFP_KERNEL);
+ if (!ir)
+ return -ENOMEM;
+
+ ir->rc5_base = devm_ioremap_resource(dev, rc5_res);
+ if (IS_ERR(ir->rc5_base))
+ return PTR_ERR(ir->rc5_base);
+
+ ir->rc6_base = devm_ioremap_resource(dev, rc6_res);
+ if (IS_ERR(ir->rc6_base))
+ return PTR_ERR(ir->rc6_base);
+
+ ir->clk = devm_clk_get(dev, NULL);
+ if (IS_ERR(ir->clk))
+ return PTR_ERR(ir->clk);
+
+ rc = devm_rc_allocate_device(dev, RC_DRIVER_SCANCODE);
+ if (!rc)
+ return -ENOMEM;
+
+ of_property_read_string(dev->of_node, "linux,rc-map-name", &map_name);
+
+ rc->device_name = DRIVER_NAME;
+ rc->driver_name = DRIVER_NAME;
+ rc->input_phys = DRIVER_NAME "/input0";
+ rc->map_name = map_name;
+ rc->allowed_protocols = RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC6_0 |
+ RC_PROTO_BIT_NEC | RC_PROTO_BIT_NECX | RC_PROTO_BIT_NEC32;
+ rc->change_protocol = tango_change_protocol;
+ rc->priv = ir;
+ ir->rc = rc;
+
+ err = clk_prepare_enable(ir->clk);
+ if (err)
+ return err;
+
+ clkrate = clk_get_rate(ir->clk);
+
+ clkdiv = clkrate * NEC_TIME_BASE;
+ do_div(clkdiv, 1000000);
+
+ val = NEC_CAP(31) | GPIO_SEL(12) | clkdiv;
+ writel_relaxed(val, ir->rc5_base + IR_NEC_CTRL);
+
+ clkdiv = clkrate * RC5_TIME_BASE;
+ do_div(clkdiv, 1000000);
+
+ writel_relaxed(DISABLE_NEC, ir->rc5_base + IR_CTRL);
+ writel_relaxed(clkdiv, ir->rc5_base + IR_RC5_CLK_DIV);
+ writel_relaxed(ACK_IR_INT, ir->rc5_base + IR_INT);
+
+ clkdiv = clkrate * RC6_TIME_BASE;
+ do_div(clkdiv, RC6_CARRIER);
+
+ writel_relaxed(ACK_RC6_INT, ir->rc6_base + RC6_CTRL);
+ writel_relaxed((clkdiv >> 2) << 18 | clkdiv, ir->rc6_base + RC6_CLKDIV);
+
+ err = devm_request_irq(dev, irq, tango_ir_irq, IRQF_SHARED,
+ dev_name(dev), ir);
+ if (err)
+ goto err_clk;
+
+ err = devm_rc_register_device(dev, rc);
+ if (err)
+ goto err_clk;
+
+ platform_set_drvdata(pdev, ir);
+ return 0;
+
+err_clk:
+ clk_disable_unprepare(ir->clk);
+ return err;
+}
+
+static int tango_ir_remove(struct platform_device *pdev)
+{
+ struct tango_ir *ir = platform_get_drvdata(pdev);
+ clk_disable_unprepare(ir->clk);
+ return 0;
+}
+
+static const struct of_device_id tango_ir_dt_ids[] = {
+ { .compatible = "sigma,smp8642-ir" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, tango_ir_dt_ids);
+
+static struct platform_driver tango_ir_driver = {
+ .probe = tango_ir_probe,
+ .remove = tango_ir_remove,
+ .driver = {
+ .name = DRIVER_NAME,
+ .of_match_table = tango_ir_dt_ids,
+ },
+};
+module_platform_driver(tango_ir_driver);
+
+MODULE_DESCRIPTION("SMP86xx IR decoder driver");
+MODULE_AUTHOR("Mans Rullgard <mans@mansr.com>");
+MODULE_LICENSE("GPL");
--
2.14.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v7 3/3] media: rc: Add tango keymap
2017-10-05 14:44 [PATCH v7 1/3] media: dt: bindings: Add binding for tango HW IR decoder Marc Gonzalez
2017-10-05 14:52 ` [PATCH v7 2/3] media: rc: Add driver " Marc Gonzalez
@ 2017-10-05 14:54 ` Marc Gonzalez
2017-10-05 21:52 ` Sean Young
1 sibling, 1 reply; 6+ messages in thread
From: Marc Gonzalez @ 2017-10-05 14:54 UTC (permalink / raw)
To: Sean Young; +Cc: linux-media, Mans Rullgard, Mason
Add a keymap for the Sigma Designs Vantage (dev board) remote control.
Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
---
drivers/media/rc/keymaps/Makefile | 1 +
drivers/media/rc/keymaps/rc-tango.c | 84 +++++++++++++++++++++++++++++++++++++
drivers/media/rc/tango-ir.c | 2 +-
include/media/rc-map.h | 1 +
4 files changed, 87 insertions(+), 1 deletion(-)
create mode 100644 drivers/media/rc/keymaps/rc-tango.c
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index af6496d709fb..3c1e31321e21 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -88,6 +88,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
rc-reddo.o \
rc-snapstream-firefly.o \
rc-streamzap.o \
+ rc-tango.o \
rc-tbs-nec.o \
rc-technisat-ts35.o \
rc-technisat-usb2.o \
diff --git a/drivers/media/rc/keymaps/rc-tango.c b/drivers/media/rc/keymaps/rc-tango.c
new file mode 100644
index 000000000000..c76651695959
--- /dev/null
+++ b/drivers/media/rc/keymaps/rc-tango.c
@@ -0,0 +1,84 @@
+#include <linux/module.h>
+#include <media/rc-map.h>
+
+static struct rc_map_table tango_table[] = {
+ { 0x4cb4a, KEY_POWER },
+ { 0x4cb48, KEY_FILE },
+ { 0x4cb0f, KEY_SETUP },
+ { 0x4cb4d, KEY_SUSPEND },
+ { 0x4cb4e, KEY_VOLUMEUP },
+ { 0x4cb44, KEY_EJECTCD },
+ { 0x4cb13, KEY_TV },
+ { 0x4cb51, KEY_MUTE },
+ { 0x4cb52, KEY_VOLUMEDOWN },
+
+ { 0x4cb41, KEY_1 },
+ { 0x4cb03, KEY_2 },
+ { 0x4cb42, KEY_3 },
+ { 0x4cb45, KEY_4 },
+ { 0x4cb07, KEY_5 },
+ { 0x4cb46, KEY_6 },
+ { 0x4cb55, KEY_7 },
+ { 0x4cb17, KEY_8 },
+ { 0x4cb56, KEY_9 },
+ { 0x4cb1b, KEY_0 },
+ { 0x4cb59, KEY_DELETE },
+ { 0x4cb5a, KEY_CAPSLOCK },
+
+ { 0x4cb47, KEY_BACK },
+ { 0x4cb05, KEY_SWITCHVIDEOMODE },
+ { 0x4cb06, KEY_UP },
+ { 0x4cb43, KEY_LEFT },
+ { 0x4cb01, KEY_RIGHT },
+ { 0x4cb0a, KEY_DOWN },
+ { 0x4cb02, KEY_ENTER },
+ { 0x4cb4b, KEY_INFO },
+ { 0x4cb09, KEY_HOME },
+
+ { 0x4cb53, KEY_MENU },
+ { 0x4cb12, KEY_PREVIOUS },
+ { 0x4cb50, KEY_PLAY },
+ { 0x4cb11, KEY_NEXT },
+ { 0x4cb4f, KEY_TITLE },
+ { 0x4cb0e, KEY_REWIND },
+ { 0x4cb4c, KEY_STOP },
+ { 0x4cb0d, KEY_FORWARD },
+ { 0x4cb57, KEY_MEDIA_REPEAT },
+ { 0x4cb16, KEY_ANGLE },
+ { 0x4cb54, KEY_PAUSE },
+ { 0x4cb15, KEY_SLOW },
+ { 0x4cb5b, KEY_TIME },
+ { 0x4cb1a, KEY_AUDIO },
+ { 0x4cb58, KEY_SUBTITLE },
+ { 0x4cb19, KEY_ZOOM },
+
+ { 0x4cb5f, KEY_RED },
+ { 0x4cb1e, KEY_GREEN },
+ { 0x4cb5c, KEY_YELLOW },
+ { 0x4cb1d, KEY_BLUE },
+};
+
+static struct rc_map_list tango_map = {
+ .map = {
+ .scan = tango_table,
+ .size = ARRAY_SIZE(tango_table),
+ .rc_proto = RC_PROTO_NEC,
+ .name = RC_MAP_TANGO,
+ }
+};
+
+static int __init init_rc_map_tango(void)
+{
+ return rc_map_register(&tango_map);
+}
+
+static void __exit exit_rc_map_tango(void)
+{
+ rc_map_unregister(&tango_map);
+}
+
+module_init(init_rc_map_tango)
+module_exit(exit_rc_map_tango)
+
+MODULE_AUTHOR("Sigma Designs");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/rc/tango-ir.c b/drivers/media/rc/tango-ir.c
index 1bd4e3412a29..d5a1eb6fa855 100644
--- a/drivers/media/rc/tango-ir.c
+++ b/drivers/media/rc/tango-ir.c
@@ -155,7 +155,7 @@ static int tango_change_protocol(struct rc_dev *dev, u64 *rc_type)
static int tango_ir_probe(struct platform_device *pdev)
{
- const char *map_name = RC_MAP_EMPTY;
+ const char *map_name = RC_MAP_TANGO;
struct device *dev = &pdev->dev;
struct rc_dev *rc;
struct tango_ir *ir;
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 2a160e6e823c..1d8e6bdb9b35 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -323,6 +323,7 @@ struct rc_map *rc_map_get(const char *name);
#define RC_MAP_WINFAST_USBII_DELUXE "rc-winfast-usbii-deluxe"
#define RC_MAP_SU3000 "rc-su3000"
#define RC_MAP_ZX_IRDEC "rc-zx-irdec"
+#define RC_MAP_TANGO "rc-tango"
/*
* Please, do not just append newer Remote Controller names at the end.
--
2.14.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v7 3/3] media: rc: Add tango keymap
2017-10-05 14:54 ` [PATCH v7 3/3] media: rc: Add tango keymap Marc Gonzalez
@ 2017-10-05 21:52 ` Sean Young
2017-10-06 10:47 ` Måns Rullgård
0 siblings, 1 reply; 6+ messages in thread
From: Sean Young @ 2017-10-05 21:52 UTC (permalink / raw)
To: Marc Gonzalez; +Cc: linux-media, Mans Rullgard, Mason
Hi Marc,
Looks great, just some minor nitpicks.
On Thu, Oct 05, 2017 at 04:54:11PM +0200, Marc Gonzalez wrote:
> Add a keymap for the Sigma Designs Vantage (dev board) remote control.
>
> Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> ---
> drivers/media/rc/keymaps/Makefile | 1 +
> drivers/media/rc/keymaps/rc-tango.c | 84 +++++++++++++++++++++++++++++++++++++
> drivers/media/rc/tango-ir.c | 2 +-
> include/media/rc-map.h | 1 +
> 4 files changed, 87 insertions(+), 1 deletion(-)
> create mode 100644 drivers/media/rc/keymaps/rc-tango.c
>
> diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
> index af6496d709fb..3c1e31321e21 100644
> --- a/drivers/media/rc/keymaps/Makefile
> +++ b/drivers/media/rc/keymaps/Makefile
> @@ -88,6 +88,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
> rc-reddo.o \
> rc-snapstream-firefly.o \
> rc-streamzap.o \
> + rc-tango.o \
> rc-tbs-nec.o \
> rc-technisat-ts35.o \
> rc-technisat-usb2.o \
> diff --git a/drivers/media/rc/keymaps/rc-tango.c b/drivers/media/rc/keymaps/rc-tango.c
> new file mode 100644
> index 000000000000..c76651695959
> --- /dev/null
> +++ b/drivers/media/rc/keymaps/rc-tango.c
> @@ -0,0 +1,84 @@
I think you need a header with copyright statement and GPL version(s).
> +#include <linux/module.h>
> +#include <media/rc-map.h>
> +
> +static struct rc_map_table tango_table[] = {
> + { 0x4cb4a, KEY_POWER },
> + { 0x4cb48, KEY_FILE },
> + { 0x4cb0f, KEY_SETUP },
> + { 0x4cb4d, KEY_SUSPEND },
> + { 0x4cb4e, KEY_VOLUMEUP },
> + { 0x4cb44, KEY_EJECTCD },
> + { 0x4cb13, KEY_TV },
> + { 0x4cb51, KEY_MUTE },
> + { 0x4cb52, KEY_VOLUMEDOWN },
> +
> + { 0x4cb41, KEY_1 },
> + { 0x4cb03, KEY_2 },
> + { 0x4cb42, KEY_3 },
> + { 0x4cb45, KEY_4 },
> + { 0x4cb07, KEY_5 },
> + { 0x4cb46, KEY_6 },
> + { 0x4cb55, KEY_7 },
> + { 0x4cb17, KEY_8 },
> + { 0x4cb56, KEY_9 },
> + { 0x4cb1b, KEY_0 },
> + { 0x4cb59, KEY_DELETE },
> + { 0x4cb5a, KEY_CAPSLOCK },
> +
> + { 0x4cb47, KEY_BACK },
> + { 0x4cb05, KEY_SWITCHVIDEOMODE },
> + { 0x4cb06, KEY_UP },
> + { 0x4cb43, KEY_LEFT },
> + { 0x4cb01, KEY_RIGHT },
> + { 0x4cb0a, KEY_DOWN },
> + { 0x4cb02, KEY_ENTER },
> + { 0x4cb4b, KEY_INFO },
> + { 0x4cb09, KEY_HOME },
> +
> + { 0x4cb53, KEY_MENU },
> + { 0x4cb12, KEY_PREVIOUS },
> + { 0x4cb50, KEY_PLAY },
> + { 0x4cb11, KEY_NEXT },
> + { 0x4cb4f, KEY_TITLE },
> + { 0x4cb0e, KEY_REWIND },
> + { 0x4cb4c, KEY_STOP },
> + { 0x4cb0d, KEY_FORWARD },
> + { 0x4cb57, KEY_MEDIA_REPEAT },
> + { 0x4cb16, KEY_ANGLE },
> + { 0x4cb54, KEY_PAUSE },
> + { 0x4cb15, KEY_SLOW },
> + { 0x4cb5b, KEY_TIME },
> + { 0x4cb1a, KEY_AUDIO },
> + { 0x4cb58, KEY_SUBTITLE },
> + { 0x4cb19, KEY_ZOOM },
> +
> + { 0x4cb5f, KEY_RED },
> + { 0x4cb1e, KEY_GREEN },
> + { 0x4cb5c, KEY_YELLOW },
> + { 0x4cb1d, KEY_BLUE },
> +};
> +
> +static struct rc_map_list tango_map = {
> + .map = {
> + .scan = tango_table,
> + .size = ARRAY_SIZE(tango_table),
> + .rc_proto = RC_PROTO_NEC,
This is RC_PROTO_NECX. I realise that not all keymaps do this correctly,
but might as well start now.
> + .name = RC_MAP_TANGO,
> + }
> +};
> +
> +static int __init init_rc_map_tango(void)
> +{
> + return rc_map_register(&tango_map);
> +}
> +
> +static void __exit exit_rc_map_tango(void)
> +{
> + rc_map_unregister(&tango_map);
> +}
> +
> +module_init(init_rc_map_tango)
> +module_exit(exit_rc_map_tango)
> +
> +MODULE_AUTHOR("Sigma Designs");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/media/rc/tango-ir.c b/drivers/media/rc/tango-ir.c
> index 1bd4e3412a29..d5a1eb6fa855 100644
> --- a/drivers/media/rc/tango-ir.c
> +++ b/drivers/media/rc/tango-ir.c
> @@ -155,7 +155,7 @@ static int tango_change_protocol(struct rc_dev *dev, u64 *rc_type)
>
> static int tango_ir_probe(struct platform_device *pdev)
> {
> - const char *map_name = RC_MAP_EMPTY;
> + const char *map_name = RC_MAP_TANGO;
If you re-order the keymap patch before the driver, you can include this
in the first version and you don't have to patch the previous patch.
> struct device *dev = &pdev->dev;
> struct rc_dev *rc;
> struct tango_ir *ir;
> diff --git a/include/media/rc-map.h b/include/media/rc-map.h
> index 2a160e6e823c..1d8e6bdb9b35 100644
> --- a/include/media/rc-map.h
> +++ b/include/media/rc-map.h
> @@ -323,6 +323,7 @@ struct rc_map *rc_map_get(const char *name);
> #define RC_MAP_WINFAST_USBII_DELUXE "rc-winfast-usbii-deluxe"
> #define RC_MAP_SU3000 "rc-su3000"
> #define RC_MAP_ZX_IRDEC "rc-zx-irdec"
> +#define RC_MAP_TANGO "rc-tango"
>
> /*
> * Please, do not just append newer Remote Controller names at the end.
> --
> 2.14.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v7 3/3] media: rc: Add tango keymap
2017-10-05 21:52 ` Sean Young
@ 2017-10-06 10:47 ` Måns Rullgård
2017-10-06 10:55 ` Marc Gonzalez
0 siblings, 1 reply; 6+ messages in thread
From: Måns Rullgård @ 2017-10-06 10:47 UTC (permalink / raw)
To: Sean Young; +Cc: Marc Gonzalez, linux-media, Mason
Sean Young <sean@mess.org> writes:
> Hi Marc,
>
> Looks great, just some minor nitpicks.
>
> On Thu, Oct 05, 2017 at 04:54:11PM +0200, Marc Gonzalez wrote:
>> Add a keymap for the Sigma Designs Vantage (dev board) remote control.
>>
>> Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
>> ---
>> drivers/media/rc/keymaps/Makefile | 1 +
>> drivers/media/rc/keymaps/rc-tango.c | 84 +++++++++++++++++++++++++++++++++++++
>> drivers/media/rc/tango-ir.c | 2 +-
>> include/media/rc-map.h | 1 +
>> 4 files changed, 87 insertions(+), 1 deletion(-)
>> create mode 100644 drivers/media/rc/keymaps/rc-tango.c
>>
>> diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
>> index af6496d709fb..3c1e31321e21 100644
>> --- a/drivers/media/rc/keymaps/Makefile
>> +++ b/drivers/media/rc/keymaps/Makefile
>> @@ -88,6 +88,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
>> rc-reddo.o \
>> rc-snapstream-firefly.o \
>> rc-streamzap.o \
>> + rc-tango.o \
>> rc-tbs-nec.o \
>> rc-technisat-ts35.o \
>> rc-technisat-usb2.o \
>> diff --git a/drivers/media/rc/keymaps/rc-tango.c b/drivers/media/rc/keymaps/rc-tango.c
>> new file mode 100644
>> index 000000000000..c76651695959
>> --- /dev/null
>> +++ b/drivers/media/rc/keymaps/rc-tango.c
>> @@ -0,0 +1,84 @@
>
> I think you need a header with copyright statement and GPL version(s).
Is this even copyrightable?
--
Måns Rullgård
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v7 3/3] media: rc: Add tango keymap
2017-10-06 10:47 ` Måns Rullgård
@ 2017-10-06 10:55 ` Marc Gonzalez
0 siblings, 0 replies; 6+ messages in thread
From: Marc Gonzalez @ 2017-10-06 10:55 UTC (permalink / raw)
To: Mans Rullgard, Sean Young; +Cc: linux-media, Mason
On 06/10/2017 12:47, Måns Rullgård wrote:
> Sean Young writes:
>
>> Looks great, just some minor nitpicks.
>>
>> I think you need a header with copyright statement and GPL version(s).
>
> Is this even copyrightable?
My thoughts, exactly.
I don't mind *not* providing a copyright statement and GPL boiler plate.
But if Sean requires one to submit, I'll include the proper legalese.
Regards.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-06 10:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-05 14:44 [PATCH v7 1/3] media: dt: bindings: Add binding for tango HW IR decoder Marc Gonzalez
2017-10-05 14:52 ` [PATCH v7 2/3] media: rc: Add driver " Marc Gonzalez
2017-10-05 14:54 ` [PATCH v7 3/3] media: rc: Add tango keymap Marc Gonzalez
2017-10-05 21:52 ` Sean Young
2017-10-06 10:47 ` Måns Rullgård
2017-10-06 10:55 ` Marc Gonzalez
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.