From 08a4ed8fe794a2b2b52147bd5535fe0954822e95 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 27 Jun 2012 14:34:53 -0700
Subject: altos: include targe SPI speed in get request

STM needs it to be provided when enabling the SPI device, so just fix
AVR and cc1111 to do the same.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/stm/ao_arch_funcs.h | 19 ++++++++-----------
 src/stm/ao_spi_stm.c    |  6 ++----
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'src/stm')

diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
index 62b10063..7820bf79 100644
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -22,8 +22,12 @@
  */
 extern uint8_t	ao_spi_mutex[STM_NUM_SPI];
 
+#define AO_SPI_SPEED_FAST	STM_SPI_CR1_BR_PCLK_4
+#define AO_SPI_SPEED_1MHz	STM_SPI_CR1_BR_PCLK_16
+#define AO_SPI_SPEED_200kHz	STM_SPI_CR1_BR_PCLK_256
+
 void
-ao_spi_get(uint8_t spi_index);
+ao_spi_get(uint8_t spi_index, uint32_t speed);
 
 void
 ao_spi_put(uint8_t spi_index);
@@ -40,20 +44,13 @@ ao_spi_recv(void *block, uint16_t len, uint8_t spi_index);
 void
 ao_spi_duplex(void *out, void *in, uint16_t len, uint8_t spi_index);
 
-#define AO_SPI_SPEED_FAST	STM_SPI_CR1_BR_PCLK_16
-#define AO_SPI_SPEED_200kHz	STM_SPI_CR1_BR_PCLK_256
-
 extern uint16_t	ao_spi_speed[STM_NUM_SPI];
 
-#define ao_spi_slow(bus)	(ao_spi_speed[bus] = AO_SPI_SPEED_200kHz)
-
-#define ao_spi_fast(bus)	(ao_spi_speed[bus] = AO_SPI_SPEED_FAST)
-
 void
 ao_spi_init(void);
 
-#define ao_spi_get_mask(reg,mask,bus) do {		\
-		ao_spi_get(bus);			\
+#define ao_spi_get_mask(reg,mask,bus, speed) do {		\
+		ao_spi_get(bus, speed);				\
 		(reg)->bsrr = ((uint32_t) mask) << 16;	\
 	} while (0)
 
@@ -62,7 +59,7 @@ ao_spi_init(void);
 		ao_spi_put(bus);		\
 	} while (0)
 
-#define ao_spi_get_bit(reg,bit,pin,bus) ao_spi_get_mask(reg,(1<<bit),bus)
+#define ao_spi_get_bit(reg,bit,pin,bus,speed) ao_spi_get_mask(reg,(1<<bit),bus,speed)
 #define ao_spi_put_bit(reg,bit,pin,bus) ao_spi_put_mask(reg,(1<<bit),bus)
 
 #define ao_enable_port(port) do {					\
diff --git a/src/stm/ao_spi_stm.c b/src/stm/ao_spi_stm.c
index 26227086..547de9e5 100644
--- a/src/stm/ao_spi_stm.c
+++ b/src/stm/ao_spi_stm.c
@@ -24,7 +24,6 @@ struct ao_spi_stm_info {
 };
 
 uint8_t		ao_spi_mutex[STM_NUM_SPI];
-uint16_t	ao_spi_speed[STM_NUM_SPI];
 
 static const struct ao_spi_stm_info ao_spi_stm_info[STM_NUM_SPI] = {
 	{
@@ -268,7 +267,7 @@ ao_spi_duplex(void *out, void *in, uint16_t len, uint8_t spi_index)
 }
 
 void
-ao_spi_get(uint8_t spi_index)
+ao_spi_get(uint8_t spi_index, uint32_t speed)
 {
 	struct stm_spi	*stm_spi = ao_spi_stm_info[spi_index].stm_spi;
 
@@ -283,7 +282,7 @@ ao_spi_get(uint8_t spi_index)
 			(1 << STM_SPI_CR1_SSI) |			/*  ... */
 			(0 << STM_SPI_CR1_LSBFIRST) |			/* Big endian */
 			(1 << STM_SPI_CR1_SPE) |			/* Enable SPI unit */
-			(ao_spi_speed[spi_index] << STM_SPI_CR1_BR) |	/* baud rate to pclk/4 */
+			(speed << STM_SPI_CR1_BR) |	/* baud rate to pclk/4 */
 			(1 << STM_SPI_CR1_MSTR) |
 			(0 << STM_SPI_CR1_CPOL) |			/* Format 0 */
 			(0 << STM_SPI_CR1_CPHA));
@@ -311,7 +310,6 @@ ao_spi_channel_init(uint8_t spi_index)
 			(0 << STM_SPI_CR2_SSOE) |
 			(0 << STM_SPI_CR2_TXDMAEN) |
 			(0 << STM_SPI_CR2_RXDMAEN));
-	ao_spi_speed[spi_index] = AO_SPI_SPEED_FAST;
 }
 
 void
-- 
cgit v1.2.3