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

Commit 40448e5e authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Do not touch 0x04 register above McASP_VERSION_2 



This register is not defined in TI81xx and on AM335x/AM437x it is the
SYSCONFIG register which should not be touched by drivers since it is
related to PM and handled by the generic PM code.
This register write was there since the first time the davinci-mcasp driver
was appeared in the kernel.
The reason why it did not caused any issues on AM335x/AM437x is that it sets
bit 1 in SYSCONFIG register which in turn will enable the smart-idle mode.
This is the default mode and this is the mode McASP should be in also when
in use.
On TI81xx the register is not defined.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 3c25f916

sound/soc/davinci/davinci-mcasp.c

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ static int mcasp_common_hw_param(struct davinci_mcasp *mcasp, int stream, 
	int active_serializers, numevt, n;

	u32 reg;

	/* Default configuration */

	if (mcasp->version != MCASP_VERSION_4)

	if (mcasp->version < MCASP_VERSION_3)

		mcasp_set_bits(mcasp, DAVINCI_MCASP_PWREMUMGT_REG, MCASP_SOFT);



	/* All PINS as McASP */