Commit 20a41eac authored by Daniel Mack's avatar Daniel Mack Committed by Mark Brown
Browse files

ASoC: Fix name of register bit in pxa-ssp 



A bit in PXA's SSCR0 register was erroneously named ADC but its name is
in fact ACS (audio clock select).

Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 89492be8

arch/arm/mach-pxa/include/mach/regs-ssp.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#define SSCR0_TUM	(1 << 23)	/* Transmit FIFO underrun interrupt mask */

#define SSCR0_FRDC	(0x07000000)	/* Frame rate divider control (mask) */

#define SSCR0_SlotsPerFrm(x) (((x) - 1) << 24)	/* Time slots per frame [1..8] */

#define SSCR0_ADC	(1 << 30)	/* Audio clock select */

#define SSCR0_ACS	(1 << 30)	/* Audio clock select */

#define SSCR0_MOD	(1 << 31)	/* Mode (normal or network) */

#endif

sound/soc/pxa/pxa-ssp.c

+3 −3
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, 
	int val;



	u32 sscr0 = ssp_read_reg(ssp, SSCR0) &

		~(SSCR0_ECS |  SSCR0_NCS | SSCR0_MOD | SSCR0_ADC);

		~(SSCR0_ECS |  SSCR0_NCS | SSCR0_MOD | SSCR0_ACS);



	dev_dbg(&ssp->pdev->dev,

		"pxa_ssp_set_dai_sysclk id: %d, clk_id %d, freq %d\n",
@@ -328,7 +328,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, 
	case PXA_SSP_CLK_AUDIO:

		priv->sysclk = 0;

		ssp_set_scr(&priv->dev, 1);

		sscr0 |= SSCR0_ADC;

		sscr0 |= SSCR0_ACS;

		break;

	default:

		return -ENODEV;
@@ -524,7 +524,7 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai, 


	/* reset port settings */

	sscr0 = ssp_read_reg(ssp, SSCR0) &

		(SSCR0_ECS |  SSCR0_NCS | SSCR0_MOD | SSCR0_ADC);

		(SSCR0_ECS |  SSCR0_NCS | SSCR0_MOD | SSCR0_ACS);

	sscr1 = SSCR1_RxTresh(8) | SSCR1_TxTresh(7);

	sspsp = 0;