Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit b1132b3d874dcef296a63b46680a41b02de66bb4

Authored by Haavard Skinnemoen
Committed by Takashi Iwai
1 parent 8a656496b2
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ALSA: ASoC: Fix at32-pcm build breakage with PM enabled 

s/PDC_PTCR/ATMEL_PDC_PTCR/

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

sound/soc/at32/at32-pcm.c
Diff comments   View file @ b1132b3
... ... @@ -434,7 +434,8 @@
434 434 params = prtd->params;
435 435  
436 436 /* Disable the PDC and save the PDC registers */
437   - ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_disable);
  437 + ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR,
  438 + params->mask->pdc_disable);
438 439  
439 440 prtd->pdc_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr);
440 441 prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr);
... ... @@ -464,7 +465,7 @@
464 465 ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->pdc_xnpr_save);
465 466 ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_save);
466 467  
467   - ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_enable);
  468 + ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR, params->mask->pdc_enable);
468 469 return 0;
469 470 }
470 471 #else /* CONFIG_PM */