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

Commit 7a22323b authored by Mark Brown's avatar Mark Brown Committed by Takashi Iwai
Browse files

[ALSA] soc - Support PXA3xx AC97 



The PXA3xx does not support the use of interrupts during reset and access
to the GPIO status requires similar handling to that for PXA27x.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d80fd093

sound/soc/pxa/pxa2xx-ac97.c

+27 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, 
	mutex_lock(&car_mutex);



	/* set up primary or secondary codec/modem space */

#ifdef CONFIG_PXA27x

#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)

	reg_addr = ac97->num ? &SAC_REG_BASE : &PAC_REG_BASE;

#else

	if (reg == AC97_GPIO_STATUS)
@@ -111,7 +111,7 @@ static void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg, 
	mutex_lock(&car_mutex);



	/* set up primary or secondary codec/modem space */

#ifdef CONFIG_PXA27x

#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)

	reg_addr = ac97->num ? &SAC_REG_BASE : &PAC_REG_BASE;

#else

	if (reg == AC97_GPIO_STATUS)
@@ -134,6 +134,9 @@ static void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg, 


static void pxa2xx_ac97_warm_reset(struct snd_ac97 *ac97)

{

#ifdef CONFIG_PXA3xx

	int timeout = 100;

#endif

	gsr_bits = 0;



#ifdef CONFIG_PXA27x
@@ -144,6 +147,11 @@ static void pxa2xx_ac97_warm_reset(struct snd_ac97 *ac97) 
	GCR |= GCR_WARM_RST;

	pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);

	udelay(500);

#elif defined(CONFIG_PXA3xx)

	/* Can't use interrupts */

	GCR |= GCR_WARM_RST;

	while (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)) && timeout--)

		mdelay(1);

#else

	GCR |= GCR_WARM_RST | GCR_PRIRDY_IEN | GCR_SECRDY_IEN;

	wait_event_timeout(gsr_wq, gsr_bits & (GSR_PCR | GSR_SCR), 1);
@@ -159,6 +167,16 @@ static void pxa2xx_ac97_warm_reset(struct snd_ac97 *ac97) 


static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97)

{

#ifdef CONFIG_PXA3xx

	int timeout = 1000;



	/* Hold CLKBPB for 100us */

	GCR = 0;

	GCR = GCR_CLKBPB;

	udelay(100);

	GCR = 0;

#endif



	GCR &=  GCR_COLD_RST;  /* clear everything but nCRST */

	GCR &= ~GCR_COLD_RST;  /* then assert nCRST */
@@ -170,6 +188,13 @@ static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97) 
	clk_disable(ac97conf_clk);

	GCR = GCR_COLD_RST;

	udelay(50);

#elif defined(CONFIG_PXA3xx)

	/* Can't use interrupts on PXA3xx */

	GCR &= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN);



	GCR = GCR_WARM_RST | GCR_COLD_RST;

	while (!(GSR & (GSR_PCR | GSR_SCR)) && timeout--)

		mdelay(10);

#else

	GCR = GCR_COLD_RST;

	GCR |= GCR_CDONE_IE|GCR_SDONE_IE;