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

Unverified Commit e2ab6dd5 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 078b3a02 db51707b

sound/soc/rockchip/rockchip_i2s.c

+3 −2
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream, 
		val |= I2S_CHN_4;

		break;

	case 2:

	case 1:

		val |= I2S_CHN_2;

		break;

	default:
@@ -460,7 +461,7 @@ static struct snd_soc_dai_driver rockchip_i2s_dai = { 
	},

	.capture = {

		.stream_name = "Capture",

		.channels_min = 2,

		.channels_min = 1,

		.channels_max = 2,

		.rates = SNDRV_PCM_RATE_8000_192000,

		.formats = (SNDRV_PCM_FMTBIT_S8 |
@@ -660,7 +661,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) 
	}



	if (!of_property_read_u32(node, "rockchip,capture-channels", &val)) {

		if (val >= 2 && val <= 8)

		if (val >= 1 && val <= 8)

			soc_dai->capture.channels_max = val;

	}