Skip to content

boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.c: Fails to compile #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acassis merged 1 commit into from
Jan 9, 2020
Merged

boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.c: Fails to compile #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ void enable_mic_in_fmt24(uint8_t mic_num)
write_bca_reg(mic_ch_sell[i], TRANS_CH_NO_SELECT);
}

write_bca_reg(BCA_CLK_EN_AHBMSTR_MIC_EN, 1);
write_bca_reg(BCA_CLK_EN_AHBMASTER_MIC_EN, 1);
write_bca_reg(BCA_MIC_IN_START_ADR, 0x00000000);
write_bca_reg(BCA_MIC_IN_SAMPLE_NO, 0);
}
Expand Down Expand Up @@ -383,7 +383,7 @@ void enable_mic_in_fmt16(uint8_t mic_num)
write_bca_reg(mic_ch_sell[i], TRANS_CH_NO_SELECT);
}

write_bca_reg(BCA_CLK_EN_AHBMSTR_MIC_EN, 1);
write_bca_reg(BCA_CLK_EN_AHBMASTER_MIC_EN, 1);
write_bca_reg(BCA_MIC_IN_START_ADR, 0x00000000);
write_bca_reg(BCA_MIC_IN_SAMPLE_NO, 0);
}
Expand All @@ -393,7 +393,7 @@ void enable_i2s1_out_fmt24(void)
write_bca_reg(BCA_I2S1_OUT_SD1_L_SEL, I2S_OUT_SEL_SD1L);
write_bca_reg(BCA_I2S1_OUT_SD1_R_SEL, I2S_OUT_SEL_SD1R);
write_bca_reg(BCA_I2S1_OUT_BITWT, 0);
write_bca_reg(BCA_CLK_EN_AHBMSTR_I2S1_EN, 1);
write_bca_reg(BCA_CLK_EN_AHBMASTER_I2S1_EN, 1);
write_bca_reg(BCA_I2S1_OUT_START_ADR, 0x00000000);
write_bca_reg(BCA_I2S2_OUT_SAMPLE_NO, 0);
}
Expand All @@ -403,7 +403,7 @@ void enable_i2s1_out_fmt16(void)
write_bca_reg(BCA_I2S1_OUT_SD1_L_SEL, I2S_OUT_SEL_SD1L);
write_bca_reg(BCA_I2S1_OUT_SD1_R_SEL, I2S_OUT_SEL_SD1R);
write_bca_reg(BCA_I2S1_OUT_BITWT, 1);
write_bca_reg(BCA_CLK_EN_AHBMSTR_I2S1_EN, 1);
write_bca_reg(BCA_CLK_EN_AHBMASTER_I2S1_EN, 1);
write_bca_reg(BCA_I2S1_OUT_START_ADR, 0x00000000);
write_bca_reg(BCA_I2S2_OUT_SAMPLE_NO, 0);
}
Expand All @@ -413,7 +413,7 @@ void enable_i2s2_out_fmt24(void)
write_bca_reg(BCA_I2S2_OUT_SD1_L_SEL, I2S_OUT_SEL_SD1L);
write_bca_reg(BCA_I2S2_OUT_SD1_R_SEL, I2S_OUT_SEL_SD1R);
write_bca_reg(BCA_I2S2_OUT_BITWT, 0);
write_bca_reg(BCA_CLK_EN_AHBMSTR_I2S2_EN, 1);
write_bca_reg(BCA_CLK_EN_AHBMASTER_I2S2_EN, 1);
write_bca_reg(BCA_I2S2_OUT_START_ADR, 0x00000000);
write_bca_reg(BCA_I2S2_OUT_SAMPLE_NO, 0);
}
Expand All @@ -423,7 +423,7 @@ void enable_i2s2_out_fmt16(void)
write_bca_reg(BCA_I2S2_OUT_SD1_L_SEL, I2S_OUT_SEL_SD1L);
write_bca_reg(BCA_I2S2_OUT_SD1_R_SEL, I2S_OUT_SEL_SD1R);
write_bca_reg(BCA_I2S2_OUT_BITWT, 1);
write_bca_reg(BCA_CLK_EN_AHBMSTR_I2S2_EN, 1);
write_bca_reg(BCA_CLK_EN_AHBMASTER_I2S2_EN, 1);
write_bca_reg(BCA_I2S2_OUT_START_ADR, 0x00000000);
write_bca_reg(BCA_I2S2_OUT_SAMPLE_NO, 0);
}
Expand All @@ -434,8 +434,8 @@ void enable_i2s2_out_fmt16(void)

void cxd56_audio_bca_reg_clear_bck_err_int(void)
{
write_bca_reg(BCA_INT_M_I2S1_BCK_ERR1, 0);
write_bca_reg(BCA_INT_M_I2S1_BCK_ERR2, 0);
write_bca_reg(BCA_INT_M_I2S1_BCL_ERR1, 0);
write_bca_reg(BCA_INT_M_I2S1_BCL_ERR2, 0);
}

void cxd56_audio_bca_reg_set_smaster(void)
Expand Down Expand Up @@ -657,7 +657,7 @@ bool cxd56_audio_bca_reg_is_dma_fifo_empty(cxd56_audio_dma_t handle)
break;

default:
reg_id = BCA_I2S2_OUT_RTD_TRG;
reg_id = BCA_I2S2_OUT_RTF_TRG;
break;
}

Expand Down Expand Up @@ -910,11 +910,11 @@ void cxd56_audio_bca_reg_start_dma(cxd56_audio_dma_t handle,
break;

case CXD56_AUDIO_DMAC_I2S0_DOWN:
reg_id = BCA_I2S1_OUT_RTD_TRG;
reg_id = BCA_I2S1_OUT_RTF_TRG;
break;

default:
reg_id = BCA_I2S2_OUT_RTD_TRG;
reg_id = BCA_I2S2_OUT_RTF_TRG;
break;
}

Expand All @@ -932,11 +932,11 @@ void cxd56_audio_bca_reg_stop_dma(cxd56_audio_dma_t handle)
break;

case CXD56_AUDIO_DMAC_I2S0_DOWN:
reg_id = BCA_I2S1_OUT_RTD_TRG;
reg_id = BCA_I2S1_OUT_RTF_TRG;
break;

default:
reg_id = BCA_I2S2_OUT_RTD_TRG;
reg_id = BCA_I2S2_OUT_RTF_TRG;
break;
}

Expand Down Expand Up @@ -1160,11 +1160,11 @@ uint32_t cxd56_audio_bca_reg_get_dma_state(cxd56_audio_dma_t handle)
break;

case CXD56_AUDIO_DMAC_I2S0_DOWN:
reg_id = BCA_I2S1_OUT_RTD_TRG;
reg_id = BCA_I2S1_OUT_RTF_TRG;
break;

default:
reg_id = BCA_I2S2_OUT_RTD_TRG;
reg_id = BCA_I2S2_OUT_RTF_TRG;
break;
}

Expand Down