Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e95e939d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/dwc' into asoc-next

parents c44ddeb8 22a4adf2

sound/soc/dwc/designware_i2s.c

+3 −3
Original line number Diff line number Diff line 
/*

 * ALSA SoC Synopsys I2S Audio Layer

 *

 * sound/soc/spear/designware_i2s.c

 * sound/soc/dwc/designware_i2s.c

 *

 * Copyright (C) 2010 ST Microelectronics

 * Rajeev Kumar <rajeev-dlh.kumar@st.com>
@@ -396,7 +396,7 @@ static int dw_i2s_probe(struct platform_device *pdev) 
	}



	if (cap & DWC_I2S_PLAY) {

		dev_dbg(&pdev->dev, " SPEAr: play supported\n");

		dev_dbg(&pdev->dev, " designware: play supported\n");

		dw_i2s_dai->playback.channels_min = MIN_CHANNEL_NUM;

		dw_i2s_dai->playback.channels_max = pdata->channel;

		dw_i2s_dai->playback.formats = pdata->snd_fmts;
@@ -404,7 +404,7 @@ static int dw_i2s_probe(struct platform_device *pdev) 
	}



	if (cap & DWC_I2S_RECORD) {

		dev_dbg(&pdev->dev, "SPEAr: record supported\n");

		dev_dbg(&pdev->dev, "designware: record supported\n");

		dw_i2s_dai->capture.channels_min = MIN_CHANNEL_NUM;

		dw_i2s_dai->capture.channels_max = pdata->channel;

		dw_i2s_dai->capture.formats = pdata->snd_fmts;