SAMD20: Add a framework for an SPI driver

ChangeLog

@@ -6621,4 +6621,7 @@
 	* arch/arm/src/samd/sam_sercom.c:  Move some common SERCOM logic
 	  from the USART-specific files to a share-able file where it can
 	  also be used by SPI and I2C drivers (2014-2-19).
+	* arch/arm/src/samd/sam_spi.c:  Add framework for a SAMD SPI driver.
+	  The initial check-in is a crude port of the SAMA5 SPI driver with
+	  a lot of missing logic (2014-2-19).
 

arch/arm/src/samd/sam_config.h

@@ -117,11 +117,11 @@
 
 /* Are any USARTs enabled? */
 
-#undef HAVE_USART
+#undef SAMD_HAVE_USART
 #if defined(SAMD_HAVE_USART0) || defined(SAMD_HAVE_USART1) || \
     defined(SAMD_HAVE_USART2) || defined(SAMD_HAVE_USART3) || \
     defined(SAMD_HAVE_USART4) || defined(SAMD_HAVE_USART5)
-#  define HAVE_USART 1
+#  define SAMD_HAVE_USART 1
 #endif
 
 /* Is there a serial console? There should be at most one defined.  It could be on
@@ -219,6 +219,15 @@
 #  undef CONFIG_SAMD_SERCOM5_ISSPI
 #endif
 
+/* Are any SERCOMs configured for SPI? */
+
+#undef SAMD_HAVE_SPI
+#if defined(SAMD_HAVE_SPI0) || defined(SAMD_HAVE_SPI1) || \
+    defined(SAMD_HAVE_SPI2) || defined(SAMD_HAVE_SPI3) || \
+    defined(SAMD_HAVE_SPI4) || defined(SAMD_HAVE_SPI5)
+#  define SAMD_HAVE_SPI 1
+#endif
+
 /* Are any SERCOM peripherals are configured as I2C peripherals? */
 
 #define SAMD_HAVE_I2C0 1
@@ -258,6 +267,15 @@
 #  undef CONFIG_SAMD_SERCOM5_ISI2C
 #endif
 
+/* Are any SERCOMs configured for I2C? */
+
+#undef SAMD_HAVE_I2C
+#if defined(SAMD_HAVE_I2C0) || defined(SAMD_HAVE_I2C1) || \
+    defined(SAMD_HAVE_I2C2) || defined(SAMD_HAVE_I2C3) || \
+    defined(SAMD_HAVE_I2C4) || defined(SAMD_HAVE_I2C5)
+#  define SAMD_HAVE_I2C 1
+#endif
+
 /************************************************************************************
  * Public Types
  ************************************************************************************/

arch/arm/src/samd/sam_lowputc.c

@@ -87,7 +87,7 @@
  *
  ****************************************************************************/
 
-#ifdef HAVE_USART
+#ifdef SAMD_HAVE_USART
 static void
 sam_wait_synchronization(const struct sam_usart_config_s * const config)
 {
@@ -103,7 +103,7 @@ sam_wait_synchronization(const struct sam_usart_config_s * const config)
  *
  ****************************************************************************/
 
-#ifdef HAVE_USART
+#ifdef SAMD_HAVE_USART
 static inline int
 sam_usart_configure(const struct sam_usart_config_s * const config)
 {
@@ -251,7 +251,7 @@ sam_usart_configure(const struct sam_usart_config_s * const config)
  *
  ****************************************************************************/
 
-#ifdef HAVE_USART
+#ifdef SAMD_HAVE_USART
 static inline void
 sam_pad_configure(const struct sam_usart_config_s * const config)
 {
@@ -289,7 +289,7 @@ sam_pad_configure(const struct sam_usart_config_s * const config)
  *
  *****************************************************************************/
 
-#ifdef HAVE_USART
+#ifdef SAMD_HAVE_USART
 int sam_usart_internal(const struct sam_usart_config_s * const config)
 {
   uint32_t regval;
@@ -328,7 +328,7 @@ int sam_usart_internal(const struct sam_usart_config_s * const config)
  *
  ****************************************************************************/
 
-#ifdef HAVE_USART
+#ifdef SAMD_HAVE_USART
 static inline void
 sam_usart_enable(const struct sam_usart_config_s * const config)
 {
@@ -381,7 +381,7 @@ void sam_lowsetup(void)
  *
  *****************************************************************************/
 
-#ifdef HAVE_USART
+#ifdef SAMD_HAVE_USART
 int sam_usart_initialize(const struct sam_usart_config_s * const config)
 {
   irqstate_t flags;
@@ -411,7 +411,7 @@ int sam_usart_initialize(const struct sam_usart_config_s * const config)
  *
  *****************************************************************************/
 
-#ifdef HAVE_USART
+#ifdef SAMD_HAVE_USART
 void sam_usart_reset(const struct sam_usart_config_s * const config)
 {
   uintptr_t regaddr = config->base + SAM_USART_CTRLA_OFFSET;

arch/arm/src/samd/sam_lowputc.h

@@ -91,7 +91,7 @@ void sam_lowsetup(void);
  *
  ****************************************************************************/
 
-#ifdef HAVE_USART
+#ifdef SAMD_HAVE_USART
 struct sam_usart_config_s;
 int sam_usart_initialize(const struct sam_usart_config_s * const config);
 #endif
@@ -105,7 +105,7 @@ int sam_usart_initialize(const struct sam_usart_config_s * const config);
  *
  ****************************************************************************/
 
-#ifdef HAVE_USART
+#ifdef SAMD_HAVE_USART
 struct sam_usart_config_s;
 void sam_usart_reset(const struct sam_usart_config_s * const config);
 #endif

arch/arm/src/samd/sam_serial.c

@@ -66,7 +66,7 @@
 #include "sam_lowputc.h"
 #include "sam_serial.h"
 
-#ifdef HAVE_USART
+#ifdef SAMD_HAVE_USART
 
 /****************************************************************************
  * Definitions
@@ -1082,5 +1082,5 @@ int up_putc(int ch)
 }
 
 #endif /* USE_SERIALDRIVER */
-#endif /* HAVE_USART */
+#endif /* SAMD_HAVE_USART */
 

arch/arm/src/samd/sam_spi.h

@@ -0,0 +1,268 @@
+/****************************************************************************
+ * arch/arm/src/samd/sam_spi.h
+ *
+ *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_SAMD_SAM_SPI_H
+#define __ARCH_ARM_SRC_SAMD_SAM_SPI_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "sam_config.h"
+
+#ifdef SAMD_HAVE_SPI
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Inline Functions
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name:  sam_spi[n]select, sam_spi[n]status, and sam_spi[n]cmddata
+ *
+ * Description:
+ *   These external functions must be provided by board-specific logic.  They
+ *   include:
+ *
+ *   o sam_spi[n]select is a functions to manage the board-specific chip
+ *     selects
+ *   o sam_spi[n]status and sam_spi[n]cmddata:  Implementations of the status
+ *     and cmddata methods of the SPI interface defined by struct spi_ops_
+ *     (see include/nuttx/spi/spi.h). All other methods including
+ *     up_spiinitialize()) are provided by common SAMD logic.
+ *
+ *   Where [n] is the SERCOM number for the SPI module.
+ *
+ *   To use this common SPI logic on your board:
+ *
+ *   1. Provide logic in sam_boardinitialize() to configure SPI chip select
+ *      pins.
+ *   2. Provide sam_spi[n]select() and sam_spi[n]status() functions in your
+ *      board-specific logic.  These functions will perform chip selection
+ *      and status operations using GPIOs in the way your board is configured.
+ *   2. If CONFIG_SPI_CMDDATA is defined in the NuttX configuration, provide
+ *      sam_spi[n]cmddata() functions in your board-specific logic.  This
+ *      function will perform cmd/data selection operations using GPIOs in
+ *      the way your board is configured.
+ *   3. Add a call to up_spiinitialize() in your low level application
+ *      initialization logic
+ *   4. The handle returned by up_spiinitialize() may then be used to bind
+ *      the  SPI driver to higher level logic (e.g., calling
+ *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
+ *      the SPI MMC/SD driver).
+ *
+ ****************************************************************************/
+
+struct spi_dev_s;
+enum spi_dev_e;
+
+/****************************************************************************
+ * Name: sam_spi[n]select
+ *
+ * Description:
+ *   PIO chip select pins may be programmed by the board specific logic in
+ *   one of two different ways.  First, the pins may be programmed as SPI
+ *   peripherals.  In that case, the pins are completely controlled by the
+ *   SPI driver.  This method still needs to be provided, but it may be only
+ *   a stub.
+ *
+ *   An alternative way to program the PIO chip select pins is as a normal
+ *   GPIO output.  In that case, the automatic control of the CS pins is
+ *   bypassed and this function must provide control of the chip select.
+ *   NOTE:  In this case, the GPIO output pin does *not* have to be the
+ *   same as the NPCS pin normal associated with the chip select number.
+ *
+ * Input Parameters:
+ *   dev - SPI device info
+ *   devid - Identifies the (logical) device
+ *   selected - TRUE:Select the device, FALSE:De-select the device
+ *
+ * Returned Values:
+ *   None
+ *
+ ****************************************************************************/
+
+#ifdef SAMD_HAVE_SPI0
+void sam_spi0select(enum spi_dev_e devid, bool selected);
+#endif
+
+#ifdef SAMD_HAVE_SPI1
+void sam_spi1select(enum spi_dev_e devid, bool selected);
+#endif
+
+#ifdef SAMD_HAVE_SPI2
+void sam_spi2select(enum spi_dev_e devid, bool selected);
+#endif
+
+#ifdef SAMD_HAVE_SPI3
+void sam_spi3select(enum spi_dev_e devid, bool selected);
+#endif
+
+#ifdef SAMD_HAVE_SPI4
+void sam_spi4select(enum spi_dev_e devid, bool selected);
+#endif
+
+#ifdef SAMD_HAVE_SPI5
+void sam_spi5select(enum spi_dev_e devid, bool selected);
+#endif
+
+/****************************************************************************
+ * Name: sam_spi[n]status
+ *
+ * Description:
+ *   Return status information associated with the SPI device.
+ *
+ * Input Parameters:
+ *   dev - SPI device info
+ *   devid - Identifies the (logical) device
+ *
+ * Returned Values:
+ *   Bit-encoded SPI status (see include/nuttx/spi/spi.h.
+ *
+ ****************************************************************************/
+
+#ifdef SAMD_HAVE_SPI0
+uint8_t sam_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+#endif
+
+#ifdef SAMD_HAVE_SPI1
+uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+#endif
+
+#ifdef SAMD_HAVE_SPI2
+uint8_t sam_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+#endif
+
+#ifdef SAMD_HAVE_SPI3
+uint8_t sam_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+#endif
+
+#ifdef SAMD_HAVE_SPI4
+uint8_t sam_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+#endif
+
+#ifdef SAMD_HAVE_SPI5
+uint8_t sam_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+#endif
+
+/****************************************************************************
+ * Name: sam_spi[n]cmddata
+ *
+ * Description:
+ *   Some SPI devices require an additional control to determine if the SPI
+ *   data being sent is a command or is data.  If CONFIG_SPI_CMDDATA then
+ *   this function will be called to different be command and data transfers.
+ *
+ *   This is often needed, for example, by LCD drivers.  Some LCD hardware
+ *   may be configured to use 9-bit data transfers with the 9th bit
+ *   indicating command or data.  That same hardware may be configurable,
+ *   instead, to use 8-bit data but to require an additional, board-
+ *   specific GPIO control to distinguish command and data.  This function
+ *   would be needed in that latter case.
+ *
+ * Input Parameters:
+ *   dev - SPI device info
+ *   devid - Identifies the (logical) device
+ *
+ * Returned Values:
+ *   Zero on success; a negated errno on failure.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SPI_CMDDATA
+#ifdef SAMD_HAVE_SPI0
+int sam_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+#endif
+
+#ifdef SAMD_HAVE_SPI1
+int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+#endif
+
+#ifdef SAMD_HAVE_SPI2
+int sam_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+#endif
+
+#ifdef SAMD_HAVE_SPI3
+int sam_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+#endif
+
+#ifdef SAMD_HAVE_SPI4
+int sam_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+#endif
+
+#ifdef SAMD_HAVE_SPI5
+int sam_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+#endif
+#endif
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* SAMD_HAVE_SPI */
+#endif /* __ARCH_ARM_SRC_SAMD_SAM_SPI_H */

configs/samd20-xplained/src/sam_spi.c

@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
  * configs/samd20-xplained/src/sam_spi.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
@@ -31,11 +31,11 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Included Files
- ************************************************************************************/
+ ****************************************************************************/
 
 #include <nuttx/config.h>
 
@@ -48,14 +48,15 @@
 #include "sam_config.h"
 #include "sam_port.h"
 #include "sam_spi.h"
+
 #include "samd20-xplained.h"
 
-#ifdef SAMD_HAVE_SPI0
+#ifdef SAMD_HAVE_SPI
 
-/************************************************************************************
+/****************************************************************************
- * Definitions
+ * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/
-/* Configuration ********************************************************************/
+/* Configuration ************************************************************/
 
 #if defined(CONFIG_SAM4L_XPLAINED_IOMODULE) && \
     defined(CONFIG_SAM4L_XPLAINED_OLED1MODULE) && defined(CONFIG_SPI_OWNBUS)
@@ -80,21 +81,22 @@
 #  define spivdbg(x...)
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Private Functions
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Public Functions
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Name: sam_spiinitialize
  *
  * Description:
- *   Called to configure SPI chip select PORT pins for the SAM3U10E-EVAL board.
+ *   Called to configure SPI chip select PORT pins for the SAMD20 Xplained
+ *   Pro board.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 void weak_function sam_spiinitialize(void)
 {
@@ -116,40 +118,43 @@ void weak_function sam_spiinitialize(void)
 }
 
 /****************************************************************************
- * Name:  sam_spiselect, sam_spistatus, and sam_spicmddata
+ * Name:  sam_spi[n]select, sam_spi[n]status, and sam_spi[n]cmddata
  *
  * Description:
  *   These external functions must be provided by board-specific logic.  They
  *   include:
  *
- *   o sam_spiselect is a functions tomanage the board-specific chip selects
+ *   o sam_spi[n]select is a functions to manage the board-specific chip
- *   o sam_spistatus and sam_spicmddata:  Implementations of the status
+ *     selects
+ *   o sam_spi[n]status and sam_spi[n]cmddata:  Implementations of the status
  *     and cmddata methods of the SPI interface defined by struct spi_ops_
  *     (see include/nuttx/spi/spi.h). All other methods including
- *     up_spiinitialize()) are provided by common SAM3/4 logic.
+ *     up_spiinitialize()) are provided by common SAMD logic.
  *
- *  To use this common SPI logic on your board:
+ *   Where [n] is the SERCOM number for the SPI module.
+ *
+ *   To use this common SPI logic on your board:
  *
  *   1. Provide logic in sam_boardinitialize() to configure SPI chip select
  *      pins.
- *   2. Provide sam_spiselect() and sam_spistatus() functions in your board-
+ *   2. Provide sam_spi[n]select() and sam_spi[n]status() functions in your
- *      specific logic.  These functions will perform chip selection and
+ *      board-specific logic.  These functions will perform chip selection
- *      status operations using PORTs in the way your board is configured.
+ *      and status operations using GPIOs in the way your board is configured.
  *   2. If CONFIG_SPI_CMDDATA is defined in the NuttX configuration, provide
- *      sam_spicmddata() functions in your board-specific logic.  This
+ *      sam_spi[n]cmddata() functions in your board-specific logic.  This
- *      function will perform cmd/data selection operations using PORTs in
+ *      function will perform cmd/data selection operations using GPIOs in
  *      the way your board is configured.
  *   3. Add a call to up_spiinitialize() in your low level application
  *      initialization logic
- *   4. The handle returned by up_spiinitialize() may then be used to bind the
+ *   4. The handle returned by up_spiinitialize() may then be used to bind
- *      SPI driver to higher level logic (e.g., calling
+ *      the  SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).
  *
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam_spiselect
+ * Name: sam_spi[n]select
  *
  * Description:
  *   PIO chip select pins may be programmed by the board specific logic in
@@ -159,12 +164,13 @@ void weak_function sam_spiinitialize(void)
  *   a stub.
  *
  *   An alternative way to program the PIO chip select pins is as a normal
- *   PORT output.  In that case, the automatic control of the CS pins is
+ *   GPIO output.  In that case, the automatic control of the CS pins is
  *   bypassed and this function must provide control of the chip select.
- *   NOTE:  In this case, the PORT output pin does *not* have to be the
+ *   NOTE:  In this case, the GPIO output pin does *not* have to be the
  *   same as the NPCS pin normal associated with the chip select number.
  *
  * Input Parameters:
+ *   dev - SPI device info
  *   devid - Identifies the (logical) device
  *   selected - TRUE:Select the device, FALSE:De-select the device
  *
@@ -173,9 +179,10 @@ void weak_function sam_spiinitialize(void)
  *
  ****************************************************************************/
 
-void sam_spiselect(enum spi_dev_e devid, bool selected)
+#ifdef SAMD_HAVE_SPI0
+void sam_spi0select(enum spi_dev_e devid, bool selected)
 {
-#ifdef CONFIG_SAM4L_XPLAINED_IOMODULE
+#ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT1
   /* Select/de-select the SD card */
 
   if (devid == SPIDEV_MMCSD)
@@ -184,13 +191,9 @@ void sam_spiselect(enum spi_dev_e devid, bool selected)
 
       sam_portwrite(PORT_SD_CS, !selected);
     }
-
-#ifdef CONFIG_SAM4L_XPLAINED_OLED1MODULE
-  else
-#endif
 #endif
 
-#ifdef CONFIG_SAM4L_XPLAINED_OLED1MODULE
+#ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT1
   /* Select/de-select the OLED */
 
   if (devid == SPIDEV_DISPLAY)
@@ -201,14 +204,67 @@ void sam_spiselect(enum spi_dev_e devid, bool selected)
     }
 #endif
 }
+#endif
+
+#ifdef SAMD_HAVE_SPI1
+void sam_spi1select(enum spi_dev_e devid, bool selected)
+{
+#ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT2
+  /* Select/de-select the SD card */
+
+  if (devid == SPIDEV_MMCSD)
+    {
+      /* Active low */
+
+      sam_portwrite(PORT_SD_CS, !selected);
+    }
+#endif
+
+#ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT2
+  /* Select/de-select the OLED */
+
+  if (devid == SPIDEV_DISPLAY)
+    {
+      /* Active low */
+
+      sam_portwrite(PORT_OLED_CS, !selected);
+    }
+#endif
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI2
+void sam_spi2select(enum spi_dev_e devid, bool selected)
+{
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI3
+void sam_spi3select(enum spi_dev_e devid, bool selected)
+{
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI4
+void sam_spi4select(enum spi_dev_e devid, bool selected)
+{
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI5
+void sam_spi5select(enum spi_dev_e devid, bool selected)
+{
+}
+#endif
 
 /****************************************************************************
- * Name: sam_spistatus
+ * Name: sam_spi[n]status
  *
  * Description:
  *   Return status information associated with the SPI device.
  *
  * Input Parameters:
+ *   dev - SPI device info
  *   devid - Identifies the (logical) device
  *
  * Returned Values:
@@ -216,11 +272,12 @@ void sam_spiselect(enum spi_dev_e devid, bool selected)
  *
  ****************************************************************************/
 
-uint8_t sam_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+#ifdef SAMD_HAVE_SPI0
+uint8_t sam_spi0status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   uint8_t ret = 0;
 
-#ifdef CONFIG_SAM4L_XPLAINED_IOMODULE
+#ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT1
   /* Check if an SD card is present in the microSD slot */
 
   if (devid == SPIDEV_MMCSD)
@@ -236,11 +293,62 @@ uint8_t sam_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 
   return ret;
 }
+#endif
 
-#endif /* SAMD_HAVE_SPI0 */
+#ifdef SAMD_HAVE_SPI1
+uint8_t sam_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+  uint8_t ret = 0;
+
+#ifdef CONFIG_SAMD20_XPLAINED_IOMODULE_EXT2
+  /* Check if an SD card is present in the microSD slot */
+
+  if (devid == SPIDEV_MMCSD)
+    {
+      /* Active low */
+
+      if (!sam_portread(PORT_SD_CD))
+        {
+          ret |= SPI_STATUS_PRESENT;
+        }
+    }
+#endif
+
+  return ret;
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI2
+uint8_t sam_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+  return 0;
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI3
+uint8_t sam_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+  return 0;
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI4
+uint8_t sam_spi4status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+  return 0;
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI5
+uint8_t sam_spi5status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+  uint8_t ret = 0;
+  return ret;
+}
+#endif
 
 /****************************************************************************
- * Name: sam_spicmddata
+ * Name: sam_spi[n]cmddata
  *
  * Description:
  *   Some SPI devices require an additional control to determine if the SPI
@@ -251,7 +359,7 @@ uint8_t sam_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
  *   may be configured to use 9-bit data transfers with the 9th bit
  *   indicating command or data.  That same hardware may be configurable,
  *   instead, to use 8-bit data but to require an additional, board-
- *   specific PORT control to distinguish command and data.  This function
+ *   specific GPIO control to distinguish command and data.  This function
  *   would be needed in that latter case.
  *
  * Input Parameters:
@@ -264,9 +372,10 @@ uint8_t sam_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
  ****************************************************************************/
 
 #ifdef CONFIG_SPI_CMDDATA
-int sam_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+#ifdef SAMD_HAVE_SPI0
+int sam_spi0cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
 {
-#ifdef CONFIG_SAM4L_XPLAINED_OLED1MODULE
+#ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT1
   if (devid == SPIDEV_DISPLAY)
     {
       /* This is the Data/Command control pad which determines whether the
@@ -283,3 +392,55 @@ int sam_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
   return OK;
 }
 #endif
+
+#ifdef SAMD_HAVE_SPI1
+int sam_spi1cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+{
+#ifdef CONFIG_SAMD20_XPLAINED_OLED1MODULE_EXT2
+  if (devid == SPIDEV_DISPLAY)
+    {
+      /* This is the Data/Command control pad which determines whether the
+       * data bits are data or a command.
+       *
+       * High: the inputs are treated as display data.
+       * Low:  the inputs are transferred to the command registers.
+       */
+
+      (void)sam_portwrite(PORT_OLED_DATA, !cmd);
+    }
+#endif
+
+  return OK;
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI2
+int sam_spi2cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+{
+  return OK;
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI3
+int sam_spi3cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+{
+  return OK;
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI4
+int sam_spi4cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+{
+  return OK;
+}
+#endif
+
+#ifdef SAMD_HAVE_SPI5
+int sam_spi5cmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd)
+{
+  return OK;
+}
+#endif
+
+#endif /* CONFIG_SPI_CMDDATA */
+#endif /* SAMD_HAVE_SPI */