Re: [PATCH 1/2] media: rc: remove tango ir driver
Hi Arnd,
On Thu, Jan 21, 2021 at 01:57:28PM +, Måns Rullgård wrote:
> Arnd Bergmann writes:
>
> > From: Arnd Bergmann
> >
> > The tango platform is getting removed, so the driver is no
> > longer needed.
> >
> > Cc: Marc Gonzalez
> > Cc: Mans Rullgard
> > Signed-off-by: Arnd Bergmann
> > ---
> > 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.
Please can we have a patch which also removes all of:
Documentation/devicetree/bindings/media/tango-ir.txt
drivers/media/rc/keymaps/rc-tango.c
Any references to RC_MAP_TANGO and rc-tango.
Thanks
Sean
>
> Otherwise:
>
> Acked-by: Mans Rullgard
>
>
> > 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..
> > --- 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
> > - */
> > -
> > -#include
> > -#include
> > -#include
> > -#include
> > -#include
> > -#include
> > -#include
> > -#include
> > -
> > -#define DRIVER_NAME "tango-ir"
> > -
> > -#define IR_NEC_CTRL0x00
> > -#define IR_NEC_DATA0x04
> > -#define IR_CTRL0x08
> > -#define IR_RC5_CLK_DIV 0x0c
> > -#define IR_RC5_DATA0x10
> > -#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_CARRIER36000
> > -#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 &
Re: [PATCH 1/2] media: rc: remove tango ir driver
Arnd Bergmann writes:
> From: Arnd Bergmann
>
> The tango platform is getting removed, so the driver is no
> longer needed.
>
> Cc: Marc Gonzalez
> Cc: Mans Rullgard
> Signed-off-by: Arnd Bergmann
> ---
> 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
> 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..
> --- 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
> - */
> -
> -#include
> -#include
> -#include
> -#include
> -#include
> -#include
> -#include
> -#include
> -
> -#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_BASE560
> -#define RC5_TIME_BASE1778
> -
> -#define RC6_CTRL 0x00
> -#define RC6_CLKDIV 0x04
> -#define RC6_DATA00x08
> -#define RC6_DATA10x0c
> -#define RC6_DATA20x10
> -#define RC6_DATA30x14
> -#define RC6_DATA40x18
> -
> -#define RC6_CARRIER 36000
> -#define RC6_TIME_BASE16
> -
> -#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
[PATCH 1/2] media: rc: remove tango ir driver
From: Arnd Bergmann
The tango platform is getting removed, so the driver is no
longer needed.
Cc: Marc Gonzalez
Cc: Mans Rullgard
Signed-off-by: Arnd Bergmann
---
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
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..
--- 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
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#define DRIVER_NAME "tango-ir"
-
-#define IR_NEC_CTRL0x00
-#define IR_NEC_DATA0x04
-#define IR_CTRL0x08
-#define IR_RC5_CLK_DIV 0x0c
-#define IR_RC5_DATA0x10
-#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_CARRIER36000
-#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
