From: Martin Blumenstingl <martin.blumenstingl@googlemail.com> To: linux-amlogic@lists.infradead.org, linux-media@vger.kernel.org Cc: robh+dt@kernel.org, mark.rutland@arm.com, carlo@caione.org, khilman@baylibre.com, mchehab@kernel.org, devicetree@vger.kernel.org, narmstrong@baylibre.com, Martin Blumenstingl <martin.blumenstingl@googlemail.com> Subject: [PATCH v3 2/4] media: rc: meson-ir: Add support for newer versions of the IR decoder Date: Tue, 28 Jun 2016 21:18:00 +0200 [thread overview] Message-ID: <20160628191802.21227-3-martin.blumenstingl@googlemail.com> (raw) In-Reply-To: <20160628191802.21227-1-martin.blumenstingl@googlemail.com> From: Neil Armstrong <narmstrong@baylibre.com> Newer SoCs (Meson 8b and GXBB) are using REG2 (offset 0x20) instead of REG1 to configure the decoder mode. This makes it necessary to introduce new bindings so the driver knows which register has to be used. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/media/rc/meson-ir.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c index fcc3b82..003fff0 100644 --- a/drivers/media/rc/meson-ir.c +++ b/drivers/media/rc/meson-ir.c @@ -24,6 +24,7 @@ #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 @@ -32,12 +33,21 @@ #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 REG0_RATE_MASK (BIT(11) - 1) -#define REG1_MODE_MASK (BIT(7) | BIT(8)) -#define REG1_MODE_NEC (0 << 7) -#define REG1_MODE_GENERAL (2 << 7) +#define DECODE_MODE_NEC 0x0 +#define DECODE_MODE_RAW 0x2 + +/* Meson 6b uses REG1 to configure the mode */ +#define REG1_MODE_MASK GENMASK(8, 7) +#define REG1_MODE_SHIFT 7 + +/* Meson 8b / GXBB use REG2 to configure the mode */ +#define REG2_MODE_MASK GENMASK(3, 0) +#define REG2_MODE_SHIFT 0 #define REG1_TIME_IV_SHIFT 16 #define REG1_TIME_IV_MASK ((BIT(13) - 1) << REG1_TIME_IV_SHIFT) @@ -158,8 +168,15 @@ static int meson_ir_probe(struct platform_device *pdev) /* Reset the decoder */ meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, REG1_RESET); meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, 0); - /* Set general operation mode */ - meson_ir_set_mask(ir, IR_DEC_REG1, REG1_MODE_MASK, REG1_MODE_GENERAL); + + /* Set general operation mode (= raw/software decoding) */ + if (of_device_is_compatible(node, "amlogic,meson6-ir")) + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_MODE_MASK, + DECODE_MODE_RAW << REG1_MODE_SHIFT); + else + meson_ir_set_mask(ir, IR_DEC_REG2, REG2_MODE_MASK, + DECODE_MODE_RAW << REG2_MODE_SHIFT); + /* Set rate */ meson_ir_set_mask(ir, IR_DEC_REG0, REG0_RATE_MASK, MESON_TRATE - 1); /* IRQ on rising and falling edges */ @@ -197,6 +214,8 @@ static int meson_ir_remove(struct platform_device *pdev) static const struct of_device_id meson_ir_match[] = { { .compatible = "amlogic,meson6-ir" }, + { .compatible = "amlogic,meson8b-ir" }, + { .compatible = "amlogic,meson-gxbb-ir" }, { }, }; -- 2.9.0
WARNING: multiple messages have this Message-ID (diff)
From: martin.blumenstingl@googlemail.com (Martin Blumenstingl) To: linus-amlogic@lists.infradead.org Subject: [PATCH v3 2/4] media: rc: meson-ir: Add support for newer versions of the IR decoder Date: Tue, 28 Jun 2016 21:18:00 +0200 [thread overview] Message-ID: <20160628191802.21227-3-martin.blumenstingl@googlemail.com> (raw) In-Reply-To: <20160628191802.21227-1-martin.blumenstingl@googlemail.com> From: Neil Armstrong <narmstrong@baylibre.com> Newer SoCs (Meson 8b and GXBB) are using REG2 (offset 0x20) instead of REG1 to configure the decoder mode. This makes it necessary to introduce new bindings so the driver knows which register has to be used. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/media/rc/meson-ir.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c index fcc3b82..003fff0 100644 --- a/drivers/media/rc/meson-ir.c +++ b/drivers/media/rc/meson-ir.c @@ -24,6 +24,7 @@ #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 @@ -32,12 +33,21 @@ #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 REG0_RATE_MASK (BIT(11) - 1) -#define REG1_MODE_MASK (BIT(7) | BIT(8)) -#define REG1_MODE_NEC (0 << 7) -#define REG1_MODE_GENERAL (2 << 7) +#define DECODE_MODE_NEC 0x0 +#define DECODE_MODE_RAW 0x2 + +/* Meson 6b uses REG1 to configure the mode */ +#define REG1_MODE_MASK GENMASK(8, 7) +#define REG1_MODE_SHIFT 7 + +/* Meson 8b / GXBB use REG2 to configure the mode */ +#define REG2_MODE_MASK GENMASK(3, 0) +#define REG2_MODE_SHIFT 0 #define REG1_TIME_IV_SHIFT 16 #define REG1_TIME_IV_MASK ((BIT(13) - 1) << REG1_TIME_IV_SHIFT) @@ -158,8 +168,15 @@ static int meson_ir_probe(struct platform_device *pdev) /* Reset the decoder */ meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, REG1_RESET); meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, 0); - /* Set general operation mode */ - meson_ir_set_mask(ir, IR_DEC_REG1, REG1_MODE_MASK, REG1_MODE_GENERAL); + + /* Set general operation mode (= raw/software decoding) */ + if (of_device_is_compatible(node, "amlogic,meson6-ir")) + meson_ir_set_mask(ir, IR_DEC_REG1, REG1_MODE_MASK, + DECODE_MODE_RAW << REG1_MODE_SHIFT); + else + meson_ir_set_mask(ir, IR_DEC_REG2, REG2_MODE_MASK, + DECODE_MODE_RAW << REG2_MODE_SHIFT); + /* Set rate */ meson_ir_set_mask(ir, IR_DEC_REG0, REG0_RATE_MASK, MESON_TRATE - 1); /* IRQ on rising and falling edges */ @@ -197,6 +214,8 @@ static int meson_ir_remove(struct platform_device *pdev) static const struct of_device_id meson_ir_match[] = { { .compatible = "amlogic,meson6-ir" }, + { .compatible = "amlogic,meson8b-ir" }, + { .compatible = "amlogic,meson-gxbb-ir" }, { }, }; -- 2.9.0
next prev parent reply other threads:[~2016-06-28 19:18 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-26 21:06 [v2] media: rc: fix Meson IR decoder Martin Blumenstingl 2016-06-26 21:06 ` Martin Blumenstingl 2016-06-26 21:06 ` Martin Blumenstingl 2016-06-26 21:06 ` [PATCH v2 1/2] media: rc: meson-ir: fix enabling raw/soft-decoding mode Martin Blumenstingl 2016-06-26 21:06 ` Martin Blumenstingl 2016-06-26 21:06 ` Martin Blumenstingl 2016-06-26 21:06 ` [PATCH v2 2/2] ARM: dts: meson: fixed size of the meson-ir registers Martin Blumenstingl 2016-06-26 21:06 ` Martin Blumenstingl 2016-06-26 21:06 ` Martin Blumenstingl 2016-06-27 8:43 ` Carlo Caione 2016-06-27 8:43 ` Carlo Caione 2016-06-27 8:43 ` Carlo Caione 2016-06-27 6:27 ` [v2] media: rc: fix Meson IR decoder Neil Armstrong 2016-06-27 10:53 ` Martin Blumenstingl 2016-06-27 6:28 ` Neil Armstrong 2016-06-27 6:28 ` Neil Armstrong [not found] ` <20160626210622.5257-1-martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> 2016-06-27 12:57 ` Neil Armstrong 2016-06-27 12:57 ` Neil Armstrong 2016-06-27 12:57 ` Neil Armstrong 2016-06-27 12:57 ` Neil Armstrong 2016-06-28 19:17 ` [PATCH v3 0/4] Add Meson 8b / GXBB support to the IR driver Martin Blumenstingl 2016-06-28 19:17 ` Martin Blumenstingl 2016-06-28 19:17 ` [PATCH v3 1/4] dt-bindings: media: meson-ir: Add Meson8b and GXBB compatible strings Martin Blumenstingl 2016-06-28 19:17 ` Martin Blumenstingl 2016-07-01 1:34 ` Rob Herring 2016-07-01 1:34 ` Rob Herring 2016-06-28 19:18 ` Martin Blumenstingl [this message] 2016-06-28 19:18 ` [PATCH v3 2/4] media: rc: meson-ir: Add support for newer versions of the IR decoder Martin Blumenstingl 2016-06-28 19:18 ` [PATCH v3 3/4] ARM64: meson-gxbb: Add Infrared Remote Controller decoder Martin Blumenstingl 2016-06-28 19:18 ` Martin Blumenstingl 2016-06-28 19:18 ` [PATCH v3 4/4] ARM64: dts: meson-gxbb: Enable the the IR decoder on supported boards Martin Blumenstingl 2016-06-28 19:18 ` Martin Blumenstingl 2016-08-08 5:54 ` [PATCH v3 0/4] Add Meson 8b / GXBB support to the IR driver Kevin Hilman 2016-08-08 5:54 ` Kevin Hilman 2016-08-19 21:55 ` [PATCH v4 0/6] " Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` [PATCH v4 1/6] pinctrl: amlogic: gxbb: add the IR remote pin Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 22:23 ` Kevin Hilman 2016-08-19 22:23 ` Kevin Hilman 2016-08-19 22:23 ` Kevin Hilman [not found] ` <20160819215547.20063-1-martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> 2016-08-19 21:55 ` [PATCH v4 2/6] ARM64: dts: amlogic: add the pin for the IR remote Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` [PATCH v4 3/6] dt-bindings: media: meson-ir: Add Meson8b and GXBB compatible strings Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` [PATCH v4 6/6] ARM64: dts: meson-gxbb: Enable the the IR decoder on supported boards Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` [PATCH v4 4/6] media: rc: meson-ir: Add support for newer versions of the IR decoder Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 22:28 ` Kevin Hilman 2016-08-19 22:28 ` Kevin Hilman 2016-08-19 22:28 ` Kevin Hilman 2016-08-19 22:28 ` Kevin Hilman 2016-08-25 12:41 ` Mauro Carvalho Chehab 2016-08-25 12:41 ` Mauro Carvalho Chehab 2016-08-25 12:41 ` Mauro Carvalho Chehab 2016-08-19 21:55 ` [PATCH v4 5/6] ARM64: dts: meson-gxbb: Add Infrared Remote Controller decoder Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-19 21:55 ` Martin Blumenstingl 2016-08-20 9:54 ` [PATCH v5 0/6] Add Meson 8b / GXBB support to the IR driver Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` [PATCH v5 1/6] pinctrl: amlogic: gxbb: add the IR remote input pin Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl [not found] ` <20160820095424.636-2-martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> 2016-08-22 13:51 ` Linus Walleij 2016-08-22 13:51 ` Linus Walleij 2016-08-22 13:51 ` Linus Walleij 2016-08-22 13:51 ` Linus Walleij 2016-08-20 9:54 ` [PATCH v5 3/6] dt-bindings: media: meson-ir: Add Meson8b and GXBB compatible strings Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` [PATCH v5 4/6] media: rc: meson-ir: Add support for newer versions of the IR decoder Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` [PATCH v5 5/6] ARM64: dts: meson-gxbb: Add Infrared Remote Controller decoder Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl [not found] ` <20160820095424.636-1-martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> 2016-08-20 9:54 ` [PATCH v5 2/6] ARM64: dts: amlogic: add the input pin for the IR remote Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl [not found] ` <20160820095424.636-3-martin.blumenstingl-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org> 2016-08-22 13:52 ` Linus Walleij 2016-08-22 13:52 ` Linus Walleij 2016-08-22 13:52 ` Linus Walleij 2016-08-22 13:52 ` Linus Walleij 2016-08-20 9:54 ` [PATCH v5 6/6] ARM64: dts: meson-gxbb: Enable the the IR decoder on supported boards Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-20 9:54 ` Martin Blumenstingl 2016-08-29 19:28 ` [PATCH v5 0/6] Add Meson 8b / GXBB support to the IR driver Kevin Hilman 2016-08-29 19:28 ` Kevin Hilman 2016-08-29 19:28 ` Kevin Hilman 2016-08-29 19:28 ` Kevin Hilman 2016-08-20 9:53 ` Martin Blumenstingl 2016-08-20 9:53 ` Martin Blumenstingl 2016-08-20 9:53 ` Martin Blumenstingl 2016-08-20 9:53 ` Martin Blumenstingl
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160628191802.21227-3-martin.blumenstingl@googlemail.com \ --to=martin.blumenstingl@googlemail.com \ --cc=carlo@caione.org \ --cc=devicetree@vger.kernel.org \ --cc=khilman@baylibre.com \ --cc=linux-amlogic@lists.infradead.org \ --cc=linux-media@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mchehab@kernel.org \ --cc=narmstrong@baylibre.com \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.