diff options
| author | Zelong Dong <zelong.dong@amlogic.com> | 2023-06-01 14:54:31 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2023-07-14 10:17:44 +0300 |
| commit | 8091020c7811c2146a4f99dc71ad73a404d185ca (patch) | |
| tree | 6a1e57555b898bdce7c593a7b35f8d883796da34 /drivers/media/rc | |
| parent | 0cb1d9c845110ce638a43a1417c7df5968d1daa3 (diff) | |
| download | linux-8091020c7811c2146a4f99dc71ad73a404d185ca.tar.xz | |
media: rc: meson-ir: sort Meson IR Controller register macros
There are more registers to come in the next Meson IR Controller.
For defining clearly, sort register macros and let address and bit
macros as a set.
Signed-off-by: Zelong Dong <zelong.dong@amlogic.com>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/rc')
| -rw-r--r-- | drivers/media/rc/meson-ir.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c index 49aa309d1a8c..6d77a8c33dc1 100644 --- a/drivers/media/rc/meson-ir.c +++ b/drivers/media/rc/meson-ir.c @@ -19,44 +19,35 @@ #define DRIVER_NAME "meson-ir" -/* valid on all Meson platforms */ #define IR_DEC_LDR_ACTIVE 0x00 #define IR_DEC_LDR_IDLE 0x04 #define IR_DEC_LDR_REPEAT 0x08 #define IR_DEC_BIT_0 0x0c #define IR_DEC_REG0 0x10 +#define REG0_RATE_MASK GENMASK(11, 0) #define IR_DEC_FRAME 0x14 #define IR_DEC_STATUS 0x18 +#define STATUS_IR_DEC_IN BIT(8) #define IR_DEC_REG1 0x1c -/* only available on Meson 8b and newer */ -#define IR_DEC_REG2 0x20 - -#define REG0_RATE_MASK GENMASK(11, 0) - -#define DECODE_MODE_NEC 0x0 -#define DECODE_MODE_RAW 0x2 - -/* Meson 6b uses REG1 to configure the mode */ +#define REG1_TIME_IV_MASK GENMASK(28, 16) +#define REG1_ENABLE BIT(15) #define REG1_MODE_MASK GENMASK(8, 7) #define REG1_MODE_SHIFT 7 - -/* Meson 8b / GXBB use REG2 to configure the mode */ +#define REG1_IRQSEL_MASK GENMASK(3, 2) +#define REG1_RESET BIT(0) +/* The following regs are only available on Meson 8b and newer */ +#define IR_DEC_REG2 0x20 #define REG2_MODE_MASK GENMASK(3, 0) #define REG2_MODE_SHIFT 0 -#define REG1_TIME_IV_MASK GENMASK(28, 16) +#define DECODE_MODE_NEC 0x0 +#define DECODE_MODE_RAW 0x2 -#define REG1_IRQSEL_MASK GENMASK(3, 2) #define REG1_IRQSEL_NEC_MODE 0 #define REG1_IRQSEL_RISE_FALL 1 #define REG1_IRQSEL_FALL 2 #define REG1_IRQSEL_RISE 3 -#define REG1_RESET BIT(0) -#define REG1_ENABLE BIT(15) - -#define STATUS_IR_DEC_IN BIT(8) - #define MESON_TRATE 10 /* us */ struct meson_ir { |