| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <yw1xczxyz92v.fsf@mansr.com>
Date: Thu, 21 Jan 2021 13:57:28 +0000
From: Måns Rullgård <mans@...sr.com>
To: Arnd Bergmann <arnd@...nel.org>
Cc: linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
linux-media@...r.kernel.org, Sean Young <sean@...s.org>,
Arnd Bergmann <arnd@...db.de>,
Marc Gonzalez <marc.w.gonzalez@...e.fr>
Subject: Re: [PATCH 1/2] media: rc: remove tango ir driver
Arnd Bergmann <arnd@...nel.org> writes:
> From: Arnd Bergmann <arnd@...db.de>
>
> The tango platform is getting removed, so the driver is no
> longer needed.
>
> Cc: Marc Gonzalez <marc.w.gonzalez@...e.fr>
> Cc: Mans Rullgard <mans@...sr.com>
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
> ---
> drivers/media/rc/Kconfig | 10 --
> drivers/media/rc/Makefile | 1 -
> drivers/media/rc/tango-ir.c | 267 ------------------------------------
> 3 files changed, 278 deletions(-)
> delete mode 100644 drivers/media/rc/tango-ir.c
The DT binding can go too.
Otherwise:
Acked-by: Mans Rullgard <mans@...sr.com>
> diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
> index 2c0ee2e5b446..39bc75cc1848 100644
> --- a/drivers/media/rc/Kconfig
> +++ b/drivers/media/rc/Kconfig
> @@ -497,16 +497,6 @@ config IR_SIR
> To compile this driver as a module, choose M here: the module will
> be called sir-ir.
>
> -config IR_TANGO
> - tristate "Sigma Designs SMP86xx IR decoder"
> - depends on RC_CORE
> - depends on ARCH_TANGO || COMPILE_TEST
> - help
> - Adds support for the HW IR decoder embedded on Sigma Designs
> - Tango-based systems (SMP86xx, SMP87xx).
> - The HW decoder supports NEC, RC-5, RC-6 IR protocols.
> - When compiled as a module, look for tango-ir.
> -
> config RC_XBOX_DVD
> tristate "Xbox DVD Movie Playback Kit"
> depends on RC_CORE
> diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
> index 5bb2932ab119..f46a72071a7b 100644
> --- a/drivers/media/rc/Makefile
> +++ b/drivers/media/rc/Makefile
> @@ -48,6 +48,5 @@ obj-$(CONFIG_IR_SERIAL) += serial_ir.o
> obj-$(CONFIG_IR_SIR) += sir_ir.o
> obj-$(CONFIG_IR_MTK) += mtk-cir.o
> obj-$(CONFIG_IR_ZX) += zx-irdec.o
> -obj-$(CONFIG_IR_TANGO) += tango-ir.o
> obj-$(CONFIG_RC_XBOX_DVD) += xbox_remote.o
> obj-$(CONFIG_IR_TOY) += ir_toy.o
> diff --git a/drivers/media/rc/tango-ir.c b/drivers/media/rc/tango-ir.c
> deleted file mode 100644
> index b8eb5bc4d9be..000000000000
> --- a/drivers/media/rc/tango-ir.c
> +++ /dev/null
> @@ -1,267 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-or-later
> -/*
> - * Copyright (C) 2015 Mans Rullgard <mans@...sr.com>
> - */
> -
> -#include <linux/input.h>
> -#include <linux/module.h>
> -#include <linux/platform_device.h>
> -#include <linux/interrupt.h>
> -#include <linux/io.h>
> -#include <linux/clk.h>
> -#include <linux/of.h>
> -#include <media/rc-core.h>
> -
> -#define DRIVER_NAME "tango-ir"
> -
> -#define IR_NEC_CTRL 0x00
> -#define IR_NEC_DATA 0x04
> -#define IR_CTRL 0x08
> -#define IR_RC5_CLK_DIV 0x0c
> -#define IR_RC5_DATA 0x10
> -#define IR_INT 0x14
> -
> -#define NEC_TIME_BASE 560
> -#define RC5_TIME_BASE 1778
> -
> -#define RC6_CTRL 0x00
> -#define RC6_CLKDIV 0x04
> -#define RC6_DATA0 0x08
> -#define RC6_DATA1 0x0c
> -#define RC6_DATA2 0x10
> -#define RC6_DATA3 0x14
> -#define RC6_DATA4 0x18
> -
> -#define RC6_CARRIER 36000
> -#define RC6_TIME_BASE 16
> -
> -#define NEC_CAP(n) ((n) << 24)
> -#define GPIO_SEL(n) ((n) << 16)
> -#define DISABLE_NEC (BIT(4) | BIT(8))
> -#define ENABLE_RC5 (BIT(0) | BIT(9))
> -#define ENABLE_RC6 (BIT(0) | BIT(7))
> -#define ACK_IR_INT (BIT(0) | BIT(1))
> -#define ACK_RC6_INT (BIT(31))
> -
> -#define NEC_ANY (RC_PROTO_BIT_NEC | RC_PROTO_BIT_NECX | RC_PROTO_BIT_NEC32)
> -
> -struct tango_ir {
> - void __iomem *rc5_base;
> - void __iomem *rc6_base;
> - struct rc_dev *rc;
> - struct clk *clk;
> -};
> -
> -static void tango_ir_handle_nec(struct tango_ir *ir)
> -{
> - u32 v, code;
> - enum rc_proto proto;
> -
> - v = readl_relaxed(ir->rc5_base + IR_NEC_DATA);
> - if (!v) {
> - rc_repeat(ir->rc);
> - return;
> - }
> -
> - code = ir_nec_bytes_to_scancode(v, v >> 8, v >> 16, v >> 24, &proto);
> - rc_keydown(ir->rc, proto, code, 0);
> -}
> -
> -static void tango_ir_handle_rc5(struct tango_ir *ir)
> -{
> - u32 data, field, toggle, addr, cmd, code;
> -
> - data = readl_relaxed(ir->rc5_base + IR_RC5_DATA);
> - if (data & BIT(31))
> - return;
> -
> - field = data >> 12 & 1;
> - toggle = data >> 11 & 1;
> - addr = data >> 6 & 0x1f;
> - cmd = (data & 0x3f) | (field ^ 1) << 6;
> -
> - code = RC_SCANCODE_RC5(addr, cmd);
> - rc_keydown(ir->rc, RC_PROTO_RC5, code, toggle);
> -}
> -
> -static void tango_ir_handle_rc6(struct tango_ir *ir)
> -{
> - u32 data0, data1, toggle, mode, addr, cmd, code;
> -
> - data0 = readl_relaxed(ir->rc6_base + RC6_DATA0);
> - data1 = readl_relaxed(ir->rc6_base + RC6_DATA1);
> -
> - mode = data0 >> 1 & 7;
> - if (mode != 0)
> - return;
> -
> - toggle = data0 & 1;
> - addr = data0 >> 16;
> - cmd = data1;
> -
> - code = RC_SCANCODE_RC6_0(addr, cmd);
> - rc_keydown(ir->rc, RC_PROTO_RC6_0, code, toggle);
> -}
> -
> -static irqreturn_t tango_ir_irq(int irq, void *dev_id)
> -{
> - struct tango_ir *ir = dev_id;
> - unsigned int rc5_stat;
> - unsigned int rc6_stat;
> -
> - rc5_stat = readl_relaxed(ir->rc5_base + IR_INT);
> - writel_relaxed(rc5_stat, ir->rc5_base + IR_INT);
> -
> - rc6_stat = readl_relaxed(ir->rc6_base + RC6_CTRL);
> - writel_relaxed(rc6_stat, ir->rc6_base + RC6_CTRL);
> -
> - if (!(rc5_stat & 3) && !(rc6_stat & BIT(31)))
> - return IRQ_NONE;
> -
> - if (rc5_stat & BIT(0))
> - tango_ir_handle_rc5(ir);
> -
> - if (rc5_stat & BIT(1))
> - tango_ir_handle_nec(ir);
> -
> - if (rc6_stat & BIT(31))
> - tango_ir_handle_rc6(ir);
> -
> - return IRQ_HANDLED;
> -}
> -
> -static int tango_change_protocol(struct rc_dev *dev, u64 *rc_type)
> -{
> - struct tango_ir *ir = dev->priv;
> - u32 rc5_ctrl = DISABLE_NEC;
> - u32 rc6_ctrl = 0;
> -
> - if (*rc_type & NEC_ANY)
> - rc5_ctrl = 0;
> -
> - if (*rc_type & RC_PROTO_BIT_RC5)
> - rc5_ctrl |= ENABLE_RC5;
> -
> - if (*rc_type & RC_PROTO_BIT_RC6_0)
> - rc6_ctrl = ENABLE_RC6;
> -
> - writel_relaxed(rc5_ctrl, ir->rc5_base + IR_CTRL);
> - writel_relaxed(rc6_ctrl, ir->rc6_base + RC6_CTRL);
> -
> - return 0;
> -}
> -
> -static int tango_ir_probe(struct platform_device *pdev)
> -{
> - const char *map_name = RC_MAP_TANGO;
> - struct device *dev = &pdev->dev;
> - struct rc_dev *rc;
> - struct tango_ir *ir;
> - u64 clkrate, clkdiv;
> - int irq, err;
> - u32 val;
> -
> - irq = platform_get_irq(pdev, 0);
> - if (irq <= 0)
> - return -EINVAL;
> -
> - ir = devm_kzalloc(dev, sizeof(*ir), GFP_KERNEL);
> - if (!ir)
> - return -ENOMEM;
> -
> - ir->rc5_base = devm_platform_ioremap_resource(pdev, 0);
> - if (IS_ERR(ir->rc5_base))
> - return PTR_ERR(ir->rc5_base);
> -
> - ir->rc6_base = devm_platform_ioremap_resource(pdev, 1);
> - if (IS_ERR(ir->rc6_base))
> - return PTR_ERR(ir->rc6_base);
> -
> - ir->clk = devm_clk_get(dev, NULL);
> - if (IS_ERR(ir->clk))
> - return PTR_ERR(ir->clk);
> -
> - rc = devm_rc_allocate_device(dev, RC_DRIVER_SCANCODE);
> - if (!rc)
> - return -ENOMEM;
> -
> - of_property_read_string(dev->of_node, "linux,rc-map-name", &map_name);
> -
> - rc->device_name = DRIVER_NAME;
> - rc->driver_name = DRIVER_NAME;
> - rc->input_phys = DRIVER_NAME "/input0";
> - rc->map_name = map_name;
> - rc->allowed_protocols = NEC_ANY | RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC6_0;
> - rc->change_protocol = tango_change_protocol;
> - rc->priv = ir;
> - ir->rc = rc;
> -
> - err = clk_prepare_enable(ir->clk);
> - if (err)
> - return err;
> -
> - clkrate = clk_get_rate(ir->clk);
> -
> - clkdiv = clkrate * NEC_TIME_BASE;
> - do_div(clkdiv, 1000000);
> -
> - val = NEC_CAP(31) | GPIO_SEL(12) | clkdiv;
> - writel_relaxed(val, ir->rc5_base + IR_NEC_CTRL);
> -
> - clkdiv = clkrate * RC5_TIME_BASE;
> - do_div(clkdiv, 1000000);
> -
> - writel_relaxed(DISABLE_NEC, ir->rc5_base + IR_CTRL);
> - writel_relaxed(clkdiv, ir->rc5_base + IR_RC5_CLK_DIV);
> - writel_relaxed(ACK_IR_INT, ir->rc5_base + IR_INT);
> -
> - clkdiv = clkrate * RC6_TIME_BASE;
> - do_div(clkdiv, RC6_CARRIER);
> -
> - writel_relaxed(ACK_RC6_INT, ir->rc6_base + RC6_CTRL);
> - writel_relaxed((clkdiv >> 2) << 18 | clkdiv, ir->rc6_base + RC6_CLKDIV);
> -
> - err = devm_request_irq(dev, irq, tango_ir_irq, IRQF_SHARED,
> - dev_name(dev), ir);
> - if (err)
> - goto err_clk;
> -
> - err = devm_rc_register_device(dev, rc);
> - if (err)
> - goto err_clk;
> -
> - platform_set_drvdata(pdev, ir);
> - return 0;
> -
> -err_clk:
> - clk_disable_unprepare(ir->clk);
> - return err;
> -}
> -
> -static int tango_ir_remove(struct platform_device *pdev)
> -{
> - struct tango_ir *ir = platform_get_drvdata(pdev);
> -
> - clk_disable_unprepare(ir->clk);
> - return 0;
> -}
> -
> -static const struct of_device_id tango_ir_dt_ids[] = {
> - { .compatible = "sigma,smp8642-ir" },
> - { }
> -};
> -MODULE_DEVICE_TABLE(of, tango_ir_dt_ids);
> -
> -static struct platform_driver tango_ir_driver = {
> - .probe = tango_ir_probe,
> - .remove = tango_ir_remove,
> - .driver = {
> - .name = DRIVER_NAME,
> - .of_match_table = tango_ir_dt_ids,
> - },
> -};
> -module_platform_driver(tango_ir_driver);
> -
> -MODULE_DESCRIPTION("SMP86xx IR decoder driver");
> -MODULE_AUTHOR("Mans Rullgard <mans@...sr.com>");
> -MODULE_LICENSE("GPL");
> --
>
> 2.29.2
>
--
Måns Rullgård
Powered by blists - more mailing lists