diff mbox series

[v2,1/3] media: rc: meson-ir: sort Meson IR Controller register macros

Message ID 20230517115635.31565-2-zelong.dong@amlogic.com (mailing list archive)
State New, archived
Headers show
Series media: rc: meson-ir: support MMIO regmaps to access registers | expand

Commit Message

zelong dong May 17, 2023, 11:56 a.m. UTC 
From: Zelong Dong <zelong.dong@amlogic.com>

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>
---
 drivers/media/rc/meson-ir.c | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

Comments

Neil Armstrong May 30, 2023, 7:56 a.m. UTC | #1 
On 17/05/2023 13:56, zelong dong wrote:
> From: Zelong Dong <zelong.dong@amlogic.com>
> 
> 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>
> ---
>   drivers/media/rc/meson-ir.c | 35 +++++++++++++++++------------------
>   1 file changed, 17 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c
> index 4b769111f78e..a32d034b33aa 100644
> --- a/drivers/media/rc/meson-ir.c
> +++ b/drivers/media/rc/meson-ir.c
> @@ -19,44 +19,43 @@
>   
>   #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
> +

You add those blank lines here, but remove them on next patch.

>   #define IR_DEC_BIT_0		0x0c
> -#define IR_DEC_REG0		0x10
> -#define IR_DEC_FRAME		0x14
> -#define IR_DEC_STATUS		0x18
> -#define IR_DEC_REG1		0x1c
> -/* only available on Meson 8b and newer */
> -#define IR_DEC_REG2		0x20
>   
> +#define IR_DEC_REG0		0x10
>   #define REG0_RATE_MASK		GENMASK(11, 0)
>   
> -#define DECODE_MODE_NEC		0x0
> -#define DECODE_MODE_RAW		0x2
> +#define IR_DEC_FRAME		0x14
> +
> +#define IR_DEC_STATUS		0x18
> +#define STATUS_IR_DEC_IN	BIT(8)
>   
> -/* Meson 6b uses REG1 to configure the mode */
> +#define IR_DEC_REG1		0x1c
> +#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
> +#define REG1_IRQSEL_MASK	GENMASK(3, 2)
> +#define REG1_RESET		BIT(0)
>   
> -/* Meson 8b / GXBB use REG2 to configure the mode */
> +/* 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 {

Without the blank lines:

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff mbox series

Patch

diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c
index 4b769111f78e..a32d034b33aa 100644
--- a/drivers/media/rc/meson-ir.c
+++ b/drivers/media/rc/meson-ir.c
@@ -19,44 +19,43 @@ 
 
 #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 IR_DEC_FRAME		0x14
-#define IR_DEC_STATUS		0x18
-#define IR_DEC_REG1		0x1c
-/* only available on Meson 8b and newer */
-#define IR_DEC_REG2		0x20
 
+#define IR_DEC_REG0		0x10
 #define REG0_RATE_MASK		GENMASK(11, 0)
 
-#define DECODE_MODE_NEC		0x0
-#define DECODE_MODE_RAW		0x2
+#define IR_DEC_FRAME		0x14
+
+#define IR_DEC_STATUS		0x18
+#define STATUS_IR_DEC_IN	BIT(8)
 
-/* Meson 6b uses REG1 to configure the mode */
+#define IR_DEC_REG1		0x1c
+#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
+#define REG1_IRQSEL_MASK	GENMASK(3, 2)
+#define REG1_RESET		BIT(0)
 
-/* Meson 8b / GXBB use REG2 to configure the mode */
+/* 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 {