remoteproc/davinci: use the reset framework
Switch to using the reset framework instead of handcoded reset routines we used so far. Reviewed-by: Sekhar Nori <nsekhar@ti.com> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
parent
491278b698
commit
b2201ee554
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
#include <linux/clk.h>
|
#include <linux/clk.h>
|
||||||
|
#include <linux/reset.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
|
@ -20,8 +21,6 @@
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/remoteproc.h>
|
#include <linux/remoteproc.h>
|
||||||
|
|
||||||
#include <mach/clock.h> /* for davinci_clk_reset_assert/deassert() */
|
|
||||||
|
|
||||||
#include "remoteproc_internal.h"
|
#include "remoteproc_internal.h"
|
||||||
|
|
||||||
static char *da8xx_fw_name;
|
static char *da8xx_fw_name;
|
||||||
|
@ -72,6 +71,7 @@ struct da8xx_rproc {
|
||||||
struct da8xx_rproc_mem *mem;
|
struct da8xx_rproc_mem *mem;
|
||||||
int num_mems;
|
int num_mems;
|
||||||
struct clk *dsp_clk;
|
struct clk *dsp_clk;
|
||||||
|
struct reset_control *dsp_reset;
|
||||||
void (*ack_fxn)(struct irq_data *data);
|
void (*ack_fxn)(struct irq_data *data);
|
||||||
struct irq_data *irq_data;
|
struct irq_data *irq_data;
|
||||||
void __iomem *chipsig;
|
void __iomem *chipsig;
|
||||||
|
@ -138,6 +138,7 @@ static int da8xx_rproc_start(struct rproc *rproc)
|
||||||
struct device *dev = rproc->dev.parent;
|
struct device *dev = rproc->dev.parent;
|
||||||
struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
|
struct da8xx_rproc *drproc = (struct da8xx_rproc *)rproc->priv;
|
||||||
struct clk *dsp_clk = drproc->dsp_clk;
|
struct clk *dsp_clk = drproc->dsp_clk;
|
||||||
|
struct reset_control *dsp_reset = drproc->dsp_reset;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* hw requires the start (boot) address be on 1KB boundary */
|
/* hw requires the start (boot) address be on 1KB boundary */
|
||||||
|
@ -155,7 +156,12 @@ static int da8xx_rproc_start(struct rproc *rproc)
|
||||||
return ret;
|
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);
|
||||||
|
clk_disable_unprepare(dsp_clk);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -163,8 +169,15 @@ static int da8xx_rproc_start(struct rproc *rproc)
|
||||||
static int da8xx_rproc_stop(struct rproc *rproc)
|
static int da8xx_rproc_stop(struct rproc *rproc)
|
||||||
{
|
{
|
||||||
struct da8xx_rproc *drproc = rproc->priv;
|
struct da8xx_rproc *drproc = rproc->priv;
|
||||||
|
struct device *dev = rproc->dev.parent;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ret = reset_control_assert(drproc->dsp_reset);
|
||||||
|
if (ret) {
|
||||||
|
dev_err(dev, "reset_control_assert() failed: %d\n", ret);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
davinci_clk_reset_assert(drproc->dsp_clk);
|
|
||||||
clk_disable_unprepare(drproc->dsp_clk);
|
clk_disable_unprepare(drproc->dsp_clk);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -232,6 +245,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
|
||||||
struct resource *bootreg_res;
|
struct resource *bootreg_res;
|
||||||
struct resource *chipsig_res;
|
struct resource *chipsig_res;
|
||||||
struct clk *dsp_clk;
|
struct clk *dsp_clk;
|
||||||
|
struct reset_control *dsp_reset;
|
||||||
void __iomem *chipsig;
|
void __iomem *chipsig;
|
||||||
void __iomem *bootreg;
|
void __iomem *bootreg;
|
||||||
int irq;
|
int irq;
|
||||||
|
@ -268,6 +282,15 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
|
||||||
return PTR_ERR(dsp_clk);
|
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) {
|
if (dev->of_node) {
|
||||||
ret = of_reserved_mem_device_init(dev);
|
ret = of_reserved_mem_device_init(dev);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
@ -290,6 +313,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
|
||||||
drproc = rproc->priv;
|
drproc = rproc->priv;
|
||||||
drproc->rproc = rproc;
|
drproc->rproc = rproc;
|
||||||
drproc->dsp_clk = dsp_clk;
|
drproc->dsp_clk = dsp_clk;
|
||||||
|
drproc->dsp_reset = dsp_reset;
|
||||||
rproc->has_iommu = false;
|
rproc->has_iommu = false;
|
||||||
|
|
||||||
ret = da8xx_rproc_get_internal_memories(pdev, drproc);
|
ret = da8xx_rproc_get_internal_memories(pdev, drproc);
|
||||||
|
@ -312,7 +336,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
|
||||||
* *not* in reset, but da8xx_rproc_start() needs the DSP to be
|
* *not* in reset, but da8xx_rproc_start() needs the DSP to be
|
||||||
* held in reset at the time it is called.
|
* 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)
|
if (ret)
|
||||||
goto free_rproc;
|
goto free_rproc;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue