lkml.org 
[lkml]   [2020]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/10] remoteproc: imx_rproc: make syscon optional
    Date
    Make syscon optional, since i.MX8QM/QXP/7ULP not have SRC to control M4.
    But currently i.MX8QM/QXP/7ULP not added, so still check regmap
    when start/stop to avoid unhappy things.

    Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
    Signed-off-by: Peng Fan <peng.fan@nxp.com>
    ---
    drivers/remoteproc/imx_rproc.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
    index 82594a800a1b..4fad5c0b1c05 100644
    --- a/drivers/remoteproc/imx_rproc.c
    +++ b/drivers/remoteproc/imx_rproc.c
    @@ -162,6 +162,9 @@ static int imx_rproc_start(struct rproc *rproc)
    struct device *dev = priv->dev;
    int ret;

    + if (!priv->regmap)
    + return -EOPNOTSUPP;
    +
    ret = regmap_update_bits(priv->regmap, dcfg->src_reg,
    dcfg->src_mask, dcfg->src_start);
    if (ret)
    @@ -177,6 +180,9 @@ static int imx_rproc_stop(struct rproc *rproc)
    struct device *dev = priv->dev;
    int ret;

    + if (!priv->regmap)
    + return -EOPNOTSUPP;
    +
    ret = regmap_update_bits(priv->regmap, dcfg->src_reg,
    dcfg->src_mask, dcfg->src_stop);
    if (ret)
    @@ -325,9 +331,10 @@ static int imx_rproc_probe(struct platform_device *pdev)
    regmap = syscon_regmap_lookup_by_phandle(np, "syscon");
    if (IS_ERR(regmap)) {
    dev_err(dev, "failed to find syscon\n");
    - return PTR_ERR(regmap);
    + regmap = NULL;
    + } else {
    + regmap_attach_dev(dev, regmap, &config);
    }
    - regmap_attach_dev(dev, regmap, &config);

    /* set some other name then imx */
    rproc = rproc_alloc(dev, "imx-rproc", &imx_rproc_ops,
    --
    2.16.4
    \
     
     \ /
      Last update: 2020-07-24 09:44    [W:3.181 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site