Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Nov 4, 2013
2 parents 9118855 + 3d8f731 commit 6caa989
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
15 changes: 10 additions & 5 deletions sound/soc/fsl/eukrea-tlv320.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,30 +42,34 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBM_CFM);
if (ret) {
pr_err("%s: failed set cpu dai format\n", __func__);
dev_err(cpu_dai->dev,
"Failed to set the cpu dai format.\n");
return ret;
}

ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBM_CFM);
if (ret) {
pr_err("%s: failed set codec dai format\n", __func__);
dev_err(cpu_dai->dev,
"Failed to set the codec format.\n");
return ret;
}

ret = snd_soc_dai_set_sysclk(codec_dai, 0,
CODEC_CLOCK, SND_SOC_CLOCK_OUT);
if (ret) {
pr_err("%s: failed setting codec sysclk\n", __func__);
dev_err(cpu_dai->dev,
"Failed to set the codec sysclk.\n");
return ret;
}
snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0);

ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0,
SND_SOC_CLOCK_IN);
if (ret) {
pr_err("can't set CPU system clock IMX_SSP_SYS_CLK\n");
dev_err(cpu_dai->dev,
"Can't set the IMX_SSP_SYS_CLK CPU system clock.\n");
return ret;
}

Expand Down Expand Up @@ -155,7 +159,8 @@ static struct platform_driver eukrea_tlv320_driver = {
.owner = THIS_MODULE,
},
.probe = eukrea_tlv320_probe,
.remove = eukrea_tlv320_remove,};
.remove = eukrea_tlv320_remove,
};

module_platform_driver(eukrea_tlv320_driver);

Expand Down
4 changes: 2 additions & 2 deletions sound/soc/fsl/fsl_spdif.c
Original file line number Diff line number Diff line change
Expand Up @@ -1107,9 +1107,9 @@ static int fsl_spdif_probe(struct platform_device *pdev)

/* Get the addresses and IRQ */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (IS_ERR(res)) {
if (!res) {
dev_err(&pdev->dev, "could not determine device resources\n");
return PTR_ERR(res);
return -ENXIO;
}

regs = devm_ioremap_resource(&pdev->dev, res);
Expand Down

0 comments on commit 6caa989

Please sign in to comment.