Commit 204566ab authored by Guido Gunther's avatar Guido Gunther Committed by Angus Ainslie (Purism)

dcss: HACK: Revers clxld and blkctl init

ctxld fails during boot due to its irqsteer dependency. Make us undo
less stuff so that probing again works later on (instead of hanging the
boot).

TODO: check if this works on 4.18 too
Signed-off-by: Guido Gunther's avatarGuido Günther <guido.gunther@puri.sm>
parent 36ddf268
......@@ -129,14 +129,16 @@ static int dcss_submodules_init(struct dcss_soc *dcss)
int ret;
u32 dcss_base = dcss->start_addr;
ret = dcss_blkctl_init(dcss, dcss_base + dcss->devtype->blkctl_ofs);
if (ret)
goto blkctl_err;
dev_err(dcss->dev, "%s %d.\n", __func__, __LINE__);
ret = dcss_ctxld_init(dcss, dcss_base + dcss->devtype->ctxld_ofs);
if (ret)
goto ctxld_err;
ret = dcss_blkctl_init(dcss, dcss_base + dcss->devtype->blkctl_ofs);
if (ret)
goto blkctl_err;
ret = dcss_dtrc_init(dcss, dcss_base + dcss->devtype->dtrc_ofs);
if (ret)
goto dtrc_err;
......@@ -173,6 +175,7 @@ static int dcss_submodules_init(struct dcss_soc *dcss)
if (ret)
goto rdsrc_err;
dev_err(dcss->dev, "%s %d.: ret: %d\n", __func__, __LINE__, ret);
return 0;
rdsrc_err:
......@@ -202,12 +205,12 @@ static int dcss_submodules_init(struct dcss_soc *dcss)
dtrc_err:
dcss_dtrc_exit(dcss);
ctxld_err:
dcss_ctxld_exit(dcss);
blkctl_err:
dcss_blkctl_exit(dcss);
ctxld_err:
dcss_ctxld_exit(dcss);
return ret;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment