diff options
| author | Keith Packard <keithp@keithp.com> | 2013-02-24 00:20:54 -0800 | 
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-02-24 00:20:54 -0800 | 
| commit | 2120d362cefceba69e75996b6391d9558978c01d (patch) | |
| tree | 6382a7e3ac47779e13ffea66601290fad2182536 /src/stm/ao_arch_funcs.h | |
| parent | 5246acb70b79980de36bd5d0ba0d017529ae9a78 (diff) | |
| parent | a04c4f7b07e97d568f8f6f56dd363329817fb52c (diff) | |
Merge branch 'telescience-v0.2'
Diffstat (limited to 'src/stm/ao_arch_funcs.h')
| -rw-r--r-- | src/stm/ao_arch_funcs.h | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h index 87bbe73e..d1779307 100644 --- a/src/stm/ao_arch_funcs.h +++ b/src/stm/ao_arch_funcs.h @@ -23,7 +23,7 @@  /* PCLK is set to 16MHz (HCLK 32MHz, APB prescaler 2) */ -#define AO_SPI_SPEED_8MHz	STM_SPI_CR1_BR_PCLK_2	/* This doesn't appear to work */ +#define AO_SPI_SPEED_8MHz	STM_SPI_CR1_BR_PCLK_2  #define AO_SPI_SPEED_4MHz	STM_SPI_CR1_BR_PCLK_4  #define AO_SPI_SPEED_2MHz	STM_SPI_CR1_BR_PCLK_8  #define AO_SPI_SPEED_1MHz	STM_SPI_CR1_BR_PCLK_16 @@ -32,7 +32,7 @@  #define AO_SPI_SPEED_125kHz	STM_SPI_CR1_BR_PCLK_128  #define AO_SPI_SPEED_62500Hz	STM_SPI_CR1_BR_PCLK_256 -#define AO_SPI_SPEED_FAST	AO_SPI_SPEED_4MHz +#define AO_SPI_SPEED_FAST	AO_SPI_SPEED_8MHz  /* Companion bus wants something no faster than 200kHz */  | 
