From: Bartosz Golaszewski <brgl@bgdev.pl> To: Sekhar Nori <nsekhar@ti.com>, Kevin Hilman <khilman@kernel.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Russell King <linux@armlinux.org.uk>, David Lechner <david@lechnology.com>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Ohad Ben-Cohen <ohad@wizery.com>, Bjorn Andersson <bjorn.andersson@linaro.org>, Philipp Zabel <p.zabel@pengutronix.de> Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-remoteproc@vger.kernel.org, Bartosz Golaszewski <bgolaszewski@baylibre.com> Subject: [PATCH v4 7/8] remoteproc: da8xx: use the reset framework Date: Fri, 23 Mar 2018 14:04:54 +0100 [thread overview] Message-ID: <20180323130455.11470-8-brgl@bgdev.pl> (raw) In-Reply-To: <20180323130455.11470-1-brgl@bgdev.pl> From: Bartosz Golaszewski <bgolaszewski@baylibre.com> Switch to using the reset framework instead of handcoded reset routines we used so far. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> --- drivers/remoteproc/da8xx_remoteproc.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c index f134192922e0..3689473f8b49 100644 --- a/drivers/remoteproc/da8xx_remoteproc.c +++ b/drivers/remoteproc/da8xx_remoteproc.c @@ -10,6 +10,7 @@ #include <linux/bitops.h> #include <linux/clk.h> +#include <linux/reset.h> #include <linux/err.h> #include <linux/interrupt.h> #include <linux/io.h> @@ -20,8 +21,6 @@ #include <linux/platform_device.h> #include <linux/remoteproc.h> -#include <mach/clock.h> /* for davinci_clk_reset_assert/deassert() */ - #include "remoteproc_internal.h" static char *da8xx_fw_name; @@ -72,6 +71,7 @@ struct da8xx_rproc { struct da8xx_rproc_mem *mem; int num_mems; struct clk *dsp_clk; + struct reset_control *dsp_reset; void (*ack_fxn)(struct irq_data *data); struct irq_data *irq_data; void __iomem *chipsig; @@ -138,6 +138,7 @@ static int da8xx_rproc_start(struct rproc *rproc) struct device *dev = rproc->dev.parent; struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv; struct clk *dsp_clk = drproc->dsp_clk; + struct reset_control *dsp_reset = drproc->dsp_reset; int ret; /* hw requires the start (boot) address be on 1KB boundary */ @@ -155,7 +156,11 @@ static int da8xx_rproc_start(struct rproc *rproc) return ret; } - davinci_clk_reset_deassert(dsp_clk); + ret = reset_control_deassert(dsp_reset); + if (ret) { + dev_err(dev, "reset_control_deassert() failed: %d\n", ret); + return ret; + } return 0; } @@ -163,8 +168,15 @@ static int da8xx_rproc_start(struct rproc *rproc) static int da8xx_rproc_stop(struct rproc *rproc) { struct da8xx_rproc *drproc = rproc->priv; + int ret; + + ret = reset_control_assert(drproc->dsp_reset); + if (ret) { + dev_err(rproc->dev.parent, + "reset_control_assert() failed: %d\n", ret); + return ret; + } - davinci_clk_reset_assert(drproc->dsp_clk); clk_disable_unprepare(drproc->dsp_clk); return 0; @@ -232,6 +244,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev) struct resource *bootreg_res; struct resource *chipsig_res; struct clk *dsp_clk; + struct reset_control *dsp_reset; void __iomem *chipsig; void __iomem *bootreg; int irq; @@ -268,6 +281,15 @@ static int da8xx_rproc_probe(struct platform_device *pdev) return PTR_ERR(dsp_clk); } + dsp_reset = devm_reset_control_get_exclusive(dev, NULL); + if (IS_ERR(dsp_reset)) { + if (PTR_ERR(dsp_reset) != -EPROBE_DEFER) + dev_err(dev, "unable to get reset control: %ld\n", + PTR_ERR(dsp_reset)); + + return PTR_ERR(dsp_reset); + } + if (dev->of_node) { ret = of_reserved_mem_device_init(dev); if (ret) { @@ -309,7 +331,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev) * *not* in reset, but da8xx_rproc_start() needs the DSP to be * held in reset at the time it is called. */ - ret = davinci_clk_reset_assert(drproc->dsp_clk); + ret = reset_control_assert(dsp_reset); if (ret) goto free_rproc; -- 2.16.1
WARNING: multiple messages have this Message-ID (diff)
From: brgl@bgdev.pl (Bartosz Golaszewski) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 7/8] remoteproc: da8xx: use the reset framework Date: Fri, 23 Mar 2018 14:04:54 +0100 [thread overview] Message-ID: <20180323130455.11470-8-brgl@bgdev.pl> (raw) In-Reply-To: <20180323130455.11470-1-brgl@bgdev.pl> From: Bartosz Golaszewski <bgolaszewski@baylibre.com> Switch to using the reset framework instead of handcoded reset routines we used so far. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> --- drivers/remoteproc/da8xx_remoteproc.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/drivers/remoteproc/da8xx_remoteproc.c b/drivers/remoteproc/da8xx_remoteproc.c index f134192922e0..3689473f8b49 100644 --- a/drivers/remoteproc/da8xx_remoteproc.c +++ b/drivers/remoteproc/da8xx_remoteproc.c @@ -10,6 +10,7 @@ #include <linux/bitops.h> #include <linux/clk.h> +#include <linux/reset.h> #include <linux/err.h> #include <linux/interrupt.h> #include <linux/io.h> @@ -20,8 +21,6 @@ #include <linux/platform_device.h> #include <linux/remoteproc.h> -#include <mach/clock.h> /* for davinci_clk_reset_assert/deassert() */ - #include "remoteproc_internal.h" static char *da8xx_fw_name; @@ -72,6 +71,7 @@ struct da8xx_rproc { struct da8xx_rproc_mem *mem; int num_mems; struct clk *dsp_clk; + struct reset_control *dsp_reset; void (*ack_fxn)(struct irq_data *data); struct irq_data *irq_data; void __iomem *chipsig; @@ -138,6 +138,7 @@ static int da8xx_rproc_start(struct rproc *rproc) struct device *dev = rproc->dev.parent; struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv; struct clk *dsp_clk = drproc->dsp_clk; + struct reset_control *dsp_reset = drproc->dsp_reset; int ret; /* hw requires the start (boot) address be on 1KB boundary */ @@ -155,7 +156,11 @@ static int da8xx_rproc_start(struct rproc *rproc) return ret; } - davinci_clk_reset_deassert(dsp_clk); + ret = reset_control_deassert(dsp_reset); + if (ret) { + dev_err(dev, "reset_control_deassert() failed: %d\n", ret); + return ret; + } return 0; } @@ -163,8 +168,15 @@ static int da8xx_rproc_start(struct rproc *rproc) static int da8xx_rproc_stop(struct rproc *rproc) { struct da8xx_rproc *drproc = rproc->priv; + int ret; + + ret = reset_control_assert(drproc->dsp_reset); + if (ret) { + dev_err(rproc->dev.parent, + "reset_control_assert() failed: %d\n", ret); + return ret; + } - davinci_clk_reset_assert(drproc->dsp_clk); clk_disable_unprepare(drproc->dsp_clk); return 0; @@ -232,6 +244,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev) struct resource *bootreg_res; struct resource *chipsig_res; struct clk *dsp_clk; + struct reset_control *dsp_reset; void __iomem *chipsig; void __iomem *bootreg; int irq; @@ -268,6 +281,15 @@ static int da8xx_rproc_probe(struct platform_device *pdev) return PTR_ERR(dsp_clk); } + dsp_reset = devm_reset_control_get_exclusive(dev, NULL); + if (IS_ERR(dsp_reset)) { + if (PTR_ERR(dsp_reset) != -EPROBE_DEFER) + dev_err(dev, "unable to get reset control: %ld\n", + PTR_ERR(dsp_reset)); + + return PTR_ERR(dsp_reset); + } + if (dev->of_node) { ret = of_reserved_mem_device_init(dev); if (ret) { @@ -309,7 +331,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev) * *not* in reset, but da8xx_rproc_start() needs the DSP to be * held in reset at the time it is called. */ - ret = davinci_clk_reset_assert(drproc->dsp_clk); + ret = reset_control_assert(dsp_reset); if (ret) goto free_rproc; -- 2.16.1
next prev parent reply other threads:[~2018-03-23 13:04 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-23 13:04 [PATCH v4 0/8] ARM: davinci: complete the conversion to using the reset framework Bartosz Golaszewski 2018-03-23 13:04 ` Bartosz Golaszewski 2018-03-23 13:04 ` [PATCH v4 1/8] reset: modify the way reset lookup works for board files Bartosz Golaszewski 2018-03-23 13:04 ` Bartosz Golaszewski 2018-03-23 13:43 ` Philipp Zabel 2018-03-23 13:43 ` Philipp Zabel 2018-03-23 13:43 ` Philipp Zabel 2018-03-23 13:46 ` Bartosz Golaszewski 2018-03-23 13:46 ` Bartosz Golaszewski 2018-03-23 13:04 ` [PATCH v4 2/8] ARM: davinci: dts: make psc0 a reset provider Bartosz Golaszewski 2018-03-23 13:04 ` Bartosz Golaszewski 2018-03-23 13:04 ` [PATCH v4 3/8] ARM: davinci: dts: add a reset control to the dsp node Bartosz Golaszewski 2018-03-23 13:04 ` Bartosz Golaszewski 2018-03-23 13:04 ` [PATCH v4 4/8] clk: davinci: add a reset lookup table for psc0 Bartosz Golaszewski 2018-03-23 13:04 ` Bartosz Golaszewski 2018-03-23 13:04 ` [PATCH v4 5/8] remoteproc: da8xx: add the missing retval check for clk_enable() Bartosz Golaszewski 2018-03-23 13:04 ` Bartosz Golaszewski 2018-03-23 13:04 ` Bartosz Golaszewski 2018-03-26 21:15 ` Suman Anna 2018-03-26 21:15 ` Suman Anna 2018-03-26 21:15 ` Suman Anna 2018-03-23 13:04 ` [PATCH v4 6/8] remoteproc: da8xx: prepare and unprepare the clock where needed Bartosz Golaszewski 2018-03-23 13:04 ` Bartosz Golaszewski 2018-03-26 21:19 ` Suman Anna 2018-03-26 21:19 ` Suman Anna 2018-03-26 21:19 ` Suman Anna 2018-03-26 21:19 ` Suman Anna 2018-03-23 13:04 ` Bartosz Golaszewski [this message] 2018-03-23 13:04 ` [PATCH v4 7/8] remoteproc: da8xx: use the reset framework Bartosz Golaszewski 2018-03-26 21:28 ` Suman Anna 2018-03-26 21:28 ` Suman Anna 2018-03-26 21:28 ` Suman Anna 2018-03-23 13:04 ` [PATCH v4 8/8] clk: davinci: kill davinci_clk_reset_assert/deassert() Bartosz Golaszewski 2018-03-23 13:04 ` Bartosz Golaszewski 2018-03-23 16:49 ` [PATCH v4 0/8] ARM: davinci: complete the conversion to using the reset framework Stephen Boyd 2018-03-23 16:49 ` Stephen Boyd 2018-03-23 16:49 ` Stephen Boyd 2018-03-23 16:55 ` Bartosz Golaszewski 2018-03-23 16:55 ` Bartosz Golaszewski 2018-03-23 17:08 ` Stephen Boyd 2018-03-23 17:08 ` Stephen Boyd 2018-03-23 17:08 ` Stephen Boyd 2018-03-23 17:16 ` Bartosz Golaszewski 2018-03-23 17:16 ` Bartosz Golaszewski 2018-03-24 0:30 ` Suman Anna 2018-03-24 0:30 ` Suman Anna 2018-03-24 0:30 ` Suman Anna 2018-03-24 0:30 ` Suman Anna 2018-03-27 0:42 ` Suman Anna 2018-03-27 0:42 ` Suman Anna 2018-03-27 0:42 ` Suman Anna 2018-03-27 0:42 ` Suman Anna 2018-03-27 5:24 ` Sekhar Nori 2018-03-27 5:24 ` Sekhar Nori 2018-03-27 5:24 ` Sekhar Nori 2018-03-27 5:24 ` Sekhar Nori 2018-03-28 22:44 ` Suman Anna 2018-03-28 22:44 ` Suman Anna 2018-03-28 22:44 ` Suman Anna 2018-03-27 6:09 ` Sekhar Nori 2018-03-27 6:09 ` Sekhar Nori 2018-03-27 6:09 ` Sekhar Nori 2018-03-27 6:09 ` Sekhar Nori 2018-03-27 9:23 ` Philipp Zabel 2018-03-27 9:23 ` Philipp Zabel 2018-03-27 9:23 ` Philipp Zabel 2018-03-27 9:29 ` Bartosz Golaszewski 2018-03-27 9:29 ` Bartosz Golaszewski
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=20180323130455.11470-8-brgl@bgdev.pl \ --to=brgl@bgdev.pl \ --cc=bgolaszewski@baylibre.com \ --cc=bjorn.andersson@linaro.org \ --cc=david@lechnology.com \ --cc=devicetree@vger.kernel.org \ --cc=khilman@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-remoteproc@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=mturquette@baylibre.com \ --cc=nsekhar@ti.com \ --cc=ohad@wizery.com \ --cc=p.zabel@pengutronix.de \ --cc=robh+dt@kernel.org \ --cc=sboyd@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.