|
@@ -398,12 +398,14 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
|
|
|
/* Generic McBSP register settings */
|
|
|
regs->spcr2 |= XINTM(3) | FREE;
|
|
|
regs->spcr1 |= RINTM(3);
|
|
|
- /* RFIG and XFIG are not defined in 34xx */
|
|
|
- if (!cpu_is_omap34xx() && !cpu_is_omap44xx()) {
|
|
|
+ /* RFIG and XFIG are not defined in 2430 and on OMAP3+ */
|
|
|
+ if (!mcbsp->pdata->has_ccr) {
|
|
|
regs->rcr2 |= RFIG;
|
|
|
regs->xcr2 |= XFIG;
|
|
|
}
|
|
|
- if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
|
|
|
+
|
|
|
+ /* Configure XCCR/RCCR only for revisions which have ccr registers */
|
|
|
+ if (mcbsp->pdata->has_ccr) {
|
|
|
regs->xccr = DXENDLY(1) | XDMAEN | XDISABLE;
|
|
|
regs->rccr = RFULL_CYCLE | RDMAEN | RDISABLE;
|
|
|
}
|