diff options
author | Daniel Baluta <daniel.baluta@nxp.com> | 2019-11-28 23:24:35 +0200 |
---|---|---|
committer | Daniel Baluta <daniel.baluta@nxp.com> | 2019-11-28 23:24:35 +0200 |
commit | 95ab2f59ea96ce221a5aad257fc87774358bbaeb (patch) | |
tree | 3d80d6cb6b1277106adf77e99c7b3fec1b701de9 /sound/soc/sof/sof-of-dev.c | |
parent | 1b9618b96cfcc99aa7af7e29900b67daea4f6766 (diff) |
ASoC: SOF: Allow probe to continue when we have an actual codec
For now the machine driver taking care of the codec is hard-coded.
In the future we will need to read the name from DT.
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Diffstat (limited to 'sound/soc/sof/sof-of-dev.c')
-rw-r--r-- | sound/soc/sof/sof-of-dev.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/sof/sof-of-dev.c b/sound/soc/sof/sof-of-dev.c index e5961a9fc006..042eae74961f 100644 --- a/sound/soc/sof/sof-of-dev.c +++ b/sound/soc/sof/sof-of-dev.c @@ -80,15 +80,10 @@ static int sof_of_probe(struct platform_device *pdev) ret = sof_nocodec_setup(dev, ops); if (ret < 0) return ret; -#else - /* TODO: implement case where we actually have a codec */ - return -ENODEV; #endif - if (mach) - mach->mach_params.platform = dev_name(dev); - - sof_pdata->machine = mach; + /* TODO: replace machine with info from DT */ + sof_pdata->machine = NULL; sof_pdata->desc = desc; sof_pdata->dev = &pdev->dev; sof_pdata->platform = dev_name(dev); |