* [PATCH v2 0/3] Introduce hix5hd2 IR transmitter driver
@ 2014-08-21 9:24 ` Zhangfei Gao
0 siblings, 0 replies; 29+ messages in thread
From: Zhangfei Gao @ 2014-08-21 9:24 UTC (permalink / raw)
To: Mauro Carvalho Chehab, David Härdeman, arnd, haifeng.yan, jchxue
Cc: linux-arm-kernel, devicetree, linux-media, Zhangfei Gao
v2:
Rebase to 3.17-rc1, solve two issues:
a) rc_set_allowed_protocols is deprecated
b) rc-ir-raw.c add empty change_protocol, which block using all protocol
For example, when rdev->map_name = RC_MAP_LIRC, ir-nec-decoder can not be used.
Guoxiong Yan (2):
rc: Add DT bindings for hix5hd2
rc: Introduce hix5hd2 IR transmitter driver
Zhangfei Gao (1):
[media] rc: remove change_protocol in rc-ir-raw.c
.../devicetree/bindings/media/hix5hd2-ir.txt | 21 ++
drivers/media/rc/Kconfig | 11 +
drivers/media/rc/Makefile | 1 +
drivers/media/rc/ir-hix5hd2.c | 347 ++++++++++++++++++++
drivers/media/rc/rc-ir-raw.c | 7 -
5 files changed, 380 insertions(+), 7 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/hix5hd2-ir.txt
create mode 100644 drivers/media/rc/ir-hix5hd2.c
--
1.7.9.5
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 0/3] Introduce hix5hd2 IR transmitter driver
@ 2014-08-21 9:24 ` Zhangfei Gao
0 siblings, 0 replies; 29+ messages in thread
From: Zhangfei Gao @ 2014-08-21 9:24 UTC (permalink / raw)
To: linux-arm-kernel
v2:
Rebase to 3.17-rc1, solve two issues:
a) rc_set_allowed_protocols is deprecated
b) rc-ir-raw.c add empty change_protocol, which block using all protocol
For example, when rdev->map_name = RC_MAP_LIRC, ir-nec-decoder can not be used.
Guoxiong Yan (2):
rc: Add DT bindings for hix5hd2
rc: Introduce hix5hd2 IR transmitter driver
Zhangfei Gao (1):
[media] rc: remove change_protocol in rc-ir-raw.c
.../devicetree/bindings/media/hix5hd2-ir.txt | 21 ++
drivers/media/rc/Kconfig | 11 +
drivers/media/rc/Makefile | 1 +
drivers/media/rc/ir-hix5hd2.c | 347 ++++++++++++++++++++
drivers/media/rc/rc-ir-raw.c | 7 -
5 files changed, 380 insertions(+), 7 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/hix5hd2-ir.txt
create mode 100644 drivers/media/rc/ir-hix5hd2.c
--
1.7.9.5
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 1/3] rc: Add DT bindings for hix5hd2
2014-08-21 9:24 ` Zhangfei Gao
@ 2014-08-21 9:24 ` Zhangfei Gao
-1 siblings, 0 replies; 29+ messages in thread
From: Zhangfei Gao @ 2014-08-21 9:24 UTC (permalink / raw)
To: Mauro Carvalho Chehab, David Härdeman, arnd, haifeng.yan, jchxue
Cc: linux-arm-kernel, devicetree, linux-media, Guoxiong Yan, Zhangfei Gao
From: Guoxiong Yan <yanguoxiong@huawei.com>
Signed-off-by: Guoxiong Yan <yanguoxiong@huawei.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
---
.../devicetree/bindings/media/hix5hd2-ir.txt | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/hix5hd2-ir.txt
diff --git a/Documentation/devicetree/bindings/media/hix5hd2-ir.txt b/Documentation/devicetree/bindings/media/hix5hd2-ir.txt
new file mode 100644
index 0000000..3240484
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/hix5hd2-ir.txt
@@ -0,0 +1,21 @@
+Device-Tree bindings for hix5hd2 ir IP
+
+Required properties:
+- compatible: Should contain "hisilicon,hix5hd2-ir".
+- reg: Base physical address of the controller and length of memory
+ mapped region.
+- interrupts: interrupt-specifier for the sole interrupt generated by
+ the device. The interrupt specifier format depends on the interrupt
+ controller parent.
+- clocks: clock phandle and specifier pair.
+- hisilicon,power-syscon: phandle of syscon used to control power.
+
+Example node:
+
+ ir: ir@f8001000 {
+ compatible = "hisilicon,hix5hd2-ir";
+ reg = <0xf8001000 0x1000>;
+ interrupts = <0 47 4>;
+ clocks = <&clock HIX5HD2_FIXED_24M>;
+ hisilicon,power-syscon = <&sctrl>;
+ };
--
1.7.9.5
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH v2 1/3] rc: Add DT bindings for hix5hd2
@ 2014-08-21 9:24 ` Zhangfei Gao
0 siblings, 0 replies; 29+ messages in thread
From: Zhangfei Gao @ 2014-08-21 9:24 UTC (permalink / raw)
To: linux-arm-kernel
From: Guoxiong Yan <yanguoxiong@huawei.com>
Signed-off-by: Guoxiong Yan <yanguoxiong@huawei.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
---
.../devicetree/bindings/media/hix5hd2-ir.txt | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/hix5hd2-ir.txt
diff --git a/Documentation/devicetree/bindings/media/hix5hd2-ir.txt b/Documentation/devicetree/bindings/media/hix5hd2-ir.txt
new file mode 100644
index 0000000..3240484
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/hix5hd2-ir.txt
@@ -0,0 +1,21 @@
+Device-Tree bindings for hix5hd2 ir IP
+
+Required properties:
+- compatible: Should contain "hisilicon,hix5hd2-ir".
+- reg: Base physical address of the controller and length of memory
+ mapped region.
+- interrupts: interrupt-specifier for the sole interrupt generated by
+ the device. The interrupt specifier format depends on the interrupt
+ controller parent.
+- clocks: clock phandle and specifier pair.
+- hisilicon,power-syscon: phandle of syscon used to control power.
+
+Example node:
+
+ ir: ir at f8001000 {
+ compatible = "hisilicon,hix5hd2-ir";
+ reg = <0xf8001000 0x1000>;
+ interrupts = <0 47 4>;
+ clocks = <&clock HIX5HD2_FIXED_24M>;
+ hisilicon,power-syscon = <&sctrl>;
+ };
--
1.7.9.5
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
2014-08-21 9:24 ` Zhangfei Gao
@ 2014-08-21 9:24 ` Zhangfei Gao
-1 siblings, 0 replies; 29+ messages in thread
From: Zhangfei Gao @ 2014-08-21 9:24 UTC (permalink / raw)
To: Mauro Carvalho Chehab, David Härdeman, arnd, haifeng.yan, jchxue
Cc: linux-arm-kernel, devicetree, linux-media, Guoxiong Yan, Zhangfei Gao
From: Guoxiong Yan <yanguoxiong@huawei.com>
IR transmitter driver for Hisilicon hix5hd2 soc
Signed-off-by: Guoxiong Yan <yanguoxiong@huawei.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
---
drivers/media/rc/Kconfig | 11 ++
drivers/media/rc/Makefile | 1 +
drivers/media/rc/ir-hix5hd2.c | 347 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 359 insertions(+)
create mode 100644 drivers/media/rc/ir-hix5hd2.c
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 5e626af..64dc8bb 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -164,6 +164,17 @@ config IR_ENE
To compile this driver as a module, choose M here: the
module will be called ene_ir.
+config IR_HIX5HD2
+ tristate "Hisilicon hix5hd2 IR remote control"
+ depends on RC_CORE
+ help
+ Say Y here if you want to use hisilicon remote control.
+ The driver passes raw pulse and space information to the LIRC decoder.
+ To compile this driver as a module, choose M here: the module will be
+ called hisi_ir.
+
+ If you're not sure, select N here
+
config IR_IMON
tristate "SoundGraph iMON Receiver and Display"
depends on USB_ARCH_HAS_HCD
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 9f9843a1..0989f94 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_IR_XMP_DECODER) += ir-xmp-decoder.o
# stand-alone IR receivers/transmitters
obj-$(CONFIG_RC_ATI_REMOTE) += ati_remote.o
+obj-$(CONFIG_IR_HIX5HD2) += ir-hix5hd2.o
obj-$(CONFIG_IR_IMON) += imon.o
obj-$(CONFIG_IR_ITE_CIR) += ite-cir.o
obj-$(CONFIG_IR_MCEUSB) += mceusb.o
diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c
new file mode 100644
index 0000000..543b454
--- /dev/null
+++ b/drivers/media/rc/ir-hix5hd2.c
@@ -0,0 +1,347 @@
+/*
+ * Copyright (c) 2014 Linaro Ltd.
+ * Copyright (c) 2014 Hisilicon Limited.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <media/rc-core.h>
+
+#define IR_ENABLE 0x00
+#define IR_CONFIG 0x04
+#define CNT_LEADS 0x08
+#define CNT_LEADE 0x0c
+#define CNT_SLEADE 0x10
+#define CNT0_B 0x14
+#define CNT1_B 0x18
+#define IR_BUSY 0x1c
+#define IR_DATAH 0x20
+#define IR_DATAL 0x24
+#define IR_INTM 0x28
+#define IR_INTS 0x2c
+#define IR_INTC 0x30
+#define IR_START 0x34
+
+/* interrupt mask */
+#define INTMS_SYMBRCV (BIT(24) | BIT(8))
+#define INTMS_TIMEOUT (BIT(25) | BIT(9))
+#define INTMS_OVERFLOW (BIT(26) | BIT(10))
+#define INT_CLR_OVERFLOW BIT(18)
+#define INT_CLR_TIMEOUT BIT(17)
+#define INT_CLR_RCV BIT(16)
+#define INT_CLR_RCVTIMEOUT (BIT(16) | BIT(17))
+
+#define IR_CLK 0x48
+#define IR_CLK_ENABLE BIT(4)
+#define IR_CLK_RESET BIT(5)
+
+#define IR_CFG_WIDTH_MASK 0xffff
+#define IR_CFG_WIDTH_SHIFT 16
+#define IR_CFG_FORMAT_MASK 0x3
+#define IR_CFG_FORMAT_SHIFT 14
+#define IR_CFG_INT_LEVEL_MASK 0x3f
+#define IR_CFG_INT_LEVEL_SHIFT 8
+/* only support raw mode */
+#define IR_CFG_MODE_RAW BIT(7)
+#define IR_CFG_FREQ_MASK 0x7f
+#define IR_CFG_FREQ_SHIFT 0
+#define IR_CFG_INT_THRESHOLD 1
+/* symbol start from low to high, symbol stream end at high*/
+#define IR_CFG_SYMBOL_FMT 0
+#define IR_CFG_SYMBOL_MAXWIDTH 0x3e80
+
+#define IR_HIX5HD2_NAME "hix5hd2-ir"
+
+struct hix5hd2_ir_priv {
+ int irq;
+ void *base;
+ struct device *dev;
+ struct rc_dev *rdev;
+ struct regmap *regmap;
+ struct clk *clock;
+ unsigned long rate;
+};
+
+static void hix5hd2_ir_send_lirc_timeout(struct rc_dev *rdev)
+{
+ DEFINE_IR_RAW_EVENT(ev);
+
+ ev.timeout = true;
+ ir_raw_event_store(rdev, &ev);
+}
+
+static irqreturn_t hix5hd2_ir_rx_interrupt(int irq, void *data)
+{
+ u32 symb_num, symb_val, symb_time;
+ u32 data_l, data_h;
+ u32 irq_sr, i;
+ struct hix5hd2_ir_priv *priv = data;
+
+ irq_sr = readl_relaxed(priv->base + IR_INTS);
+ if (irq_sr & INTMS_OVERFLOW) {
+ /*
+ * we must read IR_DATAL first, then we can clean up
+ * IR_INTS availably since logic would not clear
+ * fifo when overflow, drv do the job
+ */
+ ir_raw_event_reset(priv->rdev);
+ symb_num = readl_relaxed(priv->base + IR_DATAH);
+ for (i = 0; i < symb_num; i++)
+ readl_relaxed(priv->base + IR_DATAL);
+
+ writel_relaxed(INT_CLR_OVERFLOW, priv->base + IR_INTC);
+ dev_info(priv->dev, "overflow, level=%d\n",
+ IR_CFG_INT_THRESHOLD);
+ }
+
+ if ((irq_sr & INTMS_SYMBRCV) || (irq_sr & INTMS_TIMEOUT)) {
+ DEFINE_IR_RAW_EVENT(ev);
+
+ symb_num = readl_relaxed(priv->base + IR_DATAH);
+ for (i = 0; i < symb_num; i++) {
+ symb_val = readl_relaxed(priv->base + IR_DATAL);
+ data_l = ((symb_val & 0xffff) * 10);
+ data_h = ((symb_val >> 16) & 0xffff) * 10;
+ symb_time = (data_l + data_h) / 10;
+
+ ev.duration = US_TO_NS(data_l);
+ ev.pulse = true;
+ ir_raw_event_store(priv->rdev, &ev);
+
+ if (symb_time < IR_CFG_SYMBOL_MAXWIDTH) {
+ ev.duration = US_TO_NS(data_h);
+ ev.pulse = false;
+ ir_raw_event_store(priv->rdev, &ev);
+ } else {
+ hix5hd2_ir_send_lirc_timeout(priv->rdev);
+ }
+ }
+
+ if (irq_sr & INTMS_SYMBRCV)
+ writel_relaxed(INT_CLR_RCV, priv->base + IR_INTC);
+ if (irq_sr & INTMS_TIMEOUT)
+ writel_relaxed(INT_CLR_TIMEOUT, priv->base + IR_INTC);
+ }
+
+ /* Empty software fifo */
+ ir_raw_event_handle(priv->rdev);
+ return IRQ_HANDLED;
+}
+
+static void hix5hd2_ir_enable(struct hix5hd2_ir_priv *dev, bool on)
+{
+ u32 val;
+
+ regmap_read(dev->regmap, IR_CLK, &val);
+ if (on) {
+ val &= ~IR_CLK_RESET;
+ val |= IR_CLK_ENABLE;
+ } else {
+ val &= ~IR_CLK_ENABLE;
+ val |= IR_CLK_RESET;
+ }
+ regmap_write(dev->regmap, IR_CLK, val);
+}
+
+static int hix5hd2_ir_config(struct hix5hd2_ir_priv *priv)
+{
+ int timeout = 10000;
+ u32 val, rate;
+
+ writel_relaxed(0x01, priv->base + IR_ENABLE);
+ while (readl_relaxed(priv->base + IR_BUSY)) {
+ if (timeout--) {
+ udelay(1);
+ } else {
+ dev_err(priv->dev, "IR_BUSY timeout\n");
+ return -ETIMEDOUT;
+ }
+ }
+
+ /* Now only support raw mode, with symbol start from low to high */
+ rate = DIV_ROUND_CLOSEST(priv->rate, 1000000);
+ val = IR_CFG_SYMBOL_MAXWIDTH & IR_CFG_WIDTH_MASK << IR_CFG_WIDTH_SHIFT;
+ val |= IR_CFG_SYMBOL_FMT & IR_CFG_FORMAT_MASK << IR_CFG_FORMAT_SHIFT;
+ val |= (IR_CFG_INT_THRESHOLD - 1) & IR_CFG_INT_LEVEL_MASK
+ << IR_CFG_INT_LEVEL_SHIFT;
+ val |= IR_CFG_MODE_RAW;
+ val |= (rate - 1) & IR_CFG_FREQ_MASK << IR_CFG_FREQ_SHIFT;
+ writel_relaxed(val, priv->base + IR_CONFIG);
+
+ writel_relaxed(0x00, priv->base + IR_INTM);
+ /* write arbitrary value to start */
+ writel_relaxed(0x01, priv->base + IR_START);
+ return 0;
+}
+
+static int hix5hd2_ir_open(struct rc_dev *rdev)
+{
+ struct hix5hd2_ir_priv *priv = rdev->priv;
+
+ hix5hd2_ir_enable(priv, true);
+ hix5hd2_ir_config(priv);
+ return 0;
+}
+
+static void hix5hd2_ir_close(struct rc_dev *rdev)
+{
+ struct hix5hd2_ir_priv *priv = rdev->priv;
+
+ hix5hd2_ir_enable(priv, false);
+}
+
+static struct of_device_id hix5hd2_ir_table[] = {
+ { .compatible = "hisilicon,hix5hd2-ir", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, hix5hd2_ir_table);
+
+static int hix5hd2_ir_probe(struct platform_device *pdev)
+{
+ int ret;
+ struct rc_dev *rdev;
+ struct device *dev = &pdev->dev;
+ struct resource *res;
+ struct hix5hd2_ir_priv *priv;
+ const struct of_device_id *match;
+
+ match = of_match_device(hix5hd2_ir_table, &pdev->dev);
+ if (!match)
+ return -EINVAL;
+
+ priv = devm_kzalloc(dev, sizeof(struct hix5hd2_ir_priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ priv->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
+ "hisilicon,power-syscon");
+ if (IS_ERR(priv->regmap)) {
+ dev_err(dev, "no power-reg\n");
+ return -EINVAL;
+ }
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ priv->base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(priv->base))
+ return PTR_ERR(priv->base);
+
+ priv->irq = platform_get_irq(pdev, 0);
+ if (priv->irq < 0) {
+ dev_err(dev, "irq can not get\n");
+ return priv->irq;
+ }
+
+ if (devm_request_irq(dev, priv->irq, hix5hd2_ir_rx_interrupt,
+ IRQF_NO_SUSPEND, pdev->name, priv) < 0) {
+ dev_err(dev, "IRQ %d register failed\n", priv->irq);
+ return -EINVAL;
+ }
+
+ rdev = rc_allocate_device();
+ if (!rdev)
+ return -ENOMEM;
+
+ priv->clock = devm_clk_get(dev, NULL);
+ if (IS_ERR(priv->clock)) {
+ dev_err(dev, "clock not found\n");
+ return PTR_ERR(priv->clock);
+ }
+ clk_prepare_enable(priv->clock);
+ priv->rate = clk_get_rate(priv->clock);
+
+ rdev->driver_type = RC_DRIVER_IR_RAW;
+ rdev->allowed_protocols = RC_BIT_ALL;
+ rdev->priv = priv;
+ rdev->open = hix5hd2_ir_open;
+ rdev->close = hix5hd2_ir_close;
+ rdev->driver_name = IR_HIX5HD2_NAME;
+ rdev->map_name = RC_MAP_LIRC;
+ rdev->input_name = "Hisilicon hix5hd2 Remote Control Receiver";
+
+ ret = rc_register_device(rdev);
+ if (ret < 0)
+ goto err;
+
+ priv->rdev = rdev;
+ priv->dev = dev;
+ platform_set_drvdata(pdev, priv);
+
+ /**
+ * for LIRC_MODE_MODE2 or LIRC_MODE_PULSE or LIRC_MODE_RAW
+ * lircd expects a long space first before a signal train to sync.
+ */
+ hix5hd2_ir_send_lirc_timeout(rdev);
+ return ret;
+
+err:
+ clk_disable_unprepare(priv->clock);
+ rc_free_device(rdev);
+ dev_err(dev, "Unable to register device (%d)\n", ret);
+ return ret;
+}
+
+static int hix5hd2_ir_remove(struct platform_device *pdev)
+{
+ struct hix5hd2_ir_priv *priv = platform_get_drvdata(pdev);
+
+ clk_disable_unprepare(priv->clock);
+ rc_unregister_device(priv->rdev);
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int hix5hd2_ir_suspend(struct device *dev)
+{
+ struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);
+
+ clk_disable_unprepare(priv->clock);
+ hix5hd2_ir_enable(priv, false);
+
+ return 0;
+}
+
+static int hix5hd2_ir_resume(struct device *dev)
+{
+ struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);
+
+ hix5hd2_ir_enable(priv, true);
+ clk_prepare_enable(priv->clock);
+
+ writel_relaxed(0x01, priv->base + IR_ENABLE);
+ writel_relaxed(0x00, priv->base + IR_INTM);
+ writel_relaxed(0xff, priv->base + IR_INTC);
+ writel_relaxed(0x01, priv->base + IR_START);
+
+ return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(hix5hd2_ir_pm_ops, hix5hd2_ir_suspend,
+ hix5hd2_ir_resume);
+
+static struct platform_driver hix5hd2_ir_driver = {
+ .driver = {
+ .name = IR_HIX5HD2_NAME,
+ .owner = THIS_MODULE,
+ .of_match_table = hix5hd2_ir_table,
+ .pm = &hix5hd2_ir_pm_ops,
+ },
+ .probe = hix5hd2_ir_probe,
+ .remove = hix5hd2_ir_remove,
+};
+
+module_platform_driver(hix5hd2_ir_driver);
+
+MODULE_DESCRIPTION("RC Transceiver driver for hix5hd2 platforms");
+MODULE_AUTHOR("Guoxiong Yan <yanguoxiong@huawei.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:hix5hd2-ir");
--
1.7.9.5
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
@ 2014-08-21 9:24 ` Zhangfei Gao
0 siblings, 0 replies; 29+ messages in thread
From: Zhangfei Gao @ 2014-08-21 9:24 UTC (permalink / raw)
To: linux-arm-kernel
From: Guoxiong Yan <yanguoxiong@huawei.com>
IR transmitter driver for Hisilicon hix5hd2 soc
Signed-off-by: Guoxiong Yan <yanguoxiong@huawei.com>
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
---
drivers/media/rc/Kconfig | 11 ++
drivers/media/rc/Makefile | 1 +
drivers/media/rc/ir-hix5hd2.c | 347 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 359 insertions(+)
create mode 100644 drivers/media/rc/ir-hix5hd2.c
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 5e626af..64dc8bb 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -164,6 +164,17 @@ config IR_ENE
To compile this driver as a module, choose M here: the
module will be called ene_ir.
+config IR_HIX5HD2
+ tristate "Hisilicon hix5hd2 IR remote control"
+ depends on RC_CORE
+ help
+ Say Y here if you want to use hisilicon remote control.
+ The driver passes raw pulse and space information to the LIRC decoder.
+ To compile this driver as a module, choose M here: the module will be
+ called hisi_ir.
+
+ If you're not sure, select N here
+
config IR_IMON
tristate "SoundGraph iMON Receiver and Display"
depends on USB_ARCH_HAS_HCD
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 9f9843a1..0989f94 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_IR_XMP_DECODER) += ir-xmp-decoder.o
# stand-alone IR receivers/transmitters
obj-$(CONFIG_RC_ATI_REMOTE) += ati_remote.o
+obj-$(CONFIG_IR_HIX5HD2) += ir-hix5hd2.o
obj-$(CONFIG_IR_IMON) += imon.o
obj-$(CONFIG_IR_ITE_CIR) += ite-cir.o
obj-$(CONFIG_IR_MCEUSB) += mceusb.o
diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c
new file mode 100644
index 0000000..543b454
--- /dev/null
+++ b/drivers/media/rc/ir-hix5hd2.c
@@ -0,0 +1,347 @@
+/*
+ * Copyright (c) 2014 Linaro Ltd.
+ * Copyright (c) 2014 Hisilicon Limited.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <media/rc-core.h>
+
+#define IR_ENABLE 0x00
+#define IR_CONFIG 0x04
+#define CNT_LEADS 0x08
+#define CNT_LEADE 0x0c
+#define CNT_SLEADE 0x10
+#define CNT0_B 0x14
+#define CNT1_B 0x18
+#define IR_BUSY 0x1c
+#define IR_DATAH 0x20
+#define IR_DATAL 0x24
+#define IR_INTM 0x28
+#define IR_INTS 0x2c
+#define IR_INTC 0x30
+#define IR_START 0x34
+
+/* interrupt mask */
+#define INTMS_SYMBRCV (BIT(24) | BIT(8))
+#define INTMS_TIMEOUT (BIT(25) | BIT(9))
+#define INTMS_OVERFLOW (BIT(26) | BIT(10))
+#define INT_CLR_OVERFLOW BIT(18)
+#define INT_CLR_TIMEOUT BIT(17)
+#define INT_CLR_RCV BIT(16)
+#define INT_CLR_RCVTIMEOUT (BIT(16) | BIT(17))
+
+#define IR_CLK 0x48
+#define IR_CLK_ENABLE BIT(4)
+#define IR_CLK_RESET BIT(5)
+
+#define IR_CFG_WIDTH_MASK 0xffff
+#define IR_CFG_WIDTH_SHIFT 16
+#define IR_CFG_FORMAT_MASK 0x3
+#define IR_CFG_FORMAT_SHIFT 14
+#define IR_CFG_INT_LEVEL_MASK 0x3f
+#define IR_CFG_INT_LEVEL_SHIFT 8
+/* only support raw mode */
+#define IR_CFG_MODE_RAW BIT(7)
+#define IR_CFG_FREQ_MASK 0x7f
+#define IR_CFG_FREQ_SHIFT 0
+#define IR_CFG_INT_THRESHOLD 1
+/* symbol start from low to high, symbol stream end at high*/
+#define IR_CFG_SYMBOL_FMT 0
+#define IR_CFG_SYMBOL_MAXWIDTH 0x3e80
+
+#define IR_HIX5HD2_NAME "hix5hd2-ir"
+
+struct hix5hd2_ir_priv {
+ int irq;
+ void *base;
+ struct device *dev;
+ struct rc_dev *rdev;
+ struct regmap *regmap;
+ struct clk *clock;
+ unsigned long rate;
+};
+
+static void hix5hd2_ir_send_lirc_timeout(struct rc_dev *rdev)
+{
+ DEFINE_IR_RAW_EVENT(ev);
+
+ ev.timeout = true;
+ ir_raw_event_store(rdev, &ev);
+}
+
+static irqreturn_t hix5hd2_ir_rx_interrupt(int irq, void *data)
+{
+ u32 symb_num, symb_val, symb_time;
+ u32 data_l, data_h;
+ u32 irq_sr, i;
+ struct hix5hd2_ir_priv *priv = data;
+
+ irq_sr = readl_relaxed(priv->base + IR_INTS);
+ if (irq_sr & INTMS_OVERFLOW) {
+ /*
+ * we must read IR_DATAL first, then we can clean up
+ * IR_INTS availably since logic would not clear
+ * fifo when overflow, drv do the job
+ */
+ ir_raw_event_reset(priv->rdev);
+ symb_num = readl_relaxed(priv->base + IR_DATAH);
+ for (i = 0; i < symb_num; i++)
+ readl_relaxed(priv->base + IR_DATAL);
+
+ writel_relaxed(INT_CLR_OVERFLOW, priv->base + IR_INTC);
+ dev_info(priv->dev, "overflow, level=%d\n",
+ IR_CFG_INT_THRESHOLD);
+ }
+
+ if ((irq_sr & INTMS_SYMBRCV) || (irq_sr & INTMS_TIMEOUT)) {
+ DEFINE_IR_RAW_EVENT(ev);
+
+ symb_num = readl_relaxed(priv->base + IR_DATAH);
+ for (i = 0; i < symb_num; i++) {
+ symb_val = readl_relaxed(priv->base + IR_DATAL);
+ data_l = ((symb_val & 0xffff) * 10);
+ data_h = ((symb_val >> 16) & 0xffff) * 10;
+ symb_time = (data_l + data_h) / 10;
+
+ ev.duration = US_TO_NS(data_l);
+ ev.pulse = true;
+ ir_raw_event_store(priv->rdev, &ev);
+
+ if (symb_time < IR_CFG_SYMBOL_MAXWIDTH) {
+ ev.duration = US_TO_NS(data_h);
+ ev.pulse = false;
+ ir_raw_event_store(priv->rdev, &ev);
+ } else {
+ hix5hd2_ir_send_lirc_timeout(priv->rdev);
+ }
+ }
+
+ if (irq_sr & INTMS_SYMBRCV)
+ writel_relaxed(INT_CLR_RCV, priv->base + IR_INTC);
+ if (irq_sr & INTMS_TIMEOUT)
+ writel_relaxed(INT_CLR_TIMEOUT, priv->base + IR_INTC);
+ }
+
+ /* Empty software fifo */
+ ir_raw_event_handle(priv->rdev);
+ return IRQ_HANDLED;
+}
+
+static void hix5hd2_ir_enable(struct hix5hd2_ir_priv *dev, bool on)
+{
+ u32 val;
+
+ regmap_read(dev->regmap, IR_CLK, &val);
+ if (on) {
+ val &= ~IR_CLK_RESET;
+ val |= IR_CLK_ENABLE;
+ } else {
+ val &= ~IR_CLK_ENABLE;
+ val |= IR_CLK_RESET;
+ }
+ regmap_write(dev->regmap, IR_CLK, val);
+}
+
+static int hix5hd2_ir_config(struct hix5hd2_ir_priv *priv)
+{
+ int timeout = 10000;
+ u32 val, rate;
+
+ writel_relaxed(0x01, priv->base + IR_ENABLE);
+ while (readl_relaxed(priv->base + IR_BUSY)) {
+ if (timeout--) {
+ udelay(1);
+ } else {
+ dev_err(priv->dev, "IR_BUSY timeout\n");
+ return -ETIMEDOUT;
+ }
+ }
+
+ /* Now only support raw mode, with symbol start from low to high */
+ rate = DIV_ROUND_CLOSEST(priv->rate, 1000000);
+ val = IR_CFG_SYMBOL_MAXWIDTH & IR_CFG_WIDTH_MASK << IR_CFG_WIDTH_SHIFT;
+ val |= IR_CFG_SYMBOL_FMT & IR_CFG_FORMAT_MASK << IR_CFG_FORMAT_SHIFT;
+ val |= (IR_CFG_INT_THRESHOLD - 1) & IR_CFG_INT_LEVEL_MASK
+ << IR_CFG_INT_LEVEL_SHIFT;
+ val |= IR_CFG_MODE_RAW;
+ val |= (rate - 1) & IR_CFG_FREQ_MASK << IR_CFG_FREQ_SHIFT;
+ writel_relaxed(val, priv->base + IR_CONFIG);
+
+ writel_relaxed(0x00, priv->base + IR_INTM);
+ /* write arbitrary value to start */
+ writel_relaxed(0x01, priv->base + IR_START);
+ return 0;
+}
+
+static int hix5hd2_ir_open(struct rc_dev *rdev)
+{
+ struct hix5hd2_ir_priv *priv = rdev->priv;
+
+ hix5hd2_ir_enable(priv, true);
+ hix5hd2_ir_config(priv);
+ return 0;
+}
+
+static void hix5hd2_ir_close(struct rc_dev *rdev)
+{
+ struct hix5hd2_ir_priv *priv = rdev->priv;
+
+ hix5hd2_ir_enable(priv, false);
+}
+
+static struct of_device_id hix5hd2_ir_table[] = {
+ { .compatible = "hisilicon,hix5hd2-ir", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, hix5hd2_ir_table);
+
+static int hix5hd2_ir_probe(struct platform_device *pdev)
+{
+ int ret;
+ struct rc_dev *rdev;
+ struct device *dev = &pdev->dev;
+ struct resource *res;
+ struct hix5hd2_ir_priv *priv;
+ const struct of_device_id *match;
+
+ match = of_match_device(hix5hd2_ir_table, &pdev->dev);
+ if (!match)
+ return -EINVAL;
+
+ priv = devm_kzalloc(dev, sizeof(struct hix5hd2_ir_priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ priv->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
+ "hisilicon,power-syscon");
+ if (IS_ERR(priv->regmap)) {
+ dev_err(dev, "no power-reg\n");
+ return -EINVAL;
+ }
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ priv->base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(priv->base))
+ return PTR_ERR(priv->base);
+
+ priv->irq = platform_get_irq(pdev, 0);
+ if (priv->irq < 0) {
+ dev_err(dev, "irq can not get\n");
+ return priv->irq;
+ }
+
+ if (devm_request_irq(dev, priv->irq, hix5hd2_ir_rx_interrupt,
+ IRQF_NO_SUSPEND, pdev->name, priv) < 0) {
+ dev_err(dev, "IRQ %d register failed\n", priv->irq);
+ return -EINVAL;
+ }
+
+ rdev = rc_allocate_device();
+ if (!rdev)
+ return -ENOMEM;
+
+ priv->clock = devm_clk_get(dev, NULL);
+ if (IS_ERR(priv->clock)) {
+ dev_err(dev, "clock not found\n");
+ return PTR_ERR(priv->clock);
+ }
+ clk_prepare_enable(priv->clock);
+ priv->rate = clk_get_rate(priv->clock);
+
+ rdev->driver_type = RC_DRIVER_IR_RAW;
+ rdev->allowed_protocols = RC_BIT_ALL;
+ rdev->priv = priv;
+ rdev->open = hix5hd2_ir_open;
+ rdev->close = hix5hd2_ir_close;
+ rdev->driver_name = IR_HIX5HD2_NAME;
+ rdev->map_name = RC_MAP_LIRC;
+ rdev->input_name = "Hisilicon hix5hd2 Remote Control Receiver";
+
+ ret = rc_register_device(rdev);
+ if (ret < 0)
+ goto err;
+
+ priv->rdev = rdev;
+ priv->dev = dev;
+ platform_set_drvdata(pdev, priv);
+
+ /**
+ * for LIRC_MODE_MODE2 or LIRC_MODE_PULSE or LIRC_MODE_RAW
+ * lircd expects a long space first before a signal train to sync.
+ */
+ hix5hd2_ir_send_lirc_timeout(rdev);
+ return ret;
+
+err:
+ clk_disable_unprepare(priv->clock);
+ rc_free_device(rdev);
+ dev_err(dev, "Unable to register device (%d)\n", ret);
+ return ret;
+}
+
+static int hix5hd2_ir_remove(struct platform_device *pdev)
+{
+ struct hix5hd2_ir_priv *priv = platform_get_drvdata(pdev);
+
+ clk_disable_unprepare(priv->clock);
+ rc_unregister_device(priv->rdev);
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int hix5hd2_ir_suspend(struct device *dev)
+{
+ struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);
+
+ clk_disable_unprepare(priv->clock);
+ hix5hd2_ir_enable(priv, false);
+
+ return 0;
+}
+
+static int hix5hd2_ir_resume(struct device *dev)
+{
+ struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);
+
+ hix5hd2_ir_enable(priv, true);
+ clk_prepare_enable(priv->clock);
+
+ writel_relaxed(0x01, priv->base + IR_ENABLE);
+ writel_relaxed(0x00, priv->base + IR_INTM);
+ writel_relaxed(0xff, priv->base + IR_INTC);
+ writel_relaxed(0x01, priv->base + IR_START);
+
+ return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(hix5hd2_ir_pm_ops, hix5hd2_ir_suspend,
+ hix5hd2_ir_resume);
+
+static struct platform_driver hix5hd2_ir_driver = {
+ .driver = {
+ .name = IR_HIX5HD2_NAME,
+ .owner = THIS_MODULE,
+ .of_match_table = hix5hd2_ir_table,
+ .pm = &hix5hd2_ir_pm_ops,
+ },
+ .probe = hix5hd2_ir_probe,
+ .remove = hix5hd2_ir_remove,
+};
+
+module_platform_driver(hix5hd2_ir_driver);
+
+MODULE_DESCRIPTION("RC Transceiver driver for hix5hd2 platforms");
+MODULE_AUTHOR("Guoxiong Yan <yanguoxiong@huawei.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:hix5hd2-ir");
--
1.7.9.5
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
2014-08-21 9:24 ` Zhangfei Gao
(?)
@ 2014-08-21 9:24 ` Zhangfei Gao
-1 siblings, 0 replies; 29+ messages in thread
From: Zhangfei Gao @ 2014-08-21 9:24 UTC (permalink / raw)
To: Mauro Carvalho Chehab, David Härdeman, arnd-r2nGTMty4D4,
haifeng.yan-QSEj5FYQhm4dnm+yROfE0A,
jchxue-Re5JQEeQqe8AvxtiuMwx3w
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-media-u79uwXL29TY76Z2rM5mHXA, Zhangfei Gao
With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
empty change_protocol was introduced.
As a result, rc_register_device will set dev->enabled_protocols
addording to rc_map->rc_type, which prevent using all protocols.
Signed-off-by: Zhangfei Gao <zhangfei.gao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
drivers/media/rc/rc-ir-raw.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
index e8fff2a..a118539 100644
--- a/drivers/media/rc/rc-ir-raw.c
+++ b/drivers/media/rc/rc-ir-raw.c
@@ -240,12 +240,6 @@ ir_raw_get_allowed_protocols(void)
return protocols;
}
-static int change_protocol(struct rc_dev *dev, u64 *rc_type)
-{
- /* the caller will update dev->enabled_protocols */
- return 0;
-}
-
/*
* Used to (un)register raw event clients
*/
@@ -263,7 +257,6 @@ int ir_raw_event_register(struct rc_dev *dev)
dev->raw->dev = dev;
dev->enabled_protocols = ~0;
- dev->change_protocol = change_protocol;
rc = kfifo_alloc(&dev->raw->kfifo,
sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE,
GFP_KERNEL);
--
1.7.9.5
--
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 related [flat|nested] 29+ messages in thread
* [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
@ 2014-08-21 9:24 ` Zhangfei Gao
0 siblings, 0 replies; 29+ messages in thread
From: Zhangfei Gao @ 2014-08-21 9:24 UTC (permalink / raw)
To: Mauro Carvalho Chehab, David Härdeman, arnd, haifeng.yan, jchxue
Cc: linux-arm-kernel, devicetree, linux-media, Zhangfei Gao
With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
empty change_protocol was introduced.
As a result, rc_register_device will set dev->enabled_protocols
addording to rc_map->rc_type, which prevent using all protocols.
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
---
drivers/media/rc/rc-ir-raw.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
index e8fff2a..a118539 100644
--- a/drivers/media/rc/rc-ir-raw.c
+++ b/drivers/media/rc/rc-ir-raw.c
@@ -240,12 +240,6 @@ ir_raw_get_allowed_protocols(void)
return protocols;
}
-static int change_protocol(struct rc_dev *dev, u64 *rc_type)
-{
- /* the caller will update dev->enabled_protocols */
- return 0;
-}
-
/*
* Used to (un)register raw event clients
*/
@@ -263,7 +257,6 @@ int ir_raw_event_register(struct rc_dev *dev)
dev->raw->dev = dev;
dev->enabled_protocols = ~0;
- dev->change_protocol = change_protocol;
rc = kfifo_alloc(&dev->raw->kfifo,
sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE,
GFP_KERNEL);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
@ 2014-08-21 9:24 ` Zhangfei Gao
0 siblings, 0 replies; 29+ messages in thread
From: Zhangfei Gao @ 2014-08-21 9:24 UTC (permalink / raw)
To: linux-arm-kernel
With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
empty change_protocol was introduced.
As a result, rc_register_device will set dev->enabled_protocols
addording to rc_map->rc_type, which prevent using all protocols.
Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
---
drivers/media/rc/rc-ir-raw.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
index e8fff2a..a118539 100644
--- a/drivers/media/rc/rc-ir-raw.c
+++ b/drivers/media/rc/rc-ir-raw.c
@@ -240,12 +240,6 @@ ir_raw_get_allowed_protocols(void)
return protocols;
}
-static int change_protocol(struct rc_dev *dev, u64 *rc_type)
-{
- /* the caller will update dev->enabled_protocols */
- return 0;
-}
-
/*
* Used to (un)register raw event clients
*/
@@ -263,7 +257,6 @@ int ir_raw_event_register(struct rc_dev *dev)
dev->raw->dev = dev;
dev->enabled_protocols = ~0;
- dev->change_protocol = change_protocol;
rc = kfifo_alloc(&dev->raw->kfifo,
sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE,
GFP_KERNEL);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
2014-08-21 9:24 ` Zhangfei Gao
(?)
@ 2014-08-21 10:07 ` Sean Young
-1 siblings, 0 replies; 29+ messages in thread
From: Sean Young @ 2014-08-21 10:07 UTC (permalink / raw)
To: Zhangfei Gao
Cc: devicetree, arnd, haifeng.yan, Guoxiong Yan, David Härdeman,
jchxue, linux-media, linux-arm-kernel, Mauro Carvalho Chehab
On Thu, Aug 21, 2014 at 05:24:44PM +0800, Zhangfei Gao wrote:
> From: Guoxiong Yan <yanguoxiong@huawei.com>
>
> IR transmitter driver for Hisilicon hix5hd2 soc
>
> Signed-off-by: Guoxiong Yan <yanguoxiong@huawei.com>
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> ---
> drivers/media/rc/Kconfig | 11 ++
> drivers/media/rc/Makefile | 1 +
> drivers/media/rc/ir-hix5hd2.c | 347 +++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 359 insertions(+)
> create mode 100644 drivers/media/rc/ir-hix5hd2.c
>
> diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
> index 5e626af..64dc8bb 100644
> --- a/drivers/media/rc/Kconfig
> +++ b/drivers/media/rc/Kconfig
> @@ -164,6 +164,17 @@ config IR_ENE
> To compile this driver as a module, choose M here: the
> module will be called ene_ir.
>
> +config IR_HIX5HD2
> + tristate "Hisilicon hix5hd2 IR remote control"
> + depends on RC_CORE
> + help
> + Say Y here if you want to use hisilicon remote control.
> + The driver passes raw pulse and space information to the LIRC decoder.
> + To compile this driver as a module, choose M here: the module will be
> + called hisi_ir.
> +
> + If you're not sure, select N here
> +
> config IR_IMON
> tristate "SoundGraph iMON Receiver and Display"
> depends on USB_ARCH_HAS_HCD
> diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
> index 9f9843a1..0989f94 100644
> --- a/drivers/media/rc/Makefile
> +++ b/drivers/media/rc/Makefile
> @@ -17,6 +17,7 @@ obj-$(CONFIG_IR_XMP_DECODER) += ir-xmp-decoder.o
>
> # stand-alone IR receivers/transmitters
> obj-$(CONFIG_RC_ATI_REMOTE) += ati_remote.o
> +obj-$(CONFIG_IR_HIX5HD2) += ir-hix5hd2.o
> obj-$(CONFIG_IR_IMON) += imon.o
> obj-$(CONFIG_IR_ITE_CIR) += ite-cir.o
> obj-$(CONFIG_IR_MCEUSB) += mceusb.o
> diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c
> new file mode 100644
> index 0000000..543b454
> --- /dev/null
> +++ b/drivers/media/rc/ir-hix5hd2.c
> @@ -0,0 +1,347 @@
> +/*
> + * Copyright (c) 2014 Linaro Ltd.
> + * Copyright (c) 2014 Hisilicon Limited.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/interrupt.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of_device.h>
> +#include <linux/regmap.h>
> +#include <media/rc-core.h>
> +
> +#define IR_ENABLE 0x00
> +#define IR_CONFIG 0x04
> +#define CNT_LEADS 0x08
> +#define CNT_LEADE 0x0c
> +#define CNT_SLEADE 0x10
> +#define CNT0_B 0x14
> +#define CNT1_B 0x18
> +#define IR_BUSY 0x1c
> +#define IR_DATAH 0x20
> +#define IR_DATAL 0x24
> +#define IR_INTM 0x28
> +#define IR_INTS 0x2c
> +#define IR_INTC 0x30
> +#define IR_START 0x34
> +
> +/* interrupt mask */
> +#define INTMS_SYMBRCV (BIT(24) | BIT(8))
> +#define INTMS_TIMEOUT (BIT(25) | BIT(9))
> +#define INTMS_OVERFLOW (BIT(26) | BIT(10))
> +#define INT_CLR_OVERFLOW BIT(18)
> +#define INT_CLR_TIMEOUT BIT(17)
> +#define INT_CLR_RCV BIT(16)
> +#define INT_CLR_RCVTIMEOUT (BIT(16) | BIT(17))
> +
> +#define IR_CLK 0x48
> +#define IR_CLK_ENABLE BIT(4)
> +#define IR_CLK_RESET BIT(5)
> +
> +#define IR_CFG_WIDTH_MASK 0xffff
> +#define IR_CFG_WIDTH_SHIFT 16
> +#define IR_CFG_FORMAT_MASK 0x3
> +#define IR_CFG_FORMAT_SHIFT 14
> +#define IR_CFG_INT_LEVEL_MASK 0x3f
> +#define IR_CFG_INT_LEVEL_SHIFT 8
> +/* only support raw mode */
> +#define IR_CFG_MODE_RAW BIT(7)
> +#define IR_CFG_FREQ_MASK 0x7f
> +#define IR_CFG_FREQ_SHIFT 0
> +#define IR_CFG_INT_THRESHOLD 1
> +/* symbol start from low to high, symbol stream end at high*/
> +#define IR_CFG_SYMBOL_FMT 0
> +#define IR_CFG_SYMBOL_MAXWIDTH 0x3e80
> +
> +#define IR_HIX5HD2_NAME "hix5hd2-ir"
> +
> +struct hix5hd2_ir_priv {
> + int irq;
> + void *base;
> + struct device *dev;
> + struct rc_dev *rdev;
> + struct regmap *regmap;
> + struct clk *clock;
> + unsigned long rate;
> +};
> +
> +static void hix5hd2_ir_send_lirc_timeout(struct rc_dev *rdev)
> +{
> + DEFINE_IR_RAW_EVENT(ev);
> +
> + ev.timeout = true;
> + ir_raw_event_store(rdev, &ev);
> +}
> +
> +static irqreturn_t hix5hd2_ir_rx_interrupt(int irq, void *data)
> +{
> + u32 symb_num, symb_val, symb_time;
> + u32 data_l, data_h;
> + u32 irq_sr, i;
> + struct hix5hd2_ir_priv *priv = data;
> +
> + irq_sr = readl_relaxed(priv->base + IR_INTS);
> + if (irq_sr & INTMS_OVERFLOW) {
> + /*
> + * we must read IR_DATAL first, then we can clean up
> + * IR_INTS availably since logic would not clear
> + * fifo when overflow, drv do the job
> + */
> + ir_raw_event_reset(priv->rdev);
> + symb_num = readl_relaxed(priv->base + IR_DATAH);
> + for (i = 0; i < symb_num; i++)
> + readl_relaxed(priv->base + IR_DATAL);
> +
> + writel_relaxed(INT_CLR_OVERFLOW, priv->base + IR_INTC);
> + dev_info(priv->dev, "overflow, level=%d\n",
> + IR_CFG_INT_THRESHOLD);
> + }
> +
> + if ((irq_sr & INTMS_SYMBRCV) || (irq_sr & INTMS_TIMEOUT)) {
> + DEFINE_IR_RAW_EVENT(ev);
> +
> + symb_num = readl_relaxed(priv->base + IR_DATAH);
> + for (i = 0; i < symb_num; i++) {
> + symb_val = readl_relaxed(priv->base + IR_DATAL);
> + data_l = ((symb_val & 0xffff) * 10);
> + data_h = ((symb_val >> 16) & 0xffff) * 10;
> + symb_time = (data_l + data_h) / 10;
> +
> + ev.duration = US_TO_NS(data_l);
> + ev.pulse = true;
> + ir_raw_event_store(priv->rdev, &ev);
> +
> + if (symb_time < IR_CFG_SYMBOL_MAXWIDTH) {
> + ev.duration = US_TO_NS(data_h);
> + ev.pulse = false;
> + ir_raw_event_store(priv->rdev, &ev);
> + } else {
> + hix5hd2_ir_send_lirc_timeout(priv->rdev);
> + }
> + }
> +
> + if (irq_sr & INTMS_SYMBRCV)
> + writel_relaxed(INT_CLR_RCV, priv->base + IR_INTC);
> + if (irq_sr & INTMS_TIMEOUT)
> + writel_relaxed(INT_CLR_TIMEOUT, priv->base + IR_INTC);
> + }
> +
> + /* Empty software fifo */
> + ir_raw_event_handle(priv->rdev);
> + return IRQ_HANDLED;
> +}
> +
> +static void hix5hd2_ir_enable(struct hix5hd2_ir_priv *dev, bool on)
> +{
> + u32 val;
> +
> + regmap_read(dev->regmap, IR_CLK, &val);
> + if (on) {
> + val &= ~IR_CLK_RESET;
> + val |= IR_CLK_ENABLE;
> + } else {
> + val &= ~IR_CLK_ENABLE;
> + val |= IR_CLK_RESET;
> + }
> + regmap_write(dev->regmap, IR_CLK, val);
> +}
> +
> +static int hix5hd2_ir_config(struct hix5hd2_ir_priv *priv)
> +{
> + int timeout = 10000;
> + u32 val, rate;
> +
> + writel_relaxed(0x01, priv->base + IR_ENABLE);
> + while (readl_relaxed(priv->base + IR_BUSY)) {
> + if (timeout--) {
> + udelay(1);
> + } else {
> + dev_err(priv->dev, "IR_BUSY timeout\n");
> + return -ETIMEDOUT;
> + }
> + }
> +
> + /* Now only support raw mode, with symbol start from low to high */
> + rate = DIV_ROUND_CLOSEST(priv->rate, 1000000);
> + val = IR_CFG_SYMBOL_MAXWIDTH & IR_CFG_WIDTH_MASK << IR_CFG_WIDTH_SHIFT;
> + val |= IR_CFG_SYMBOL_FMT & IR_CFG_FORMAT_MASK << IR_CFG_FORMAT_SHIFT;
> + val |= (IR_CFG_INT_THRESHOLD - 1) & IR_CFG_INT_LEVEL_MASK
> + << IR_CFG_INT_LEVEL_SHIFT;
> + val |= IR_CFG_MODE_RAW;
> + val |= (rate - 1) & IR_CFG_FREQ_MASK << IR_CFG_FREQ_SHIFT;
> + writel_relaxed(val, priv->base + IR_CONFIG);
> +
> + writel_relaxed(0x00, priv->base + IR_INTM);
> + /* write arbitrary value to start */
> + writel_relaxed(0x01, priv->base + IR_START);
> + return 0;
> +}
> +
> +static int hix5hd2_ir_open(struct rc_dev *rdev)
> +{
> + struct hix5hd2_ir_priv *priv = rdev->priv;
> +
> + hix5hd2_ir_enable(priv, true);
> + hix5hd2_ir_config(priv);
> + return 0;
> +}
> +
> +static void hix5hd2_ir_close(struct rc_dev *rdev)
> +{
> + struct hix5hd2_ir_priv *priv = rdev->priv;
> +
> + hix5hd2_ir_enable(priv, false);
> +}
> +
> +static struct of_device_id hix5hd2_ir_table[] = {
> + { .compatible = "hisilicon,hix5hd2-ir", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, hix5hd2_ir_table);
> +
> +static int hix5hd2_ir_probe(struct platform_device *pdev)
> +{
> + int ret;
> + struct rc_dev *rdev;
> + struct device *dev = &pdev->dev;
> + struct resource *res;
> + struct hix5hd2_ir_priv *priv;
> + const struct of_device_id *match;
> +
> + match = of_match_device(hix5hd2_ir_table, &pdev->dev);
> + if (!match)
> + return -EINVAL;
> +
> + priv = devm_kzalloc(dev, sizeof(struct hix5hd2_ir_priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> +
> + priv->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
> + "hisilicon,power-syscon");
> + if (IS_ERR(priv->regmap)) {
> + dev_err(dev, "no power-reg\n");
> + return -EINVAL;
> + }
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + priv->base = devm_ioremap_resource(dev, res);
> + if (IS_ERR(priv->base))
> + return PTR_ERR(priv->base);
> +
> + priv->irq = platform_get_irq(pdev, 0);
> + if (priv->irq < 0) {
> + dev_err(dev, "irq can not get\n");
> + return priv->irq;
> + }
> +
> + if (devm_request_irq(dev, priv->irq, hix5hd2_ir_rx_interrupt,
> + IRQF_NO_SUSPEND, pdev->name, priv) < 0) {
> + dev_err(dev, "IRQ %d register failed\n", priv->irq);
> + return -EINVAL;
> + }
> +
> + rdev = rc_allocate_device();
> + if (!rdev)
> + return -ENOMEM;
> +
> + priv->clock = devm_clk_get(dev, NULL);
> + if (IS_ERR(priv->clock)) {
> + dev_err(dev, "clock not found\n");
> + return PTR_ERR(priv->clock);
> + }
> + clk_prepare_enable(priv->clock);
> + priv->rate = clk_get_rate(priv->clock);
> +
> + rdev->driver_type = RC_DRIVER_IR_RAW;
> + rdev->allowed_protocols = RC_BIT_ALL;
> + rdev->priv = priv;
> + rdev->open = hix5hd2_ir_open;
> + rdev->close = hix5hd2_ir_close;
> + rdev->driver_name = IR_HIX5HD2_NAME;
> + rdev->map_name = RC_MAP_LIRC;
I'm not sure RC_MAP_LIRC is appropriate. If the hardware has no implicit
remote, can this be stored in device tree like the sunxi-cir.c driver does?
> + rdev->input_name = "Hisilicon hix5hd2 Remote Control Receiver";
It would be useful is rdev->input_phys, rdev->input_id,
rdev->timeout, rdev->rx_resolution are set correctly.
> +
> + ret = rc_register_device(rdev);
> + if (ret < 0)
> + goto err;
> +
> + priv->rdev = rdev;
> + priv->dev = dev;
> + platform_set_drvdata(pdev, priv);
> +
> + /**
> + * for LIRC_MODE_MODE2 or LIRC_MODE_PULSE or LIRC_MODE_RAW
> + * lircd expects a long space first before a signal train to sync.
> + */
> + hix5hd2_ir_send_lirc_timeout(rdev);
> + return ret;
> +
> +err:
> + clk_disable_unprepare(priv->clock);
> + rc_free_device(rdev);
> + dev_err(dev, "Unable to register device (%d)\n", ret);
> + return ret;
> +}
> +
> +static int hix5hd2_ir_remove(struct platform_device *pdev)
> +{
> + struct hix5hd2_ir_priv *priv = platform_get_drvdata(pdev);
> +
> + clk_disable_unprepare(priv->clock);
> + rc_unregister_device(priv->rdev);
> + return 0;
> +}
> +
> +#ifdef CONFIG_PM
> +static int hix5hd2_ir_suspend(struct device *dev)
> +{
> + struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);
> +
> + clk_disable_unprepare(priv->clock);
> + hix5hd2_ir_enable(priv, false);
> +
> + return 0;
> +}
> +
> +static int hix5hd2_ir_resume(struct device *dev)
> +{
> + struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);
> +
> + hix5hd2_ir_enable(priv, true);
> + clk_prepare_enable(priv->clock);
> +
> + writel_relaxed(0x01, priv->base + IR_ENABLE);
> + writel_relaxed(0x00, priv->base + IR_INTM);
> + writel_relaxed(0xff, priv->base + IR_INTC);
> + writel_relaxed(0x01, priv->base + IR_START);
> +
> + return 0;
> +}
> +#endif
> +
> +static SIMPLE_DEV_PM_OPS(hix5hd2_ir_pm_ops, hix5hd2_ir_suspend,
> + hix5hd2_ir_resume);
> +
> +static struct platform_driver hix5hd2_ir_driver = {
> + .driver = {
> + .name = IR_HIX5HD2_NAME,
> + .owner = THIS_MODULE,
> + .of_match_table = hix5hd2_ir_table,
> + .pm = &hix5hd2_ir_pm_ops,
> + },
> + .probe = hix5hd2_ir_probe,
> + .remove = hix5hd2_ir_remove,
> +};
> +
> +module_platform_driver(hix5hd2_ir_driver);
> +
> +MODULE_DESCRIPTION("RC Transceiver driver for hix5hd2 platforms");
> +MODULE_AUTHOR("Guoxiong Yan <yanguoxiong@huawei.com>");
> +MODULE_LICENSE("GPL v2");
> +MODULE_ALIAS("platform:hix5hd2-ir");
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
@ 2014-08-21 10:07 ` Sean Young
0 siblings, 0 replies; 29+ messages in thread
From: Sean Young @ 2014-08-21 10:07 UTC (permalink / raw)
To: Zhangfei Gao
Cc: Mauro Carvalho Chehab, David Härdeman, arnd, haifeng.yan,
jchxue, linux-arm-kernel, devicetree, linux-media, Guoxiong Yan
On Thu, Aug 21, 2014 at 05:24:44PM +0800, Zhangfei Gao wrote:
> From: Guoxiong Yan <yanguoxiong@huawei.com>
>
> IR transmitter driver for Hisilicon hix5hd2 soc
>
> Signed-off-by: Guoxiong Yan <yanguoxiong@huawei.com>
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> ---
> drivers/media/rc/Kconfig | 11 ++
> drivers/media/rc/Makefile | 1 +
> drivers/media/rc/ir-hix5hd2.c | 347 +++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 359 insertions(+)
> create mode 100644 drivers/media/rc/ir-hix5hd2.c
>
> diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
> index 5e626af..64dc8bb 100644
> --- a/drivers/media/rc/Kconfig
> +++ b/drivers/media/rc/Kconfig
> @@ -164,6 +164,17 @@ config IR_ENE
> To compile this driver as a module, choose M here: the
> module will be called ene_ir.
>
> +config IR_HIX5HD2
> + tristate "Hisilicon hix5hd2 IR remote control"
> + depends on RC_CORE
> + help
> + Say Y here if you want to use hisilicon remote control.
> + The driver passes raw pulse and space information to the LIRC decoder.
> + To compile this driver as a module, choose M here: the module will be
> + called hisi_ir.
> +
> + If you're not sure, select N here
> +
> config IR_IMON
> tristate "SoundGraph iMON Receiver and Display"
> depends on USB_ARCH_HAS_HCD
> diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
> index 9f9843a1..0989f94 100644
> --- a/drivers/media/rc/Makefile
> +++ b/drivers/media/rc/Makefile
> @@ -17,6 +17,7 @@ obj-$(CONFIG_IR_XMP_DECODER) += ir-xmp-decoder.o
>
> # stand-alone IR receivers/transmitters
> obj-$(CONFIG_RC_ATI_REMOTE) += ati_remote.o
> +obj-$(CONFIG_IR_HIX5HD2) += ir-hix5hd2.o
> obj-$(CONFIG_IR_IMON) += imon.o
> obj-$(CONFIG_IR_ITE_CIR) += ite-cir.o
> obj-$(CONFIG_IR_MCEUSB) += mceusb.o
> diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c
> new file mode 100644
> index 0000000..543b454
> --- /dev/null
> +++ b/drivers/media/rc/ir-hix5hd2.c
> @@ -0,0 +1,347 @@
> +/*
> + * Copyright (c) 2014 Linaro Ltd.
> + * Copyright (c) 2014 Hisilicon Limited.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/interrupt.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of_device.h>
> +#include <linux/regmap.h>
> +#include <media/rc-core.h>
> +
> +#define IR_ENABLE 0x00
> +#define IR_CONFIG 0x04
> +#define CNT_LEADS 0x08
> +#define CNT_LEADE 0x0c
> +#define CNT_SLEADE 0x10
> +#define CNT0_B 0x14
> +#define CNT1_B 0x18
> +#define IR_BUSY 0x1c
> +#define IR_DATAH 0x20
> +#define IR_DATAL 0x24
> +#define IR_INTM 0x28
> +#define IR_INTS 0x2c
> +#define IR_INTC 0x30
> +#define IR_START 0x34
> +
> +/* interrupt mask */
> +#define INTMS_SYMBRCV (BIT(24) | BIT(8))
> +#define INTMS_TIMEOUT (BIT(25) | BIT(9))
> +#define INTMS_OVERFLOW (BIT(26) | BIT(10))
> +#define INT_CLR_OVERFLOW BIT(18)
> +#define INT_CLR_TIMEOUT BIT(17)
> +#define INT_CLR_RCV BIT(16)
> +#define INT_CLR_RCVTIMEOUT (BIT(16) | BIT(17))
> +
> +#define IR_CLK 0x48
> +#define IR_CLK_ENABLE BIT(4)
> +#define IR_CLK_RESET BIT(5)
> +
> +#define IR_CFG_WIDTH_MASK 0xffff
> +#define IR_CFG_WIDTH_SHIFT 16
> +#define IR_CFG_FORMAT_MASK 0x3
> +#define IR_CFG_FORMAT_SHIFT 14
> +#define IR_CFG_INT_LEVEL_MASK 0x3f
> +#define IR_CFG_INT_LEVEL_SHIFT 8
> +/* only support raw mode */
> +#define IR_CFG_MODE_RAW BIT(7)
> +#define IR_CFG_FREQ_MASK 0x7f
> +#define IR_CFG_FREQ_SHIFT 0
> +#define IR_CFG_INT_THRESHOLD 1
> +/* symbol start from low to high, symbol stream end at high*/
> +#define IR_CFG_SYMBOL_FMT 0
> +#define IR_CFG_SYMBOL_MAXWIDTH 0x3e80
> +
> +#define IR_HIX5HD2_NAME "hix5hd2-ir"
> +
> +struct hix5hd2_ir_priv {
> + int irq;
> + void *base;
> + struct device *dev;
> + struct rc_dev *rdev;
> + struct regmap *regmap;
> + struct clk *clock;
> + unsigned long rate;
> +};
> +
> +static void hix5hd2_ir_send_lirc_timeout(struct rc_dev *rdev)
> +{
> + DEFINE_IR_RAW_EVENT(ev);
> +
> + ev.timeout = true;
> + ir_raw_event_store(rdev, &ev);
> +}
> +
> +static irqreturn_t hix5hd2_ir_rx_interrupt(int irq, void *data)
> +{
> + u32 symb_num, symb_val, symb_time;
> + u32 data_l, data_h;
> + u32 irq_sr, i;
> + struct hix5hd2_ir_priv *priv = data;
> +
> + irq_sr = readl_relaxed(priv->base + IR_INTS);
> + if (irq_sr & INTMS_OVERFLOW) {
> + /*
> + * we must read IR_DATAL first, then we can clean up
> + * IR_INTS availably since logic would not clear
> + * fifo when overflow, drv do the job
> + */
> + ir_raw_event_reset(priv->rdev);
> + symb_num = readl_relaxed(priv->base + IR_DATAH);
> + for (i = 0; i < symb_num; i++)
> + readl_relaxed(priv->base + IR_DATAL);
> +
> + writel_relaxed(INT_CLR_OVERFLOW, priv->base + IR_INTC);
> + dev_info(priv->dev, "overflow, level=%d\n",
> + IR_CFG_INT_THRESHOLD);
> + }
> +
> + if ((irq_sr & INTMS_SYMBRCV) || (irq_sr & INTMS_TIMEOUT)) {
> + DEFINE_IR_RAW_EVENT(ev);
> +
> + symb_num = readl_relaxed(priv->base + IR_DATAH);
> + for (i = 0; i < symb_num; i++) {
> + symb_val = readl_relaxed(priv->base + IR_DATAL);
> + data_l = ((symb_val & 0xffff) * 10);
> + data_h = ((symb_val >> 16) & 0xffff) * 10;
> + symb_time = (data_l + data_h) / 10;
> +
> + ev.duration = US_TO_NS(data_l);
> + ev.pulse = true;
> + ir_raw_event_store(priv->rdev, &ev);
> +
> + if (symb_time < IR_CFG_SYMBOL_MAXWIDTH) {
> + ev.duration = US_TO_NS(data_h);
> + ev.pulse = false;
> + ir_raw_event_store(priv->rdev, &ev);
> + } else {
> + hix5hd2_ir_send_lirc_timeout(priv->rdev);
> + }
> + }
> +
> + if (irq_sr & INTMS_SYMBRCV)
> + writel_relaxed(INT_CLR_RCV, priv->base + IR_INTC);
> + if (irq_sr & INTMS_TIMEOUT)
> + writel_relaxed(INT_CLR_TIMEOUT, priv->base + IR_INTC);
> + }
> +
> + /* Empty software fifo */
> + ir_raw_event_handle(priv->rdev);
> + return IRQ_HANDLED;
> +}
> +
> +static void hix5hd2_ir_enable(struct hix5hd2_ir_priv *dev, bool on)
> +{
> + u32 val;
> +
> + regmap_read(dev->regmap, IR_CLK, &val);
> + if (on) {
> + val &= ~IR_CLK_RESET;
> + val |= IR_CLK_ENABLE;
> + } else {
> + val &= ~IR_CLK_ENABLE;
> + val |= IR_CLK_RESET;
> + }
> + regmap_write(dev->regmap, IR_CLK, val);
> +}
> +
> +static int hix5hd2_ir_config(struct hix5hd2_ir_priv *priv)
> +{
> + int timeout = 10000;
> + u32 val, rate;
> +
> + writel_relaxed(0x01, priv->base + IR_ENABLE);
> + while (readl_relaxed(priv->base + IR_BUSY)) {
> + if (timeout--) {
> + udelay(1);
> + } else {
> + dev_err(priv->dev, "IR_BUSY timeout\n");
> + return -ETIMEDOUT;
> + }
> + }
> +
> + /* Now only support raw mode, with symbol start from low to high */
> + rate = DIV_ROUND_CLOSEST(priv->rate, 1000000);
> + val = IR_CFG_SYMBOL_MAXWIDTH & IR_CFG_WIDTH_MASK << IR_CFG_WIDTH_SHIFT;
> + val |= IR_CFG_SYMBOL_FMT & IR_CFG_FORMAT_MASK << IR_CFG_FORMAT_SHIFT;
> + val |= (IR_CFG_INT_THRESHOLD - 1) & IR_CFG_INT_LEVEL_MASK
> + << IR_CFG_INT_LEVEL_SHIFT;
> + val |= IR_CFG_MODE_RAW;
> + val |= (rate - 1) & IR_CFG_FREQ_MASK << IR_CFG_FREQ_SHIFT;
> + writel_relaxed(val, priv->base + IR_CONFIG);
> +
> + writel_relaxed(0x00, priv->base + IR_INTM);
> + /* write arbitrary value to start */
> + writel_relaxed(0x01, priv->base + IR_START);
> + return 0;
> +}
> +
> +static int hix5hd2_ir_open(struct rc_dev *rdev)
> +{
> + struct hix5hd2_ir_priv *priv = rdev->priv;
> +
> + hix5hd2_ir_enable(priv, true);
> + hix5hd2_ir_config(priv);
> + return 0;
> +}
> +
> +static void hix5hd2_ir_close(struct rc_dev *rdev)
> +{
> + struct hix5hd2_ir_priv *priv = rdev->priv;
> +
> + hix5hd2_ir_enable(priv, false);
> +}
> +
> +static struct of_device_id hix5hd2_ir_table[] = {
> + { .compatible = "hisilicon,hix5hd2-ir", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, hix5hd2_ir_table);
> +
> +static int hix5hd2_ir_probe(struct platform_device *pdev)
> +{
> + int ret;
> + struct rc_dev *rdev;
> + struct device *dev = &pdev->dev;
> + struct resource *res;
> + struct hix5hd2_ir_priv *priv;
> + const struct of_device_id *match;
> +
> + match = of_match_device(hix5hd2_ir_table, &pdev->dev);
> + if (!match)
> + return -EINVAL;
> +
> + priv = devm_kzalloc(dev, sizeof(struct hix5hd2_ir_priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> +
> + priv->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
> + "hisilicon,power-syscon");
> + if (IS_ERR(priv->regmap)) {
> + dev_err(dev, "no power-reg\n");
> + return -EINVAL;
> + }
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + priv->base = devm_ioremap_resource(dev, res);
> + if (IS_ERR(priv->base))
> + return PTR_ERR(priv->base);
> +
> + priv->irq = platform_get_irq(pdev, 0);
> + if (priv->irq < 0) {
> + dev_err(dev, "irq can not get\n");
> + return priv->irq;
> + }
> +
> + if (devm_request_irq(dev, priv->irq, hix5hd2_ir_rx_interrupt,
> + IRQF_NO_SUSPEND, pdev->name, priv) < 0) {
> + dev_err(dev, "IRQ %d register failed\n", priv->irq);
> + return -EINVAL;
> + }
> +
> + rdev = rc_allocate_device();
> + if (!rdev)
> + return -ENOMEM;
> +
> + priv->clock = devm_clk_get(dev, NULL);
> + if (IS_ERR(priv->clock)) {
> + dev_err(dev, "clock not found\n");
> + return PTR_ERR(priv->clock);
> + }
> + clk_prepare_enable(priv->clock);
> + priv->rate = clk_get_rate(priv->clock);
> +
> + rdev->driver_type = RC_DRIVER_IR_RAW;
> + rdev->allowed_protocols = RC_BIT_ALL;
> + rdev->priv = priv;
> + rdev->open = hix5hd2_ir_open;
> + rdev->close = hix5hd2_ir_close;
> + rdev->driver_name = IR_HIX5HD2_NAME;
> + rdev->map_name = RC_MAP_LIRC;
I'm not sure RC_MAP_LIRC is appropriate. If the hardware has no implicit
remote, can this be stored in device tree like the sunxi-cir.c driver does?
> + rdev->input_name = "Hisilicon hix5hd2 Remote Control Receiver";
It would be useful is rdev->input_phys, rdev->input_id,
rdev->timeout, rdev->rx_resolution are set correctly.
> +
> + ret = rc_register_device(rdev);
> + if (ret < 0)
> + goto err;
> +
> + priv->rdev = rdev;
> + priv->dev = dev;
> + platform_set_drvdata(pdev, priv);
> +
> + /**
> + * for LIRC_MODE_MODE2 or LIRC_MODE_PULSE or LIRC_MODE_RAW
> + * lircd expects a long space first before a signal train to sync.
> + */
> + hix5hd2_ir_send_lirc_timeout(rdev);
> + return ret;
> +
> +err:
> + clk_disable_unprepare(priv->clock);
> + rc_free_device(rdev);
> + dev_err(dev, "Unable to register device (%d)\n", ret);
> + return ret;
> +}
> +
> +static int hix5hd2_ir_remove(struct platform_device *pdev)
> +{
> + struct hix5hd2_ir_priv *priv = platform_get_drvdata(pdev);
> +
> + clk_disable_unprepare(priv->clock);
> + rc_unregister_device(priv->rdev);
> + return 0;
> +}
> +
> +#ifdef CONFIG_PM
> +static int hix5hd2_ir_suspend(struct device *dev)
> +{
> + struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);
> +
> + clk_disable_unprepare(priv->clock);
> + hix5hd2_ir_enable(priv, false);
> +
> + return 0;
> +}
> +
> +static int hix5hd2_ir_resume(struct device *dev)
> +{
> + struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);
> +
> + hix5hd2_ir_enable(priv, true);
> + clk_prepare_enable(priv->clock);
> +
> + writel_relaxed(0x01, priv->base + IR_ENABLE);
> + writel_relaxed(0x00, priv->base + IR_INTM);
> + writel_relaxed(0xff, priv->base + IR_INTC);
> + writel_relaxed(0x01, priv->base + IR_START);
> +
> + return 0;
> +}
> +#endif
> +
> +static SIMPLE_DEV_PM_OPS(hix5hd2_ir_pm_ops, hix5hd2_ir_suspend,
> + hix5hd2_ir_resume);
> +
> +static struct platform_driver hix5hd2_ir_driver = {
> + .driver = {
> + .name = IR_HIX5HD2_NAME,
> + .owner = THIS_MODULE,
> + .of_match_table = hix5hd2_ir_table,
> + .pm = &hix5hd2_ir_pm_ops,
> + },
> + .probe = hix5hd2_ir_probe,
> + .remove = hix5hd2_ir_remove,
> +};
> +
> +module_platform_driver(hix5hd2_ir_driver);
> +
> +MODULE_DESCRIPTION("RC Transceiver driver for hix5hd2 platforms");
> +MODULE_AUTHOR("Guoxiong Yan <yanguoxiong@huawei.com>");
> +MODULE_LICENSE("GPL v2");
> +MODULE_ALIAS("platform:hix5hd2-ir");
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
@ 2014-08-21 10:07 ` Sean Young
0 siblings, 0 replies; 29+ messages in thread
From: Sean Young @ 2014-08-21 10:07 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Aug 21, 2014 at 05:24:44PM +0800, Zhangfei Gao wrote:
> From: Guoxiong Yan <yanguoxiong@huawei.com>
>
> IR transmitter driver for Hisilicon hix5hd2 soc
>
> Signed-off-by: Guoxiong Yan <yanguoxiong@huawei.com>
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> ---
> drivers/media/rc/Kconfig | 11 ++
> drivers/media/rc/Makefile | 1 +
> drivers/media/rc/ir-hix5hd2.c | 347 +++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 359 insertions(+)
> create mode 100644 drivers/media/rc/ir-hix5hd2.c
>
> diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
> index 5e626af..64dc8bb 100644
> --- a/drivers/media/rc/Kconfig
> +++ b/drivers/media/rc/Kconfig
> @@ -164,6 +164,17 @@ config IR_ENE
> To compile this driver as a module, choose M here: the
> module will be called ene_ir.
>
> +config IR_HIX5HD2
> + tristate "Hisilicon hix5hd2 IR remote control"
> + depends on RC_CORE
> + help
> + Say Y here if you want to use hisilicon remote control.
> + The driver passes raw pulse and space information to the LIRC decoder.
> + To compile this driver as a module, choose M here: the module will be
> + called hisi_ir.
> +
> + If you're not sure, select N here
> +
> config IR_IMON
> tristate "SoundGraph iMON Receiver and Display"
> depends on USB_ARCH_HAS_HCD
> diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
> index 9f9843a1..0989f94 100644
> --- a/drivers/media/rc/Makefile
> +++ b/drivers/media/rc/Makefile
> @@ -17,6 +17,7 @@ obj-$(CONFIG_IR_XMP_DECODER) += ir-xmp-decoder.o
>
> # stand-alone IR receivers/transmitters
> obj-$(CONFIG_RC_ATI_REMOTE) += ati_remote.o
> +obj-$(CONFIG_IR_HIX5HD2) += ir-hix5hd2.o
> obj-$(CONFIG_IR_IMON) += imon.o
> obj-$(CONFIG_IR_ITE_CIR) += ite-cir.o
> obj-$(CONFIG_IR_MCEUSB) += mceusb.o
> diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c
> new file mode 100644
> index 0000000..543b454
> --- /dev/null
> +++ b/drivers/media/rc/ir-hix5hd2.c
> @@ -0,0 +1,347 @@
> +/*
> + * Copyright (c) 2014 Linaro Ltd.
> + * Copyright (c) 2014 Hisilicon Limited.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/interrupt.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of_device.h>
> +#include <linux/regmap.h>
> +#include <media/rc-core.h>
> +
> +#define IR_ENABLE 0x00
> +#define IR_CONFIG 0x04
> +#define CNT_LEADS 0x08
> +#define CNT_LEADE 0x0c
> +#define CNT_SLEADE 0x10
> +#define CNT0_B 0x14
> +#define CNT1_B 0x18
> +#define IR_BUSY 0x1c
> +#define IR_DATAH 0x20
> +#define IR_DATAL 0x24
> +#define IR_INTM 0x28
> +#define IR_INTS 0x2c
> +#define IR_INTC 0x30
> +#define IR_START 0x34
> +
> +/* interrupt mask */
> +#define INTMS_SYMBRCV (BIT(24) | BIT(8))
> +#define INTMS_TIMEOUT (BIT(25) | BIT(9))
> +#define INTMS_OVERFLOW (BIT(26) | BIT(10))
> +#define INT_CLR_OVERFLOW BIT(18)
> +#define INT_CLR_TIMEOUT BIT(17)
> +#define INT_CLR_RCV BIT(16)
> +#define INT_CLR_RCVTIMEOUT (BIT(16) | BIT(17))
> +
> +#define IR_CLK 0x48
> +#define IR_CLK_ENABLE BIT(4)
> +#define IR_CLK_RESET BIT(5)
> +
> +#define IR_CFG_WIDTH_MASK 0xffff
> +#define IR_CFG_WIDTH_SHIFT 16
> +#define IR_CFG_FORMAT_MASK 0x3
> +#define IR_CFG_FORMAT_SHIFT 14
> +#define IR_CFG_INT_LEVEL_MASK 0x3f
> +#define IR_CFG_INT_LEVEL_SHIFT 8
> +/* only support raw mode */
> +#define IR_CFG_MODE_RAW BIT(7)
> +#define IR_CFG_FREQ_MASK 0x7f
> +#define IR_CFG_FREQ_SHIFT 0
> +#define IR_CFG_INT_THRESHOLD 1
> +/* symbol start from low to high, symbol stream end at high*/
> +#define IR_CFG_SYMBOL_FMT 0
> +#define IR_CFG_SYMBOL_MAXWIDTH 0x3e80
> +
> +#define IR_HIX5HD2_NAME "hix5hd2-ir"
> +
> +struct hix5hd2_ir_priv {
> + int irq;
> + void *base;
> + struct device *dev;
> + struct rc_dev *rdev;
> + struct regmap *regmap;
> + struct clk *clock;
> + unsigned long rate;
> +};
> +
> +static void hix5hd2_ir_send_lirc_timeout(struct rc_dev *rdev)
> +{
> + DEFINE_IR_RAW_EVENT(ev);
> +
> + ev.timeout = true;
> + ir_raw_event_store(rdev, &ev);
> +}
> +
> +static irqreturn_t hix5hd2_ir_rx_interrupt(int irq, void *data)
> +{
> + u32 symb_num, symb_val, symb_time;
> + u32 data_l, data_h;
> + u32 irq_sr, i;
> + struct hix5hd2_ir_priv *priv = data;
> +
> + irq_sr = readl_relaxed(priv->base + IR_INTS);
> + if (irq_sr & INTMS_OVERFLOW) {
> + /*
> + * we must read IR_DATAL first, then we can clean up
> + * IR_INTS availably since logic would not clear
> + * fifo when overflow, drv do the job
> + */
> + ir_raw_event_reset(priv->rdev);
> + symb_num = readl_relaxed(priv->base + IR_DATAH);
> + for (i = 0; i < symb_num; i++)
> + readl_relaxed(priv->base + IR_DATAL);
> +
> + writel_relaxed(INT_CLR_OVERFLOW, priv->base + IR_INTC);
> + dev_info(priv->dev, "overflow, level=%d\n",
> + IR_CFG_INT_THRESHOLD);
> + }
> +
> + if ((irq_sr & INTMS_SYMBRCV) || (irq_sr & INTMS_TIMEOUT)) {
> + DEFINE_IR_RAW_EVENT(ev);
> +
> + symb_num = readl_relaxed(priv->base + IR_DATAH);
> + for (i = 0; i < symb_num; i++) {
> + symb_val = readl_relaxed(priv->base + IR_DATAL);
> + data_l = ((symb_val & 0xffff) * 10);
> + data_h = ((symb_val >> 16) & 0xffff) * 10;
> + symb_time = (data_l + data_h) / 10;
> +
> + ev.duration = US_TO_NS(data_l);
> + ev.pulse = true;
> + ir_raw_event_store(priv->rdev, &ev);
> +
> + if (symb_time < IR_CFG_SYMBOL_MAXWIDTH) {
> + ev.duration = US_TO_NS(data_h);
> + ev.pulse = false;
> + ir_raw_event_store(priv->rdev, &ev);
> + } else {
> + hix5hd2_ir_send_lirc_timeout(priv->rdev);
> + }
> + }
> +
> + if (irq_sr & INTMS_SYMBRCV)
> + writel_relaxed(INT_CLR_RCV, priv->base + IR_INTC);
> + if (irq_sr & INTMS_TIMEOUT)
> + writel_relaxed(INT_CLR_TIMEOUT, priv->base + IR_INTC);
> + }
> +
> + /* Empty software fifo */
> + ir_raw_event_handle(priv->rdev);
> + return IRQ_HANDLED;
> +}
> +
> +static void hix5hd2_ir_enable(struct hix5hd2_ir_priv *dev, bool on)
> +{
> + u32 val;
> +
> + regmap_read(dev->regmap, IR_CLK, &val);
> + if (on) {
> + val &= ~IR_CLK_RESET;
> + val |= IR_CLK_ENABLE;
> + } else {
> + val &= ~IR_CLK_ENABLE;
> + val |= IR_CLK_RESET;
> + }
> + regmap_write(dev->regmap, IR_CLK, val);
> +}
> +
> +static int hix5hd2_ir_config(struct hix5hd2_ir_priv *priv)
> +{
> + int timeout = 10000;
> + u32 val, rate;
> +
> + writel_relaxed(0x01, priv->base + IR_ENABLE);
> + while (readl_relaxed(priv->base + IR_BUSY)) {
> + if (timeout--) {
> + udelay(1);
> + } else {
> + dev_err(priv->dev, "IR_BUSY timeout\n");
> + return -ETIMEDOUT;
> + }
> + }
> +
> + /* Now only support raw mode, with symbol start from low to high */
> + rate = DIV_ROUND_CLOSEST(priv->rate, 1000000);
> + val = IR_CFG_SYMBOL_MAXWIDTH & IR_CFG_WIDTH_MASK << IR_CFG_WIDTH_SHIFT;
> + val |= IR_CFG_SYMBOL_FMT & IR_CFG_FORMAT_MASK << IR_CFG_FORMAT_SHIFT;
> + val |= (IR_CFG_INT_THRESHOLD - 1) & IR_CFG_INT_LEVEL_MASK
> + << IR_CFG_INT_LEVEL_SHIFT;
> + val |= IR_CFG_MODE_RAW;
> + val |= (rate - 1) & IR_CFG_FREQ_MASK << IR_CFG_FREQ_SHIFT;
> + writel_relaxed(val, priv->base + IR_CONFIG);
> +
> + writel_relaxed(0x00, priv->base + IR_INTM);
> + /* write arbitrary value to start */
> + writel_relaxed(0x01, priv->base + IR_START);
> + return 0;
> +}
> +
> +static int hix5hd2_ir_open(struct rc_dev *rdev)
> +{
> + struct hix5hd2_ir_priv *priv = rdev->priv;
> +
> + hix5hd2_ir_enable(priv, true);
> + hix5hd2_ir_config(priv);
> + return 0;
> +}
> +
> +static void hix5hd2_ir_close(struct rc_dev *rdev)
> +{
> + struct hix5hd2_ir_priv *priv = rdev->priv;
> +
> + hix5hd2_ir_enable(priv, false);
> +}
> +
> +static struct of_device_id hix5hd2_ir_table[] = {
> + { .compatible = "hisilicon,hix5hd2-ir", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, hix5hd2_ir_table);
> +
> +static int hix5hd2_ir_probe(struct platform_device *pdev)
> +{
> + int ret;
> + struct rc_dev *rdev;
> + struct device *dev = &pdev->dev;
> + struct resource *res;
> + struct hix5hd2_ir_priv *priv;
> + const struct of_device_id *match;
> +
> + match = of_match_device(hix5hd2_ir_table, &pdev->dev);
> + if (!match)
> + return -EINVAL;
> +
> + priv = devm_kzalloc(dev, sizeof(struct hix5hd2_ir_priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> +
> + priv->regmap = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
> + "hisilicon,power-syscon");
> + if (IS_ERR(priv->regmap)) {
> + dev_err(dev, "no power-reg\n");
> + return -EINVAL;
> + }
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + priv->base = devm_ioremap_resource(dev, res);
> + if (IS_ERR(priv->base))
> + return PTR_ERR(priv->base);
> +
> + priv->irq = platform_get_irq(pdev, 0);
> + if (priv->irq < 0) {
> + dev_err(dev, "irq can not get\n");
> + return priv->irq;
> + }
> +
> + if (devm_request_irq(dev, priv->irq, hix5hd2_ir_rx_interrupt,
> + IRQF_NO_SUSPEND, pdev->name, priv) < 0) {
> + dev_err(dev, "IRQ %d register failed\n", priv->irq);
> + return -EINVAL;
> + }
> +
> + rdev = rc_allocate_device();
> + if (!rdev)
> + return -ENOMEM;
> +
> + priv->clock = devm_clk_get(dev, NULL);
> + if (IS_ERR(priv->clock)) {
> + dev_err(dev, "clock not found\n");
> + return PTR_ERR(priv->clock);
> + }
> + clk_prepare_enable(priv->clock);
> + priv->rate = clk_get_rate(priv->clock);
> +
> + rdev->driver_type = RC_DRIVER_IR_RAW;
> + rdev->allowed_protocols = RC_BIT_ALL;
> + rdev->priv = priv;
> + rdev->open = hix5hd2_ir_open;
> + rdev->close = hix5hd2_ir_close;
> + rdev->driver_name = IR_HIX5HD2_NAME;
> + rdev->map_name = RC_MAP_LIRC;
I'm not sure RC_MAP_LIRC is appropriate. If the hardware has no implicit
remote, can this be stored in device tree like the sunxi-cir.c driver does?
> + rdev->input_name = "Hisilicon hix5hd2 Remote Control Receiver";
It would be useful is rdev->input_phys, rdev->input_id,
rdev->timeout, rdev->rx_resolution are set correctly.
> +
> + ret = rc_register_device(rdev);
> + if (ret < 0)
> + goto err;
> +
> + priv->rdev = rdev;
> + priv->dev = dev;
> + platform_set_drvdata(pdev, priv);
> +
> + /**
> + * for LIRC_MODE_MODE2 or LIRC_MODE_PULSE or LIRC_MODE_RAW
> + * lircd expects a long space first before a signal train to sync.
> + */
> + hix5hd2_ir_send_lirc_timeout(rdev);
> + return ret;
> +
> +err:
> + clk_disable_unprepare(priv->clock);
> + rc_free_device(rdev);
> + dev_err(dev, "Unable to register device (%d)\n", ret);
> + return ret;
> +}
> +
> +static int hix5hd2_ir_remove(struct platform_device *pdev)
> +{
> + struct hix5hd2_ir_priv *priv = platform_get_drvdata(pdev);
> +
> + clk_disable_unprepare(priv->clock);
> + rc_unregister_device(priv->rdev);
> + return 0;
> +}
> +
> +#ifdef CONFIG_PM
> +static int hix5hd2_ir_suspend(struct device *dev)
> +{
> + struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);
> +
> + clk_disable_unprepare(priv->clock);
> + hix5hd2_ir_enable(priv, false);
> +
> + return 0;
> +}
> +
> +static int hix5hd2_ir_resume(struct device *dev)
> +{
> + struct hix5hd2_ir_priv *priv = dev_get_drvdata(dev);
> +
> + hix5hd2_ir_enable(priv, true);
> + clk_prepare_enable(priv->clock);
> +
> + writel_relaxed(0x01, priv->base + IR_ENABLE);
> + writel_relaxed(0x00, priv->base + IR_INTM);
> + writel_relaxed(0xff, priv->base + IR_INTC);
> + writel_relaxed(0x01, priv->base + IR_START);
> +
> + return 0;
> +}
> +#endif
> +
> +static SIMPLE_DEV_PM_OPS(hix5hd2_ir_pm_ops, hix5hd2_ir_suspend,
> + hix5hd2_ir_resume);
> +
> +static struct platform_driver hix5hd2_ir_driver = {
> + .driver = {
> + .name = IR_HIX5HD2_NAME,
> + .owner = THIS_MODULE,
> + .of_match_table = hix5hd2_ir_table,
> + .pm = &hix5hd2_ir_pm_ops,
> + },
> + .probe = hix5hd2_ir_probe,
> + .remove = hix5hd2_ir_remove,
> +};
> +
> +module_platform_driver(hix5hd2_ir_driver);
> +
> +MODULE_DESCRIPTION("RC Transceiver driver for hix5hd2 platforms");
> +MODULE_AUTHOR("Guoxiong Yan <yanguoxiong@huawei.com>");
> +MODULE_LICENSE("GPL v2");
> +MODULE_ALIAS("platform:hix5hd2-ir");
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
2014-08-21 9:24 ` Zhangfei Gao
(?)
@ 2014-08-21 11:50 ` Mauro Carvalho Chehab
-1 siblings, 0 replies; 29+ messages in thread
From: Mauro Carvalho Chehab @ 2014-08-21 11:50 UTC (permalink / raw)
To: Zhangfei Gao
Cc: devicetree, arnd, haifeng.yan, David Härdeman, jchxue,
linux-arm-kernel, linux-media
Em Thu, 21 Aug 2014 17:24:45 +0800
Zhangfei Gao <zhangfei.gao@linaro.org> escreveu:
> With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
> empty change_protocol was introduced.
No. This was introduced on this changeset:
commit da6e162d6a4607362f8478c715c797d84d449f8b
Author: David Härdeman <david@hardeman.nu>
Date: Thu Apr 3 20:32:16 2014 -0300
[media] rc-core: simplify sysfs code
> As a result, rc_register_device will set dev->enabled_protocols
> addording to rc_map->rc_type, which prevent using all protocols.
I strongly suspect that this patch will break some things, as
the new code seems to expect that this is always be set.
See the code at store_protocols(): if this callback is not set,
then it won't allow to disable a protocol.
Also, this doesn't prevent using all protocols. You can still use
"ir-keytable -p all" to enable all protocols (the "all" protocol
type were introduced recently at the userspace tool).
>From the way I see, setting the protocol when a table is loaded
is not a bad thing, as:
- if RC tables are loaded, the needed protocol to decode it is
already known;
- by running just one IR decoder, the IR handling routine will
be faster and will consume less power;
- on a real case scenario, it is a way more likely that just one
decoder will ever be needed by the end user.
So, I think that this is just annoying for developers when are checking
if all decoders are working, by sending keycodes from different IR types
at the same time.
>
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> ---
> drivers/media/rc/rc-ir-raw.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
> index e8fff2a..a118539 100644
> --- a/drivers/media/rc/rc-ir-raw.c
> +++ b/drivers/media/rc/rc-ir-raw.c
> @@ -240,12 +240,6 @@ ir_raw_get_allowed_protocols(void)
> return protocols;
> }
>
> -static int change_protocol(struct rc_dev *dev, u64 *rc_type)
> -{
> - /* the caller will update dev->enabled_protocols */
> - return 0;
> -}
> -
> /*
> * Used to (un)register raw event clients
> */
> @@ -263,7 +257,6 @@ int ir_raw_event_register(struct rc_dev *dev)
>
> dev->raw->dev = dev;
> dev->enabled_protocols = ~0;
> - dev->change_protocol = change_protocol;
> rc = kfifo_alloc(&dev->raw->kfifo,
> sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE,
> GFP_KERNEL);
--
Cheers,
Mauro
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
@ 2014-08-21 11:50 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 29+ messages in thread
From: Mauro Carvalho Chehab @ 2014-08-21 11:50 UTC (permalink / raw)
To: Zhangfei Gao
Cc: David Härdeman, arnd, haifeng.yan, jchxue, linux-arm-kernel,
devicetree, linux-media
Em Thu, 21 Aug 2014 17:24:45 +0800
Zhangfei Gao <zhangfei.gao@linaro.org> escreveu:
> With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
> empty change_protocol was introduced.
No. This was introduced on this changeset:
commit da6e162d6a4607362f8478c715c797d84d449f8b
Author: David Härdeman <david@hardeman.nu>
Date: Thu Apr 3 20:32:16 2014 -0300
[media] rc-core: simplify sysfs code
> As a result, rc_register_device will set dev->enabled_protocols
> addording to rc_map->rc_type, which prevent using all protocols.
I strongly suspect that this patch will break some things, as
the new code seems to expect that this is always be set.
See the code at store_protocols(): if this callback is not set,
then it won't allow to disable a protocol.
Also, this doesn't prevent using all protocols. You can still use
"ir-keytable -p all" to enable all protocols (the "all" protocol
type were introduced recently at the userspace tool).
>From the way I see, setting the protocol when a table is loaded
is not a bad thing, as:
- if RC tables are loaded, the needed protocol to decode it is
already known;
- by running just one IR decoder, the IR handling routine will
be faster and will consume less power;
- on a real case scenario, it is a way more likely that just one
decoder will ever be needed by the end user.
So, I think that this is just annoying for developers when are checking
if all decoders are working, by sending keycodes from different IR types
at the same time.
>
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> ---
> drivers/media/rc/rc-ir-raw.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
> index e8fff2a..a118539 100644
> --- a/drivers/media/rc/rc-ir-raw.c
> +++ b/drivers/media/rc/rc-ir-raw.c
> @@ -240,12 +240,6 @@ ir_raw_get_allowed_protocols(void)
> return protocols;
> }
>
> -static int change_protocol(struct rc_dev *dev, u64 *rc_type)
> -{
> - /* the caller will update dev->enabled_protocols */
> - return 0;
> -}
> -
> /*
> * Used to (un)register raw event clients
> */
> @@ -263,7 +257,6 @@ int ir_raw_event_register(struct rc_dev *dev)
>
> dev->raw->dev = dev;
> dev->enabled_protocols = ~0;
> - dev->change_protocol = change_protocol;
> rc = kfifo_alloc(&dev->raw->kfifo,
> sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE,
> GFP_KERNEL);
--
Cheers,
Mauro
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
@ 2014-08-21 11:50 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 29+ messages in thread
From: Mauro Carvalho Chehab @ 2014-08-21 11:50 UTC (permalink / raw)
To: linux-arm-kernel
Em Thu, 21 Aug 2014 17:24:45 +0800
Zhangfei Gao <zhangfei.gao@linaro.org> escreveu:
> With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
> empty change_protocol was introduced.
No. This was introduced on this changeset:
commit da6e162d6a4607362f8478c715c797d84d449f8b
Author: David H?rdeman <david@hardeman.nu>
Date: Thu Apr 3 20:32:16 2014 -0300
[media] rc-core: simplify sysfs code
> As a result, rc_register_device will set dev->enabled_protocols
> addording to rc_map->rc_type, which prevent using all protocols.
I strongly suspect that this patch will break some things, as
the new code seems to expect that this is always be set.
See the code at store_protocols(): if this callback is not set,
then it won't allow to disable a protocol.
Also, this doesn't prevent using all protocols. You can still use
"ir-keytable -p all" to enable all protocols (the "all" protocol
type were introduced recently at the userspace tool).
>From the way I see, setting the protocol when a table is loaded
is not a bad thing, as:
- if RC tables are loaded, the needed protocol to decode it is
already known;
- by running just one IR decoder, the IR handling routine will
be faster and will consume less power;
- on a real case scenario, it is a way more likely that just one
decoder will ever be needed by the end user.
So, I think that this is just annoying for developers when are checking
if all decoders are working, by sending keycodes from different IR types
at the same time.
>
> Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
> ---
> drivers/media/rc/rc-ir-raw.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/media/rc/rc-ir-raw.c b/drivers/media/rc/rc-ir-raw.c
> index e8fff2a..a118539 100644
> --- a/drivers/media/rc/rc-ir-raw.c
> +++ b/drivers/media/rc/rc-ir-raw.c
> @@ -240,12 +240,6 @@ ir_raw_get_allowed_protocols(void)
> return protocols;
> }
>
> -static int change_protocol(struct rc_dev *dev, u64 *rc_type)
> -{
> - /* the caller will update dev->enabled_protocols */
> - return 0;
> -}
> -
> /*
> * Used to (un)register raw event clients
> */
> @@ -263,7 +257,6 @@ int ir_raw_event_register(struct rc_dev *dev)
>
> dev->raw->dev = dev;
> dev->enabled_protocols = ~0;
> - dev->change_protocol = change_protocol;
> rc = kfifo_alloc(&dev->raw->kfifo,
> sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE,
> GFP_KERNEL);
--
Cheers,
Mauro
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
2014-08-21 11:50 ` Mauro Carvalho Chehab
@ 2014-08-27 8:42 ` zhangfei
-1 siblings, 0 replies; 29+ messages in thread
From: zhangfei @ 2014-08-27 8:42 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: David Härdeman, arnd, haifeng.yan, jchxue, linux-arm-kernel,
devicetree, linux-media
On 08/21/2014 07:50 PM, Mauro Carvalho Chehab wrote:
> Em Thu, 21 Aug 2014 17:24:45 +0800
> Zhangfei Gao <zhangfei.gao@linaro.org> escreveu:
>
>> With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
>> empty change_protocol was introduced.
>
> No. This was introduced on this changeset:
>
> commit da6e162d6a4607362f8478c715c797d84d449f8b
> Author: David Härdeman <david@hardeman.nu>
> Date: Thu Apr 3 20:32:16 2014 -0300
>
> [media] rc-core: simplify sysfs code
>
>> As a result, rc_register_device will set dev->enabled_protocols
>> addording to rc_map->rc_type, which prevent using all protocols.
>
> I strongly suspect that this patch will break some things, as
> the new code seems to expect that this is always be set.
>
> See the code at store_protocols(): if this callback is not set,
> then it won't allow to disable a protocol.
>
> Also, this doesn't prevent using all protocols. You can still use
> "ir-keytable -p all" to enable all protocols (the "all" protocol
> type were introduced recently at the userspace tool).
>
> From the way I see, setting the protocol when a table is loaded
> is not a bad thing, as:
> - if RC tables are loaded, the needed protocol to decode it is
> already known;
> - by running just one IR decoder, the IR handling routine will
> be faster and will consume less power;
> - on a real case scenario, it is a way more likely that just one
> decoder will ever be needed by the end user.
>
> So, I think that this is just annoying for developers when are checking
> if all decoders are working, by sending keycodes from different IR types
> at the same time.
>
Thanks Mauro for the kind explanation.
ir-keytable seems also enalbe specific protocol
-p, --protocol=PROTOCOL
Currently we use lirc user space decoder/keymap and only need
pulse-length information from kernel.
Thanks for the info.
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
@ 2014-08-27 8:42 ` zhangfei
0 siblings, 0 replies; 29+ messages in thread
From: zhangfei @ 2014-08-27 8:42 UTC (permalink / raw)
To: linux-arm-kernel
On 08/21/2014 07:50 PM, Mauro Carvalho Chehab wrote:
> Em Thu, 21 Aug 2014 17:24:45 +0800
> Zhangfei Gao <zhangfei.gao@linaro.org> escreveu:
>
>> With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
>> empty change_protocol was introduced.
>
> No. This was introduced on this changeset:
>
> commit da6e162d6a4607362f8478c715c797d84d449f8b
> Author: David H?rdeman <david@hardeman.nu>
> Date: Thu Apr 3 20:32:16 2014 -0300
>
> [media] rc-core: simplify sysfs code
>
>> As a result, rc_register_device will set dev->enabled_protocols
>> addording to rc_map->rc_type, which prevent using all protocols.
>
> I strongly suspect that this patch will break some things, as
> the new code seems to expect that this is always be set.
>
> See the code at store_protocols(): if this callback is not set,
> then it won't allow to disable a protocol.
>
> Also, this doesn't prevent using all protocols. You can still use
> "ir-keytable -p all" to enable all protocols (the "all" protocol
> type were introduced recently at the userspace tool).
>
> From the way I see, setting the protocol when a table is loaded
> is not a bad thing, as:
> - if RC tables are loaded, the needed protocol to decode it is
> already known;
> - by running just one IR decoder, the IR handling routine will
> be faster and will consume less power;
> - on a real case scenario, it is a way more likely that just one
> decoder will ever be needed by the end user.
>
> So, I think that this is just annoying for developers when are checking
> if all decoders are working, by sending keycodes from different IR types
> at the same time.
>
Thanks Mauro for the kind explanation.
ir-keytable seems also enalbe specific protocol
-p, --protocol=PROTOCOL
Currently we use lirc user space decoder/keymap and only need
pulse-length information from kernel.
Thanks for the info.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
2014-08-21 10:07 ` Sean Young
@ 2014-08-27 8:49 ` zhangfei
-1 siblings, 0 replies; 29+ messages in thread
From: zhangfei @ 2014-08-27 8:49 UTC (permalink / raw)
To: Sean Young
Cc: Mauro Carvalho Chehab, David Härdeman, arnd, haifeng.yan,
jchxue, linux-arm-kernel, devicetree, linux-media, Guoxiong Yan
On 08/21/2014 06:07 PM, Sean Young wrote:
> On Thu, Aug 21, 2014 at 05:24:44PM +0800, Zhangfei Gao wrote:
>> From: Guoxiong Yan <yanguoxiong@huawei.com>
>> + rdev->driver_type = RC_DRIVER_IR_RAW;
>> + rdev->allowed_protocols = RC_BIT_ALL;
>> + rdev->priv = priv;
>> + rdev->open = hix5hd2_ir_open;
>> + rdev->close = hix5hd2_ir_close;
>> + rdev->driver_name = IR_HIX5HD2_NAME;
>> + rdev->map_name = RC_MAP_LIRC;
>
> I'm not sure RC_MAP_LIRC is appropriate. If the hardware has no implicit
> remote, can this be stored in device tree like the sunxi-cir.c driver does?
OK, got it.
Will set optional property "linux,rc-map-name" for the map_name.
We usually use user space lirc decoder, so this optional property may
not need to be set in dts.
>
>> + rdev->input_name = "Hisilicon hix5hd2 Remote Control Receiver";
>
> It would be useful is rdev->input_phys, rdev->input_id,
> rdev->timeout, rdev->rx_resolution are set correctly.
OK, will set rdev->timeout, rdev->rx_resolution
Not sure the usage of rdev->input_id, why is it required?
Thanks for the suggestion.
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
@ 2014-08-27 8:49 ` zhangfei
0 siblings, 0 replies; 29+ messages in thread
From: zhangfei @ 2014-08-27 8:49 UTC (permalink / raw)
To: linux-arm-kernel
On 08/21/2014 06:07 PM, Sean Young wrote:
> On Thu, Aug 21, 2014 at 05:24:44PM +0800, Zhangfei Gao wrote:
>> From: Guoxiong Yan <yanguoxiong@huawei.com>
>> + rdev->driver_type = RC_DRIVER_IR_RAW;
>> + rdev->allowed_protocols = RC_BIT_ALL;
>> + rdev->priv = priv;
>> + rdev->open = hix5hd2_ir_open;
>> + rdev->close = hix5hd2_ir_close;
>> + rdev->driver_name = IR_HIX5HD2_NAME;
>> + rdev->map_name = RC_MAP_LIRC;
>
> I'm not sure RC_MAP_LIRC is appropriate. If the hardware has no implicit
> remote, can this be stored in device tree like the sunxi-cir.c driver does?
OK? got it.
Will set optional property "linux,rc-map-name" for the map_name.
We usually use user space lirc decoder, so this optional property may
not need to be set in dts.
>
>> + rdev->input_name = "Hisilicon hix5hd2 Remote Control Receiver";
>
> It would be useful is rdev->input_phys, rdev->input_id,
> rdev->timeout, rdev->rx_resolution are set correctly.
OK, will set rdev->timeout, rdev->rx_resolution
Not sure the usage of rdev->input_id, why is it required?
Thanks for the suggestion.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
2014-08-27 8:49 ` zhangfei
@ 2014-08-27 9:51 ` Sean Young
-1 siblings, 0 replies; 29+ messages in thread
From: Sean Young @ 2014-08-27 9:51 UTC (permalink / raw)
To: zhangfei
Cc: Mauro Carvalho Chehab, David Härdeman, arnd, haifeng.yan,
jchxue, linux-arm-kernel, devicetree, linux-media, Guoxiong Yan
On Wed, Aug 27, 2014 at 04:49:59PM +0800, zhangfei wrote:
> On 08/21/2014 06:07 PM, Sean Young wrote:
> >On Thu, Aug 21, 2014 at 05:24:44PM +0800, Zhangfei Gao wrote:
> >It would be useful is rdev->input_phys, rdev->input_id,
> >rdev->timeout, rdev->rx_resolution are set correctly.
>
> OK, will set rdev->timeout, rdev->rx_resolution
> Not sure the usage of rdev->input_id, why is it required?
This is for the EVIOCGID ioctl on the input device which will be created
for the rc device. This is used for delivering input events from decoded
IR. There is be no reason to run lircd if you use this method.
Sean
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
@ 2014-08-27 9:51 ` Sean Young
0 siblings, 0 replies; 29+ messages in thread
From: Sean Young @ 2014-08-27 9:51 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 27, 2014 at 04:49:59PM +0800, zhangfei wrote:
> On 08/21/2014 06:07 PM, Sean Young wrote:
> >On Thu, Aug 21, 2014 at 05:24:44PM +0800, Zhangfei Gao wrote:
> >It would be useful is rdev->input_phys, rdev->input_id,
> >rdev->timeout, rdev->rx_resolution are set correctly.
>
> OK, will set rdev->timeout, rdev->rx_resolution
> Not sure the usage of rdev->input_id, why is it required?
This is for the EVIOCGID ioctl on the input device which will be created
for the rc device. This is used for delivering input events from decoded
IR. There is be no reason to run lircd if you use this method.
Sean
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
2014-08-27 9:51 ` Sean Young
@ 2014-08-27 10:10 ` zhangfei
-1 siblings, 0 replies; 29+ messages in thread
From: zhangfei @ 2014-08-27 10:10 UTC (permalink / raw)
To: Sean Young
Cc: Mauro Carvalho Chehab, David Härdeman, arnd, haifeng.yan,
jchxue, linux-arm-kernel, devicetree, linux-media, Guoxiong Yan
Hi, Sean
On 08/27/2014 05:51 PM, Sean Young wrote:
> On Wed, Aug 27, 2014 at 04:49:59PM +0800, zhangfei wrote:
>> On 08/21/2014 06:07 PM, Sean Young wrote:
>>> On Thu, Aug 21, 2014 at 05:24:44PM +0800, Zhangfei Gao wrote:
>>> It would be useful is rdev->input_phys, rdev->input_id,
>>> rdev->timeout, rdev->rx_resolution are set correctly.
>>
>> OK, will set rdev->timeout, rdev->rx_resolution
>> Not sure the usage of rdev->input_id, why is it required?
>
> This is for the EVIOCGID ioctl on the input device which will be created
> for the rc device. This is used for delivering input events from decoded
Find EVIOCGID in drivers/input/evdev.c
Will use same value as sunxi-cir.c & gpio-ir-recv.c, if these value has
no special requirement.
rcdev->input_id.bustype = BUS_HOST;
rcdev->input_id.vendor = 0x0001;
rcdev->input_id.product = 0x0001;
rcdev->input_id.version = 0x0100;
> IR. There is be no reason to run lircd if you use this method.
Do you mean kernel decoder is enough to cover?
We use user space lircd to cosider more flexibility, even some
non-standard protocol.
Anyway both method can be supported, depending on whether setting the
optional property "linux,rc-map-name" or not.
Thanks
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
@ 2014-08-27 10:10 ` zhangfei
0 siblings, 0 replies; 29+ messages in thread
From: zhangfei @ 2014-08-27 10:10 UTC (permalink / raw)
To: linux-arm-kernel
Hi, Sean
On 08/27/2014 05:51 PM, Sean Young wrote:
> On Wed, Aug 27, 2014 at 04:49:59PM +0800, zhangfei wrote:
>> On 08/21/2014 06:07 PM, Sean Young wrote:
>>> On Thu, Aug 21, 2014 at 05:24:44PM +0800, Zhangfei Gao wrote:
>>> It would be useful is rdev->input_phys, rdev->input_id,
>>> rdev->timeout, rdev->rx_resolution are set correctly.
>>
>> OK, will set rdev->timeout, rdev->rx_resolution
>> Not sure the usage of rdev->input_id, why is it required?
>
> This is for the EVIOCGID ioctl on the input device which will be created
> for the rc device. This is used for delivering input events from decoded
Find EVIOCGID in drivers/input/evdev.c
Will use same value as sunxi-cir.c & gpio-ir-recv.c, if these value has
no special requirement.
rcdev->input_id.bustype = BUS_HOST;
rcdev->input_id.vendor = 0x0001;
rcdev->input_id.product = 0x0001;
rcdev->input_id.version = 0x0100;
> IR. There is be no reason to run lircd if you use this method.
Do you mean kernel decoder is enough to cover?
We use user space lircd to cosider more flexibility, even some
non-standard protocol.
Anyway both method can be supported, depending on whether setting the
optional property "linux,rc-map-name" or not.
Thanks
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
2014-08-27 8:42 ` zhangfei
@ 2014-08-27 11:34 ` Mauro Carvalho Chehab
-1 siblings, 0 replies; 29+ messages in thread
From: Mauro Carvalho Chehab @ 2014-08-27 11:34 UTC (permalink / raw)
To: zhangfei
Cc: David Härdeman, arnd, haifeng.yan, jchxue, linux-arm-kernel,
devicetree, linux-media
Em Wed, 27 Aug 2014 16:42:34 +0800
zhangfei <zhangfei.gao@linaro.org> escreveu:
>
>
> On 08/21/2014 07:50 PM, Mauro Carvalho Chehab wrote:
> > Em Thu, 21 Aug 2014 17:24:45 +0800
> > Zhangfei Gao <zhangfei.gao@linaro.org> escreveu:
> >
> >> With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
> >> empty change_protocol was introduced.
> >
> > No. This was introduced on this changeset:
> >
> > commit da6e162d6a4607362f8478c715c797d84d449f8b
> > Author: David Härdeman <david@hardeman.nu>
> > Date: Thu Apr 3 20:32:16 2014 -0300
> >
> > [media] rc-core: simplify sysfs code
> >
> >> As a result, rc_register_device will set dev->enabled_protocols
> >> addording to rc_map->rc_type, which prevent using all protocols.
> >
> > I strongly suspect that this patch will break some things, as
> > the new code seems to expect that this is always be set.
> >
> > See the code at store_protocols(): if this callback is not set,
> > then it won't allow to disable a protocol.
> >
> > Also, this doesn't prevent using all protocols. You can still use
> > "ir-keytable -p all" to enable all protocols (the "all" protocol
> > type were introduced recently at the userspace tool).
> >
> > From the way I see, setting the protocol when a table is loaded
> > is not a bad thing, as:
> > - if RC tables are loaded, the needed protocol to decode it is
> > already known;
> > - by running just one IR decoder, the IR handling routine will
> > be faster and will consume less power;
> > - on a real case scenario, it is a way more likely that just one
> > decoder will ever be needed by the end user.
> >
> > So, I think that this is just annoying for developers when are checking
> > if all decoders are working, by sending keycodes from different IR types
> > at the same time.
> >
>
> Thanks Mauro for the kind explanation.
>
> ir-keytable seems also enalbe specific protocol
> -p, --protocol=PROTOCOL
>
> Currently we use lirc user space decoder/keymap and only need
> pulse-length information from kernel.
Well, you can use ir-keytable to disable everything but lirc, not
compile the other hardware decoders or directly write "lirc" to
/sys/class/rc/rc0/protocols (see Documentation/ABI/testing/sysfs-class-rc).
Anyway, I suggest you to use the hardware decoder instead of lirc,
as the in-kernel decoders should be lighter than lirc and works pretty
well, but this is, of course, your decision.
Btw, it would make sense, IMHO, to have a way to setup LIRC daemon to
enable LIRC output on a given remote controller, and, optionally,
disabling the hardware decoders that are needlessly enabled.
Regards,
Mauro
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
@ 2014-08-27 11:34 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 29+ messages in thread
From: Mauro Carvalho Chehab @ 2014-08-27 11:34 UTC (permalink / raw)
To: linux-arm-kernel
Em Wed, 27 Aug 2014 16:42:34 +0800
zhangfei <zhangfei.gao@linaro.org> escreveu:
>
>
> On 08/21/2014 07:50 PM, Mauro Carvalho Chehab wrote:
> > Em Thu, 21 Aug 2014 17:24:45 +0800
> > Zhangfei Gao <zhangfei.gao@linaro.org> escreveu:
> >
> >> With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
> >> empty change_protocol was introduced.
> >
> > No. This was introduced on this changeset:
> >
> > commit da6e162d6a4607362f8478c715c797d84d449f8b
> > Author: David H?rdeman <david@hardeman.nu>
> > Date: Thu Apr 3 20:32:16 2014 -0300
> >
> > [media] rc-core: simplify sysfs code
> >
> >> As a result, rc_register_device will set dev->enabled_protocols
> >> addording to rc_map->rc_type, which prevent using all protocols.
> >
> > I strongly suspect that this patch will break some things, as
> > the new code seems to expect that this is always be set.
> >
> > See the code at store_protocols(): if this callback is not set,
> > then it won't allow to disable a protocol.
> >
> > Also, this doesn't prevent using all protocols. You can still use
> > "ir-keytable -p all" to enable all protocols (the "all" protocol
> > type were introduced recently at the userspace tool).
> >
> > From the way I see, setting the protocol when a table is loaded
> > is not a bad thing, as:
> > - if RC tables are loaded, the needed protocol to decode it is
> > already known;
> > - by running just one IR decoder, the IR handling routine will
> > be faster and will consume less power;
> > - on a real case scenario, it is a way more likely that just one
> > decoder will ever be needed by the end user.
> >
> > So, I think that this is just annoying for developers when are checking
> > if all decoders are working, by sending keycodes from different IR types
> > at the same time.
> >
>
> Thanks Mauro for the kind explanation.
>
> ir-keytable seems also enalbe specific protocol
> -p, --protocol=PROTOCOL
>
> Currently we use lirc user space decoder/keymap and only need
> pulse-length information from kernel.
Well, you can use ir-keytable to disable everything but lirc, not
compile the other hardware decoders or directly write "lirc" to
/sys/class/rc/rc0/protocols (see Documentation/ABI/testing/sysfs-class-rc).
Anyway, I suggest you to use the hardware decoder instead of lirc,
as the in-kernel decoders should be lighter than lirc and works pretty
well, but this is, of course, your decision.
Btw, it would make sense, IMHO, to have a way to setup LIRC daemon to
enable LIRC output on a given remote controller, and, optionally,
disabling the hardware decoders that are needlessly enabled.
Regards,
Mauro
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
2014-08-27 10:10 ` zhangfei
@ 2014-08-27 13:15 ` Sean Young
-1 siblings, 0 replies; 29+ messages in thread
From: Sean Young @ 2014-08-27 13:15 UTC (permalink / raw)
To: zhangfei
Cc: Mauro Carvalho Chehab, David Härdeman, arnd, haifeng.yan,
jchxue, linux-arm-kernel, devicetree, linux-media, Guoxiong Yan
On Wed, Aug 27, 2014 at 06:10:28PM +0800, zhangfei wrote:
> On 08/27/2014 05:51 PM, Sean Young wrote:
> >On Wed, Aug 27, 2014 at 04:49:59PM +0800, zhangfei wrote:
> >>On 08/21/2014 06:07 PM, Sean Young wrote:
> >IR. There is be no reason to run lircd if you use this method.
> Do you mean kernel decoder is enough to cover?
> We use user space lircd to cosider more flexibility, even some
> non-standard protocol.
Just out of interest, what flexibility does lircd offer which the kernel
decoders do not?
> Anyway both method can be supported, depending on whether setting
> the optional property "linux,rc-map-name" or not.
Great, thanks.
Sean
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver
@ 2014-08-27 13:15 ` Sean Young
0 siblings, 0 replies; 29+ messages in thread
From: Sean Young @ 2014-08-27 13:15 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Aug 27, 2014 at 06:10:28PM +0800, zhangfei wrote:
> On 08/27/2014 05:51 PM, Sean Young wrote:
> >On Wed, Aug 27, 2014 at 04:49:59PM +0800, zhangfei wrote:
> >>On 08/21/2014 06:07 PM, Sean Young wrote:
> >IR. There is be no reason to run lircd if you use this method.
> Do you mean kernel decoder is enough to cover?
> We use user space lircd to cosider more flexibility, even some
> non-standard protocol.
Just out of interest, what flexibility does lircd offer which the kernel
decoders do not?
> Anyway both method can be supported, depending on whether setting
> the optional property "linux,rc-map-name" or not.
Great, thanks.
Sean
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
2014-08-27 11:34 ` Mauro Carvalho Chehab
@ 2014-08-28 9:18 ` zhangfei
-1 siblings, 0 replies; 29+ messages in thread
From: zhangfei @ 2014-08-28 9:18 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: David Härdeman, arnd, haifeng.yan, jchxue, linux-arm-kernel,
devicetree, linux-media
On 08/27/2014 07:34 PM, Mauro Carvalho Chehab wrote:
>>>> With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
>>>> empty change_protocol was introduced.
>>>
>>> No. This was introduced on this changeset:
>>>
>>> commit da6e162d6a4607362f8478c715c797d84d449f8b
>>> Author: David Härdeman <david@hardeman.nu>
>>> Date: Thu Apr 3 20:32:16 2014 -0300
>>>
>>> [media] rc-core: simplify sysfs code
>>>
>>>> As a result, rc_register_device will set dev->enabled_protocols
>>>> addording to rc_map->rc_type, which prevent using all protocols.
>>>
>>> I strongly suspect that this patch will break some things, as
>>> the new code seems to expect that this is always be set.
>>>
>>> See the code at store_protocols(): if this callback is not set,
>>> then it won't allow to disable a protocol.
>>>
>>> Also, this doesn't prevent using all protocols. You can still use
>>> "ir-keytable -p all" to enable all protocols (the "all" protocol
>>> type were introduced recently at the userspace tool).
>>>
>>> From the way I see, setting the protocol when a table is loaded
>>> is not a bad thing, as:
>>> - if RC tables are loaded, the needed protocol to decode it is
>>> already known;
>>> - by running just one IR decoder, the IR handling routine will
>>> be faster and will consume less power;
>>> - on a real case scenario, it is a way more likely that just one
>>> decoder will ever be needed by the end user.
>>>
>>> So, I think that this is just annoying for developers when are checking
>>> if all decoders are working, by sending keycodes from different IR types
>>> at the same time.
>>>
>>
>> Thanks Mauro for the kind explanation.
>>
>> ir-keytable seems also enalbe specific protocol
>> -p, --protocol=PROTOCOL
>>
>> Currently we use lirc user space decoder/keymap and only need
>> pulse-length information from kernel.
>
> Well, you can use ir-keytable to disable everything but lirc, not
> compile the other hardware decoders or directly write "lirc" to
> /sys/class/rc/rc0/protocols (see Documentation/ABI/testing/sysfs-class-rc).
>
> Anyway, I suggest you to use the hardware decoder instead of lirc,
> as the in-kernel decoders should be lighter than lirc and works pretty
> well, but this is, of course, your decision.
>
> Btw, it would make sense, IMHO, to have a way to setup LIRC daemon to
> enable LIRC output on a given remote controller, and, optionally,
> disabling the hardware decoders that are needlessly enabled.
>
Thanks Mauro
Double checked, both ir-keytable and /sys/class/rc/rc0/protocols can
enable/disable protocols, which is much easier than dts passing
information, and by default all protocols are disabled.
Thanks for this kind information.
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c
@ 2014-08-28 9:18 ` zhangfei
0 siblings, 0 replies; 29+ messages in thread
From: zhangfei @ 2014-08-28 9:18 UTC (permalink / raw)
To: linux-arm-kernel
On 08/27/2014 07:34 PM, Mauro Carvalho Chehab wrote:
>>>> With commit 4924a311a62f ("[media] rc-core: rename ir-raw.c"),
>>>> empty change_protocol was introduced.
>>>
>>> No. This was introduced on this changeset:
>>>
>>> commit da6e162d6a4607362f8478c715c797d84d449f8b
>>> Author: David H?rdeman <david@hardeman.nu>
>>> Date: Thu Apr 3 20:32:16 2014 -0300
>>>
>>> [media] rc-core: simplify sysfs code
>>>
>>>> As a result, rc_register_device will set dev->enabled_protocols
>>>> addording to rc_map->rc_type, which prevent using all protocols.
>>>
>>> I strongly suspect that this patch will break some things, as
>>> the new code seems to expect that this is always be set.
>>>
>>> See the code at store_protocols(): if this callback is not set,
>>> then it won't allow to disable a protocol.
>>>
>>> Also, this doesn't prevent using all protocols. You can still use
>>> "ir-keytable -p all" to enable all protocols (the "all" protocol
>>> type were introduced recently at the userspace tool).
>>>
>>> From the way I see, setting the protocol when a table is loaded
>>> is not a bad thing, as:
>>> - if RC tables are loaded, the needed protocol to decode it is
>>> already known;
>>> - by running just one IR decoder, the IR handling routine will
>>> be faster and will consume less power;
>>> - on a real case scenario, it is a way more likely that just one
>>> decoder will ever be needed by the end user.
>>>
>>> So, I think that this is just annoying for developers when are checking
>>> if all decoders are working, by sending keycodes from different IR types
>>> at the same time.
>>>
>>
>> Thanks Mauro for the kind explanation.
>>
>> ir-keytable seems also enalbe specific protocol
>> -p, --protocol=PROTOCOL
>>
>> Currently we use lirc user space decoder/keymap and only need
>> pulse-length information from kernel.
>
> Well, you can use ir-keytable to disable everything but lirc, not
> compile the other hardware decoders or directly write "lirc" to
> /sys/class/rc/rc0/protocols (see Documentation/ABI/testing/sysfs-class-rc).
>
> Anyway, I suggest you to use the hardware decoder instead of lirc,
> as the in-kernel decoders should be lighter than lirc and works pretty
> well, but this is, of course, your decision.
>
> Btw, it would make sense, IMHO, to have a way to setup LIRC daemon to
> enable LIRC output on a given remote controller, and, optionally,
> disabling the hardware decoders that are needlessly enabled.
>
Thanks Mauro
Double checked, both ir-keytable and /sys/class/rc/rc0/protocols can
enable/disable protocols, which is much easier than dts passing
information, and by default all protocols are disabled.
Thanks for this kind information.
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2014-08-28 9:18 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-21 9:24 [PATCH v2 0/3] Introduce hix5hd2 IR transmitter driver Zhangfei Gao
2014-08-21 9:24 ` Zhangfei Gao
2014-08-21 9:24 ` [PATCH v2 1/3] rc: Add DT bindings for hix5hd2 Zhangfei Gao
2014-08-21 9:24 ` Zhangfei Gao
2014-08-21 9:24 ` [PATCH v2 2/3] rc: Introduce hix5hd2 IR transmitter driver Zhangfei Gao
2014-08-21 9:24 ` Zhangfei Gao
2014-08-21 10:07 ` Sean Young
2014-08-21 10:07 ` Sean Young
2014-08-21 10:07 ` Sean Young
2014-08-27 8:49 ` zhangfei
2014-08-27 8:49 ` zhangfei
2014-08-27 9:51 ` Sean Young
2014-08-27 9:51 ` Sean Young
2014-08-27 10:10 ` zhangfei
2014-08-27 10:10 ` zhangfei
2014-08-27 13:15 ` Sean Young
2014-08-27 13:15 ` Sean Young
[not found] ` <1408613086-12538-1-git-send-email-zhangfei.gao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-08-21 9:24 ` [PATCH v2 3/3] [media] rc: remove change_protocol in rc-ir-raw.c Zhangfei Gao
2014-08-21 9:24 ` Zhangfei Gao
2014-08-21 9:24 ` Zhangfei Gao
2014-08-21 11:50 ` Mauro Carvalho Chehab
2014-08-21 11:50 ` Mauro Carvalho Chehab
2014-08-21 11:50 ` Mauro Carvalho Chehab
2014-08-27 8:42 ` zhangfei
2014-08-27 8:42 ` zhangfei
2014-08-27 11:34 ` Mauro Carvalho Chehab
2014-08-27 11:34 ` Mauro Carvalho Chehab
2014-08-28 9:18 ` zhangfei
2014-08-28 9:18 ` zhangfei
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.