From: "Mylène Josserand" <mylene.josserand@free-electrons.com> To: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, maxime.ripard@free-electrons.com, wens@csie.org, mturquette@baylibre.com, sboyd@codeaurora.org, mark.rutland@arm.com, robh+dt@kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, thomas.petazzoni@free-electrons.com, mylene.josserand@free-electrons.com, alexandre.belloni@free-electrons.com Subject: [PATCH v2 04/10] ASoC: sun4i-i2s: Add quirks to handle new compatible for reset Date: Tue, 17 Jan 2017 15:02:24 +0100 [thread overview] Message-ID: <20170117140230.23142-5-mylene.josserand@free-electrons.com> (raw) In-Reply-To: <20170117140230.23142-1-mylene.josserand@free-electrons.com> Some SoCs have a reset line that must be asserted/deasserted. This patch adds a quirk to handle the new compatible "allwinner,sun6i-a31-i2s" which will deassert the reset line on probe function and assert it on remove's one. This new compatible is useful in case of A33 codec driver, for example. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun4i-i2s.c | 57 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 4237323ef594..3635bbc72cbc 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -14,9 +14,11 @@ #include <linux/clk.h> #include <linux/dmaengine.h> #include <linux/module.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> +#include <linux/reset.h> #include <sound/dmaengine_pcm.h> #include <sound/pcm_params.h> @@ -92,6 +94,7 @@ struct sun4i_i2s { struct clk *bus_clk; struct clk *mod_clk; struct regmap *regmap; + struct reset_control *rst; unsigned int mclk_freq; @@ -651,9 +654,22 @@ static int sun4i_i2s_runtime_suspend(struct device *dev) return 0; } +struct sun4i_i2s_quirks { + bool has_reset; +}; + +static const struct sun4i_i2s_quirks sun4i_a10_i2s_quirks = { + .has_reset = false, +}; + +static const struct sun4i_i2s_quirks sun6i_a31_i2s_quirks = { + .has_reset = true, +}; + static int sun4i_i2s_probe(struct platform_device *pdev) { struct sun4i_i2s *i2s; + const struct sun4i_i2s_quirks *quirks; struct resource *res; void __iomem *regs; int irq, ret; @@ -674,6 +690,12 @@ static int sun4i_i2s_probe(struct platform_device *pdev) return irq; } + quirks = of_device_get_match_data(&pdev->dev); + if (!quirks) { + dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); + return -ENODEV; + } + i2s->bus_clk = devm_clk_get(&pdev->dev, "apb"); if (IS_ERR(i2s->bus_clk)) { dev_err(&pdev->dev, "Can't get our bus clock\n"); @@ -692,7 +714,24 @@ static int sun4i_i2s_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Can't get our mod clock\n"); return PTR_ERR(i2s->mod_clk); } - + + if (quirks->has_reset) { + i2s->rst = devm_reset_control_get(&pdev->dev, NULL); + if (IS_ERR(i2s->rst)) { + dev_err(&pdev->dev, "Failed to get reset control\n"); + return PTR_ERR(i2s->rst); + } + } + + if (!IS_ERR(i2s->rst)) { + ret = reset_control_deassert(i2s->rst); + if (ret) { + dev_err(&pdev->dev, + "Failed to deassert the reset control\n"); + return -EINVAL; + } + } + i2s->playback_dma_data.addr = res->start + SUN4I_I2S_FIFO_TX_REG; i2s->playback_dma_data.maxburst = 8; @@ -727,23 +766,37 @@ static int sun4i_i2s_probe(struct platform_device *pdev) sun4i_i2s_runtime_suspend(&pdev->dev); err_pm_disable: pm_runtime_disable(&pdev->dev); + if (!IS_ERR(i2s->rst)) + reset_control_assert(i2s->rst); return ret; } static int sun4i_i2s_remove(struct platform_device *pdev) { + struct sun4i_i2s *i2s = dev_get_drvdata(&pdev->dev); + snd_dmaengine_pcm_unregister(&pdev->dev); pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) sun4i_i2s_runtime_suspend(&pdev->dev); + if (!IS_ERR(i2s->rst)) + reset_control_assert(i2s->rst); + return 0; } static const struct of_device_id sun4i_i2s_match[] = { - { .compatible = "allwinner,sun4i-a10-i2s", }, + { + .compatible = "allwinner,sun4i-a10-i2s", + .data = &sun4i_a10_i2s_quirks, + }, + { + .compatible = "allwinner,sun6i-a31-i2s", + .data = &sun6i_a31_i2s_quirks, + }, {} }; MODULE_DEVICE_TABLE(of, sun4i_i2s_match); -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: mylene.josserand@free-electrons.com (Mylène Josserand) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 04/10] ASoC: sun4i-i2s: Add quirks to handle new compatible for reset Date: Tue, 17 Jan 2017 15:02:24 +0100 [thread overview] Message-ID: <20170117140230.23142-5-mylene.josserand@free-electrons.com> (raw) In-Reply-To: <20170117140230.23142-1-mylene.josserand@free-electrons.com> Some SoCs have a reset line that must be asserted/deasserted. This patch adds a quirk to handle the new compatible "allwinner,sun6i-a31-i2s" which will deassert the reset line on probe function and assert it on remove's one. This new compatible is useful in case of A33 codec driver, for example. Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun4i-i2s.c | 57 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 4237323ef594..3635bbc72cbc 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -14,9 +14,11 @@ #include <linux/clk.h> #include <linux/dmaengine.h> #include <linux/module.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> +#include <linux/reset.h> #include <sound/dmaengine_pcm.h> #include <sound/pcm_params.h> @@ -92,6 +94,7 @@ struct sun4i_i2s { struct clk *bus_clk; struct clk *mod_clk; struct regmap *regmap; + struct reset_control *rst; unsigned int mclk_freq; @@ -651,9 +654,22 @@ static int sun4i_i2s_runtime_suspend(struct device *dev) return 0; } +struct sun4i_i2s_quirks { + bool has_reset; +}; + +static const struct sun4i_i2s_quirks sun4i_a10_i2s_quirks = { + .has_reset = false, +}; + +static const struct sun4i_i2s_quirks sun6i_a31_i2s_quirks = { + .has_reset = true, +}; + static int sun4i_i2s_probe(struct platform_device *pdev) { struct sun4i_i2s *i2s; + const struct sun4i_i2s_quirks *quirks; struct resource *res; void __iomem *regs; int irq, ret; @@ -674,6 +690,12 @@ static int sun4i_i2s_probe(struct platform_device *pdev) return irq; } + quirks = of_device_get_match_data(&pdev->dev); + if (!quirks) { + dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); + return -ENODEV; + } + i2s->bus_clk = devm_clk_get(&pdev->dev, "apb"); if (IS_ERR(i2s->bus_clk)) { dev_err(&pdev->dev, "Can't get our bus clock\n"); @@ -692,7 +714,24 @@ static int sun4i_i2s_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Can't get our mod clock\n"); return PTR_ERR(i2s->mod_clk); } - + + if (quirks->has_reset) { + i2s->rst = devm_reset_control_get(&pdev->dev, NULL); + if (IS_ERR(i2s->rst)) { + dev_err(&pdev->dev, "Failed to get reset control\n"); + return PTR_ERR(i2s->rst); + } + } + + if (!IS_ERR(i2s->rst)) { + ret = reset_control_deassert(i2s->rst); + if (ret) { + dev_err(&pdev->dev, + "Failed to deassert the reset control\n"); + return -EINVAL; + } + } + i2s->playback_dma_data.addr = res->start + SUN4I_I2S_FIFO_TX_REG; i2s->playback_dma_data.maxburst = 8; @@ -727,23 +766,37 @@ static int sun4i_i2s_probe(struct platform_device *pdev) sun4i_i2s_runtime_suspend(&pdev->dev); err_pm_disable: pm_runtime_disable(&pdev->dev); + if (!IS_ERR(i2s->rst)) + reset_control_assert(i2s->rst); return ret; } static int sun4i_i2s_remove(struct platform_device *pdev) { + struct sun4i_i2s *i2s = dev_get_drvdata(&pdev->dev); + snd_dmaengine_pcm_unregister(&pdev->dev); pm_runtime_disable(&pdev->dev); if (!pm_runtime_status_suspended(&pdev->dev)) sun4i_i2s_runtime_suspend(&pdev->dev); + if (!IS_ERR(i2s->rst)) + reset_control_assert(i2s->rst); + return 0; } static const struct of_device_id sun4i_i2s_match[] = { - { .compatible = "allwinner,sun4i-a10-i2s", }, + { + .compatible = "allwinner,sun4i-a10-i2s", + .data = &sun4i_a10_i2s_quirks, + }, + { + .compatible = "allwinner,sun6i-a31-i2s", + .data = &sun6i_a31_i2s_quirks, + }, {} }; MODULE_DEVICE_TABLE(of, sun4i_i2s_match); -- 2.11.0
next prev parent reply other threads:[~2017-01-17 14:04 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-17 14:02 [PATCH v2 00/10] Add sun8i A33 audio driver Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 14:02 ` [PATCH v2 01/10] ASoC: sun4i-i2s: Increase DMA max burst to 8 Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 16:41 ` Maxime Ripard 2017-01-17 16:41 ` Maxime Ripard 2017-01-17 16:41 ` Maxime Ripard 2017-01-17 18:44 ` Applied "ASoC: sun4i-i2s: Increase DMA max burst to 8" to the asoc tree Mark Brown 2017-01-17 18:44 ` Mark Brown 2017-01-17 18:44 ` Mark Brown 2017-01-17 14:02 ` [PATCH v2 02/10] clk: ccu-sun8i-a33: Add CLK_SET_RATE_PARENT to ac-dig Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 16:44 ` Maxime Ripard 2017-01-17 16:44 ` Maxime Ripard 2017-01-17 16:44 ` Maxime Ripard 2017-01-18 7:58 ` Mylene Josserand 2017-01-18 7:58 ` Mylene Josserand 2017-01-17 14:02 ` [PATCH v2 03/10] dt-bindings: sound: Add new reset compatible for sun4i-i2s Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 16:46 ` Maxime Ripard 2017-01-17 16:46 ` Maxime Ripard 2017-01-17 16:46 ` Maxime Ripard 2017-01-18 8:23 ` Mylene Josserand 2017-01-18 8:23 ` Mylene Josserand 2017-01-17 14:02 ` Mylène Josserand [this message] 2017-01-17 14:02 ` [PATCH v2 04/10] ASoC: sun4i-i2s: Add quirks to handle new compatible for reset Mylène Josserand 2017-01-17 16:47 ` Maxime Ripard 2017-01-17 16:47 ` Maxime Ripard 2017-01-17 16:47 ` Maxime Ripard 2017-01-17 14:02 ` [PATCH v2 05/10] ASoC: Add sun8i digital audio codec Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 16:20 ` Mylene Josserand 2017-01-17 16:20 ` Mylene Josserand 2017-01-17 14:02 ` [PATCH v2 06/10] ASoC: sun8i-codec-analog: Add amplifier event to fix first delay Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 16:49 ` Maxime Ripard 2017-01-17 16:49 ` Maxime Ripard 2017-01-17 16:49 ` Maxime Ripard 2017-02-03 12:03 ` Applied "ASoC: sun8i-codec-analog: Add amplifier event to fix first delay" to the asoc tree Mark Brown 2017-02-03 12:03 ` Mark Brown 2017-02-03 12:03 ` Mark Brown 2017-01-17 14:02 ` [PATCH v2 07/10] dt-bindings: sound: Add sun8i audio documentation Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 16:50 ` Mark Brown 2017-01-17 16:50 ` Mark Brown 2017-01-18 8:25 ` Mylene Josserand 2017-01-18 8:25 ` Mylene Josserand 2017-01-17 16:51 ` Maxime Ripard 2017-01-17 16:51 ` Maxime Ripard 2017-01-17 16:51 ` Maxime Ripard 2017-01-17 14:02 ` [PATCH v2 08/10] ARM: dts: sun8i: Add audio codec, dai and card for A33 Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 16:58 ` Maxime Ripard 2017-01-17 16:58 ` Maxime Ripard 2017-01-17 16:58 ` Maxime Ripard 2017-01-17 14:02 ` [PATCH v2 09/10] ARM: dts: sun8i: parrot: Enable audio nodes Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand 2017-01-17 14:02 ` [PATCH v2 10/10] ARM: dts: sun8i: sinlinx: " Mylène Josserand 2017-01-17 14:02 ` Mylène Josserand
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=20170117140230.23142-5-mylene.josserand@free-electrons.com \ --to=mylene.josserand@free-electrons.com \ --cc=alexandre.belloni@free-electrons.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sunxi@googlegroups.com \ --cc=mark.rutland@arm.com \ --cc=maxime.ripard@free-electrons.com \ --cc=mturquette@baylibre.com \ --cc=perex@perex.cz \ --cc=robh+dt@kernel.org \ --cc=sboyd@codeaurora.org \ --cc=thomas.petazzoni@free-electrons.com \ --cc=tiwai@suse.com \ --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: 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.