From: "Clément Péron" <peron.clem@gmail.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>
Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
"Clément Péron" <peron.clem@gmail.com>
Subject: [PATCH v3 02/12] media: rc: Introduce sunxi_ir_quirks
Date: Tue, 28 May 2019 18:14:30 +0200 [thread overview]
Message-ID: <20190528161440.27172-3-peron.clem@gmail.com> (raw)
In-Reply-To: <20190528161440.27172-1-peron.clem@gmail.com>
This driver is used in various Allwinner SoC with different configuration.
Introduce a quirks struct to know the fifo size and if a reset is required.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
drivers/media/rc/sunxi-cir.c | 61 +++++++++++++++++++++++++++---------
1 file changed, 47 insertions(+), 14 deletions(-)
diff --git a/drivers/media/rc/sunxi-cir.c b/drivers/media/rc/sunxi-cir.c
index 307e44714ea0..d02dcb6fd0a5 100644
--- a/drivers/media/rc/sunxi-cir.c
+++ b/drivers/media/rc/sunxi-cir.c
@@ -81,6 +81,17 @@
/* Time after which device stops sending data in ms */
#define SUNXI_IR_TIMEOUT 120
+/**
+ * struct sunxi_ir_quirks - Differences between SoC variants.
+ *
+ * @has_reset: SoC needs reset deasserted.
+ * @fifo_size: size of the fifo.
+ */
+struct sunxi_ir_quirks {
+ bool has_reset;
+ int fifo_size;
+};
+
struct sunxi_ir {
spinlock_t ir_lock;
struct rc_dev *rc;
@@ -143,6 +154,7 @@ static int sunxi_ir_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct device_node *dn = dev->of_node;
+ const struct sunxi_ir_quirks *quirks;
struct resource *res;
struct sunxi_ir *ir;
u32 b_clk_freq = SUNXI_IR_BASE_CLK;
@@ -151,12 +163,15 @@ static int sunxi_ir_probe(struct platform_device *pdev)
if (!ir)
return -ENOMEM;
+ quirks = of_device_get_match_data(&pdev->dev);
+ if (quirks == NULL) {
+ dev_err(&pdev->dev, "Failed to determine the quirks to use\n");
+ return -ENODEV;
+ }
+
spin_lock_init(&ir->ir_lock);
- if (of_device_is_compatible(dn, "allwinner,sun5i-a13-ir"))
- ir->fifo_size = 64;
- else
- ir->fifo_size = 16;
+ ir->fifo_size = quirks->fifo_size;
/* Clock */
ir->apb_clk = devm_clk_get(dev, "apb");
@@ -173,13 +188,15 @@ static int sunxi_ir_probe(struct platform_device *pdev)
/* Base clock frequency (optional) */
of_property_read_u32(dn, "clock-frequency", &b_clk_freq);
- /* Reset (optional) */
- ir->rst = devm_reset_control_get_optional_exclusive(dev, NULL);
- if (IS_ERR(ir->rst))
- return PTR_ERR(ir->rst);
- ret = reset_control_deassert(ir->rst);
- if (ret)
- return ret;
+ /* Reset */
+ if (quirks->has_reset) {
+ ir->rst = devm_reset_control_get_exclusive(dev, NULL);
+ if (IS_ERR(ir->rst))
+ return PTR_ERR(ir->rst);
+ ret = reset_control_deassert(ir->rst);
+ if (ret)
+ return ret;
+ }
ret = clk_set_rate(ir->clk, b_clk_freq);
if (ret) {
@@ -316,10 +333,26 @@ static int sunxi_ir_remove(struct platform_device *pdev)
return 0;
}
+static const struct sunxi_ir_quirks sun4i_a10_ir_quirks = {
+ .has_reset = false,
+ .fifo_size = 16,
+};
+
+static const struct sunxi_ir_quirks sun5i_a13_ir_quirks = {
+ .has_reset = false,
+ .fifo_size = 64,
+};
+
static const struct of_device_id sunxi_ir_match[] = {
- { .compatible = "allwinner,sun4i-a10-ir", },
- { .compatible = "allwinner,sun5i-a13-ir", },
- {},
+ {
+ .compatible = "allwinner,sun4i-a10-ir",
+ .data = &sun4i_a10_ir_quirks,
+ },
+ {
+ .compatible = "allwinner,sun5i-a13-ir",
+ .data = &sun5i_a13_ir_quirks,
+ },
+ {}
};
MODULE_DEVICE_TABLE(of, sunxi_ir_match);
--
2.20.1
next prev parent reply other threads:[~2019-05-28 16:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-28 16:14 [PATCH v3 00/12] Allwinner A64/H6 IR support Clément Péron
2019-05-28 16:14 ` [PATCH v3 01/12] dt-bindings: media: sunxi-ir: add A31 compatible Clément Péron
2019-06-14 20:18 ` Rob Herring
2019-05-28 16:14 ` Clément Péron [this message]
2019-05-28 16:14 ` [PATCH v3 03/12] media: rc: sunxi: Add " Clément Péron
2019-06-04 14:54 ` Ondřej Jirman
2019-06-04 15:07 ` Clément Péron
2019-05-28 16:14 ` [PATCH v3 04/12] ARM: dts: sunxi: Prefer A31 bindings for IR Clément Péron
2019-05-28 16:14 ` [PATCH v3 05/12] " Clément Péron
2019-05-28 16:14 ` [PATCH v3 06/12] dt-bindings: media: sunxi-ir: Add A64 compatible Clément Péron
2019-05-28 16:14 ` [PATCH v3 07/12] arm64: dts: allwinner: a64: Add IR node Clément Péron
2019-05-28 16:14 ` [PATCH v3 08/12] arm64: dts: allwinner: a64: Enable IR on Orange Pi Win Clément Péron
2019-05-28 16:14 ` [PATCH v3 09/12] dt-bindings: media: sunxi-ir: Add H6 compatible Clément Péron
2019-05-28 16:14 ` [PATCH v3 10/12] arm64: dts: allwinner: h6: Add IR receiver node Clément Péron
2019-05-30 14:55 ` Ondřej Jirman
2019-05-30 22:25 ` Clément Péron
2019-05-31 12:46 ` [linux-sunxi] " Ondřej Jirman
2019-06-03 19:58 ` Clément Péron
2019-06-04 12:33 ` Ondřej Jirman
2019-06-04 14:47 ` Ondřej Jirman
2019-06-04 15:04 ` Clément Péron
2019-06-04 15:30 ` Ondřej Jirman
2019-06-04 16:12 ` Clément Péron
2019-05-28 16:14 ` [PATCH v3 11/12] arm64: dts: allwinner: h6: Enable IR on Beelink GS1 Clément Péron
2019-05-28 16:14 ` [PATCH v3 12/12] arm64: defconfig: enable IR SUNXI option Clément Péron
2019-05-30 12:55 ` [PATCH v3 00/12] Allwinner A64/H6 IR support Sean Young
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=20190528161440.27172-3-peron.clem@gmail.com \
--to=peron.clem@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.org \
--cc=wens@csie.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).