Merge branch 'bugfix/i2s_apll_fixed_clock' into 'master'

i2s: fix apll bug introduced in 'refactor/i2s_driver'

Closes IDFGH-5824

See merge request espressif/esp-idf!15109
This commit is contained in:
Kevin (Lao Kaiyao)
2021-09-14 08:31:12 +00:00
5 changed files with 158 additions and 90 deletions

View File

@@ -595,7 +595,7 @@ TEST_CASE("i80 and i2s driver coexistance", "[lcd][i2s]")
.dma_buf_len = 60,
};
// I2S driver won't be installed as the same I2S port has been used by LCD
TEST_ASSERT_EQUAL(ESP_ERR_NOT_FOUND, i2s_driver_install(0, &i2s_config, 0, NULL));
TEST_ASSERT_EQUAL(ESP_ERR_INVALID_STATE, i2s_driver_install(0, &i2s_config, 0, NULL));
TEST_ESP_OK(esp_lcd_del_i80_bus(i80_bus));
}
#endif // SOC_I2S_LCD_I80_VARIANT