diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 12:20:19 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 12:20:19 -0400 |
| commit | e95e939d15d0b14d210d43553f58fb7cefe8d93c (patch) | |
| tree | bde2171bdbd635ba5daf46e369b391459cba0209 | |
| parent | c44ddeb8370d3b528e2b8287c18e14acb81ee1a8 (diff) | |
| parent | 22a4adf25826d1128d116dd4a313f66175c703bd (diff) | |
Merge remote-tracking branch 'asoc/topic/dwc' into asoc-next
| -rw-r--r-- | sound/soc/dwc/designware_i2s.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index 593a3ea12d4c..70eb37a5dd16 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * ALSA SoC Synopsys I2S Audio Layer | 2 | * ALSA SoC Synopsys I2S Audio Layer |
| 3 | * | 3 | * |
| 4 | * sound/soc/spear/designware_i2s.c | 4 | * sound/soc/dwc/designware_i2s.c |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2010 ST Microelectronics | 6 | * Copyright (C) 2010 ST Microelectronics |
| 7 | * Rajeev Kumar <rajeev-dlh.kumar@st.com> | 7 | * Rajeev Kumar <rajeev-dlh.kumar@st.com> |
| @@ -396,7 +396,7 @@ static int dw_i2s_probe(struct platform_device *pdev) | |||
| 396 | } | 396 | } |
| 397 | 397 | ||
| 398 | if (cap & DWC_I2S_PLAY) { | 398 | if (cap & DWC_I2S_PLAY) { |
| 399 | dev_dbg(&pdev->dev, " SPEAr: play supported\n"); | 399 | dev_dbg(&pdev->dev, " designware: play supported\n"); |
| 400 | dw_i2s_dai->playback.channels_min = MIN_CHANNEL_NUM; | 400 | dw_i2s_dai->playback.channels_min = MIN_CHANNEL_NUM; |
| 401 | dw_i2s_dai->playback.channels_max = pdata->channel; | 401 | dw_i2s_dai->playback.channels_max = pdata->channel; |
| 402 | dw_i2s_dai->playback.formats = pdata->snd_fmts; | 402 | dw_i2s_dai->playback.formats = pdata->snd_fmts; |
| @@ -404,7 +404,7 @@ static int dw_i2s_probe(struct platform_device *pdev) | |||
| 404 | } | 404 | } |
| 405 | 405 | ||
| 406 | if (cap & DWC_I2S_RECORD) { | 406 | if (cap & DWC_I2S_RECORD) { |
| 407 | dev_dbg(&pdev->dev, "SPEAr: record supported\n"); | 407 | dev_dbg(&pdev->dev, "designware: record supported\n"); |
| 408 | dw_i2s_dai->capture.channels_min = MIN_CHANNEL_NUM; | 408 | dw_i2s_dai->capture.channels_min = MIN_CHANNEL_NUM; |
| 409 | dw_i2s_dai->capture.channels_max = pdata->channel; | 409 | dw_i2s_dai->capture.channels_max = pdata->channel; |
| 410 | dw_i2s_dai->capture.formats = pdata->snd_fmts; | 410 | dw_i2s_dai->capture.formats = pdata->snd_fmts; |
