diff --git a/libraries/AP_HAL_ChibiOS/SPIDevice.cpp b/libraries/AP_HAL_ChibiOS/SPIDevice.cpp
index e766ad0840..aaf997dc2c 100644
--- a/libraries/AP_HAL_ChibiOS/SPIDevice.cpp
+++ b/libraries/AP_HAL_ChibiOS/SPIDevice.cpp
@@ -143,6 +143,7 @@ SPIDesc SPIDeviceManager::device_table[] = {
     SPIDesc("icm20608",       SPI_BUS_SENSORS,  SPIDEV_ICM,           SPIDEV_CS_ICM,        SPIDEV_MODE3, 1*MHZ, 8*MHZ ),
     SPIDesc("hmc5843",        SPI_BUS_SENSORS,  SPIDEV_MAG,           SPIDEV_CS_MAG,        SPIDEV_MODE3, 11*MHZ, 11*MHZ ),
     SPIDesc("ramtron",        SPI_BUS_RAMTRON,  SPIDEV_RAMTROM,       SPIDEV_CS_RAMTRON,    SPIDEV_MODE3, 8*MHZ, 8*MHZ ),
+    SPIDesc("lis3mdl",        SPI_BUS_SENSORS,  SPIDEV_MAG,           SPIDEV_CS_MAG,        SPIDEV_MODE3, 500*KHZ, 500*KHZ),
 #endif
 };
 
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
index df41337228..c9f597bbfe 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
@@ -74,7 +74,7 @@ PB15 SPI2_MOSI SPI2
 
 PC0 VBUS_VALID INPUT
 PC1 RSSI_IN ADC1
-PC2 MPU9250_CS CS
+PC2 MPU9250_CS SPI1 CS
 PC3 LED_SAFETY OUTPUT
 PC4 SAFETY_IN INPUT
 PC5 VDD_PERIPH_EN OUTPUT HIGH
@@ -88,7 +88,7 @@ PC12 SDIO_CK SDIO
 
 PC13 SBUS_INV OUTPUT
 PC14 20608_DRDY INPUT
-PC15 20608_CS CS
+PC15 20608_CS SPI1 CS
 
 PD0 CAN1_RX CAN1
 PD1 CAN1_TX CAN1
@@ -100,12 +100,12 @@ PD4 USART2_RTS USART2
 PD5 USART2_TX USART2
 PD6 USART2_RX USART2
 
-PD7 BARO_CS CS
+PD7 BARO_CS SPI2 CS
 
 # USART3 serial3 telem2
 PD8 USART3_TX USART3
 PD9 USART3_RX USART3
-PD10 FRAM_CS CS
+PD10 FRAM_CS SPI2 CS
 PD11 USART3_CTS USART3
 PD12 USART3_RTS USART3
 
@@ -132,7 +132,4 @@ PE11 TIM1_CH2 TIM1 # FMU_CH3
 PE12 HMC5983_DRDY INPUT
 PE13 TIM1_CH3 TIM1 # FMU_CH2
 PE14 TIM1_CH4 TIM1 # FMU_CH1
-PE15 HMC5983_CS CS
-
-
-
+PE15 HMC5983_CS SPI1 CS