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

Commit 441c93ed authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus

parents 39c36ad0 77010010
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -742,13 +742,13 @@ static int config_setup(struct i2s_dai *i2s)
		return -EAGAIN;
	}

	/* Don't bother RFS, BFS & PSR in Slave mode */
	if (is_slave(i2s))
		return 0;

	set_bfs(i2s, bfs);
	set_rfs(i2s, rfs);

	/* Don't bother with PSR in Slave mode */
	if (is_slave(i2s))
		return 0;

	if (!(i2s->quirks & QUIRK_NO_MUXPSR)) {
		psr = i2s->rclk_srcrate / i2s->frmclk / rfs;
		writel(((psr - 1) << 8) | PSR_PSREN, i2s->addr + I2SPSR);