Merge remote-tracking branch 'upstream/master'

Conflicts:
	firmware/Makefile
	firmware/application/Makefile
	firmware/application/event_m0.cpp
	firmware/application/ui_setup.cpp
	firmware/application/ui_setup.hpp
	firmware/baseband/baseband_thread.cpp
	firmware/baseband/baseband_thread.hpp
	firmware/bootstrap/CMakeLists.txt
	firmware/common/message.hpp
	firmware/common/portapack_shared_memory.hpp
	hardware/.gitignore
This commit is contained in:
furrtek
2016-07-25 16:35:42 +02:00
138 changed files with 17603 additions and 1930 deletions

View File

@@ -200,8 +200,14 @@ static void sdio_cclk_set_400khz(void) {
}
static void sdio_cclk_set_fast(void) {
#if defined(PORTAPACK_FAST_SDIO)
/* 200MHz / (2 * 2) = 50MHz */
/* TODO: Adjust SCU pin configurations: pull-up/down, slew, glitch filter? */
sdio_cclk_set(2);
#else
/* 200MHz / (2 * 4) = 25MHz */
sdio_cclk_set(4);
#endif
}
static void sdio_width_set_1bit(void) {