CS7000: use hardware SPI for HR_C6000 control interface

platform/drivers/audio/audio_CS7000.cpp

@@ -27,6 +27,7 @@
 #include <threads.h>
 #include <state.h>
 #include <HR_C6000.h>
+#include <spi_stm32.h>
 #include "stm32_dac.h"
 #include "stm32_adc.h"
 #include "Cx000_dac.h"
@@ -73,16 +74,16 @@ void audio_init()
     gpio_setMode(BEEP_OUT, ANALOG);
     gpio_setMode(AIN_MIC,  ANALOG);
     gpio_setMode(AIN_RTX,  ANALOG);
-    gpio_setMode(C6K_CLK,  OUTPUT);
-    gpio_setMode(C6K_MOSI, OUTPUT);
-    gpio_setMode(C6K_MISO, INPUT);
+    gpio_setMode(C6K_CLK,  ALTERNATE | ALTERNATE_FUNC(5));
+    gpio_setMode(C6K_MOSI, ALTERNATE | ALTERNATE_FUNC(5));
+    gpio_setMode(C6K_MISO, ALTERNATE | ALTERNATE_FUNC(5));
 
     stm32dac_init(STM32_DAC_CH2, 2048);
     stm32adc_init(STM32_ADC_ADC2);
 
     gpioDev_clear(C6K_SLEEP);
     delayMs(10);
-    spi_init((const struct spiDevice *) &c6000_spi);
+    spiStm32_init(&c6000_spi, 11000000, SPI_FLAG_CPHA);
     C6000.init();
 
     pthread_attr_t attr;

platform/targets/CS7000/hwconfig.c

@@ -19,6 +19,7 @@
 #include <spi_bitbang.h>
 #include <spi_custom.h>
 #include <adc_stm32.h>
+#include <spi_stm32.h>
 #include <SKY72310.h>
 #include <hwconfig.h>
 #include <pthread.h>
@@ -87,49 +88,6 @@ static uint8_t spiSr_func(const void *priv, uint8_t value)
     return 0;
 }
 
-/**
- * SPI bitbang function for HR_C6000 command interface (U_SPI).
- *
- * Hand-tuned to be as fast as possible, gives the following clock performance
- * when compiled with -Os and run on STM32F405 at 168MHz:
- *
- * - Freq 6.46MHz
- * - Pos. width 71ns
- * - Neg. with 83ns
- */
-static uint8_t spiC6000_func(const void *priv, uint8_t value)
-{
-    (void) priv;
-    uint8_t incoming = 0;
-
-    __disable_irq();
-
-    for(uint8_t cnt = 0; cnt < 8; cnt++)
-    {
-        GPIOB->BSRR = (1 << 13);    // Set PB13 (CLK)
-
-        if(value & (0x80 >> cnt))
-            GPIOB->BSRR = 1 << 15;  // Set PB15 (MOSI)
-        else
-            GPIOB->BSRR = 1 << 31;  // Clear PB15 (MOSI)
-
-        // ~70ns delay
-        asm volatile("           mov   r1, #1     \n"
-                     "___loop_1: cmp   r1, #0     \n"
-                     "           itt   ne         \n"
-                     "           subne r1, r1, #1 \n"
-                     "           bne   ___loop_1  \n":::"r1");
-
-        incoming <<= 1;
-        GPIOB->BSRR = (1 << 29);                // Clear PB13 (CLK)
-        incoming |= (GPIOB->IDR >> 14) & 0x01;  // Read PB14 (MISO)
-    }
-
-    __enable_irq();
-
-    return incoming;
-}
-
 static const struct gpioPin shiftRegStrobe = { GPIOEXT_STR };
 static pthread_mutex_t adc1Mutex;
 static pthread_mutex_t c6000_mutex;
@@ -138,7 +96,7 @@ SPI_CUSTOM_DEVICE_DEFINE(spiSr,      spiSr_func,    NULL, NULL)
 SPI_BITBANG_DEVICE_DEFINE(flash_spi, spiFlashCfg,   NULL)
 SPI_BITBANG_DEVICE_DEFINE(det_spi,   spiDetCfg,     NULL)
 SPI_BITBANG_DEVICE_DEFINE(pll_spi,   spiPllCfg,     NULL)
-SPI_CUSTOM_DEVICE_DEFINE(c6000_spi,  spiC6000_func, NULL, &c6000_mutex)
+SPI_STM32_DEVICE_DEFINE(c6000_spi,   SPI2,          &c6000_mutex)
 GPIO_SHIFTREG_DEVICE_DEFINE(extGpio, (const struct spiDevice *) &spiSr, shiftRegStrobe, 24)
 ADC_STM32_DEVICE_DEFINE(adc1, ADC1, &adc1Mutex, 3300000)
 

platform/targets/CS7000/hwconfig.h

@@ -45,7 +45,7 @@ extern const struct spiCustomDevice spiSr;
 extern const struct spiCustomDevice flash_spi;
 extern const struct spiCustomDevice det_spi;
 extern const struct spiCustomDevice pll_spi;
-extern const struct spiCustomDevice c6000_spi;
+extern const struct spiDevice c6000_spi;
 extern const struct gpioDev extGpio;
 extern const struct ak2365a detector;
 extern const struct sky73210 pll;