Add SPI header file

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2485 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 194 insertions, 6 deletions

diff --git a/nuttx/arch/arm/src/sam3u/sam3u_chipid.h b/nuttx/arch/arm/src/sam3u/sam3u_chipid.h
index d0f94b07b..9ef007d27 100755
--- a/nuttx/arch/arm/src/sam3u/sam3u_chipid.h
+++ b/nuttx/arch/arm/src/sam3u/sam3u_chipid.h
@@ -95,7 +95,7 @@
 #  define CHIPID_CIDR_NVPSIZ2_1MB       (12 << CHIPID_CIDR_NVPSIZ_SHIFT) /* 1024K bytes */

 #  define CHIPID_CIDR_NVPSIZ2_2MB       (14 << CHIPID_CIDR_NVPSIZ_SHIFT) /* 2048K bytes */

 #define CHIPID_CIDR_SRAMSIZ_SHIFT       (16)      /* Bits 16-19:  Internal SRAM Size */

-#define CHIPID_CIDR_SRAMSIZ_MASK        (15 << bb)

+#define CHIPID_CIDR_SRAMSIZ_MASK        (15 << CHIPID_CIDR_SRAMSIZ_SHIFT)

 #  define CHIPID_CIDR_SRAMSIZ_48KB      (0  << CHIPID_CIDR_SRAMSIZ_SHIFT) /* 48K bytes */

 #  define CHIPID_CIDR_SRAMSIZ_1KB       (1  << CHIPID_CIDR_SRAMSIZ_SHIFT) /* 1K bytes */

 #  define CHIPID_CIDR_SRAMSIZ_2KB       (2  << CHIPID_CIDR_SRAMSIZ_SHIFT) /* 2K bytes */

diff --git a/nuttx/arch/arm/src/sam3u/sam3u_matrix.h b/nuttx/arch/arm/src/sam3u/sam3u_matrix.h
index 0b6d044e2..df630f5e0 100755
--- a/nuttx/arch/arm/src/sam3u/sam3u_matrix.h
+++ b/nuttx/arch/arm/src/sam3u/sam3u_matrix.h
@@ -165,7 +165,7 @@
 #define MATRIX_PRAS_M2PR_MASK           (3 << MATRIX_PRAS_M2PR_SHIFT)

 #define MATRIX_PRAS_M3PR_SHIFT          (12)      /* Bits 12-13:  Master 3 Priority */

 #define MATRIX_PRAS_M3PR_MASK           (3 << MATRIX_PRAS_M3PR_SHIFT)

-#define MATRIX_PRAS_M4PR_SHIFT          (16)      /* Bits 16-bb17  Master 4 Priority */

+#define MATRIX_PRAS_M4PR_SHIFT          (16)      /* Bits 16-17  Master 4 Priority */

 #define MATRIX_PRAS_M4PR_MASK           (3 << MATRIX_PRAS_M4PR_SHIFT)

 

 #define MATRIX_MRCR_RCB(x)              (1 << (x))

diff --git a/nuttx/arch/arm/src/sam3u/sam3u_memorymap.h b/nuttx/arch/arm/src/sam3u/sam3u_memorymap.h
index 268cfde3b..f0ac9c02d 100755
--- a/nuttx/arch/arm/src/sam3u/sam3u_memorymap.h
+++ b/nuttx/arch/arm/src/sam3u/sam3u_memorymap.h
@@ -63,9 +63,9 @@
                                            /* 0x24000000-0x3fffffff:   Undefined */

 #define SAM3U_PERIPHERALS_BASE  0x40000000 /* 0x40000000-0x5fffffff: Peripherals */

 #  define SAM3U_MCI_BASE        0x40000000 /* 0x40000000-0x400003ff:   High Speed Multimedia Card Interface */

-#  define SAM3U_SSC_BASE        0x40000400 /* 0x40000400-0x400007ff:   Synchronous Serial Controller */

-#  define SAM3U_SPI_BASE        0x40000800 /* 0x40000800-0x40000bff:   Serial Peripheral Interface */

-                                           /* 0x40000c00-0x4007ffff:   Reserved */

+#  define SAM3U_SSC_BASE        0x40004000 /* 0x40004000-0x40007fff:   Synchronous Serial Controller */

+#  define SAM3U_SPI_BASE        0x40008000 /* 0x40008000-0x4000bfff:   Serial Peripheral Interface */

+                                           /* 0x4000c000-0x4007ffff:   Reserved */

 #  define SAM3U_TC_BASE(n)      (0x40080000+((n)<<6))

 #  define SAM3U_TC0_BASE        0x40080000 /* 0x40080000-0x4008003f:   Timer Counter 0 */

 #  define SAM3U_TC1_BASE        0x40080040 /* 0x40080040-0x4008007f:   Timer Counter 1 */

diff --git a/nuttx/arch/arm/src/sam3u/sam3u_spi.h b/nuttx/arch/arm/src/sam3u/sam3u_spi.h
new file mode 100755
index 000000000..7e62d390b
--- /dev/null
+++ b/nuttx/arch/arm/src/sam3u/sam3u_spi.h
@@ -0,0 +1,188 @@
+/****************************************************************************************

+ * arch/arm/src/sam3u/sam3u_spi.h

+ *

+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.

+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>

+ *

+ * 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_SAM3U_SAM3U_SPI_H

+#define __ARCH_ARM_SRC_SAM3U_SAM3U_SPI_H

+

+/****************************************************************************************

+ * Included Files

+ ****************************************************************************************/

+

+#include <nuttx/config.h>

+

+#include "chip.h"

+#include "sam3u_memorymap.h"

+

+/****************************************************************************************

+ * Pre-processor Definitions

+ ****************************************************************************************/

+

+/* SPI register offsets *****************************************************************/

+

+#define SAM3U_SPI_CR_OFFSET         0x00 /* Control Register */

+#define SAM3U_SPI_MR_OFFSET         0x04 /* Mode Register */

+#define SAM3U_SPI_RDR_OFFSET        0x08 /* Receive Data Register */

+#define SAM3U_SPI_TDR_OFFSET        0x0c /* Transmit Data Register */

+#define SAM3U_SPI_SR_OFFSET         0x10 /* Status Register */

+#define SAM3U_SPI_IER_OFFSET        0x14 /* Interrupt Enable Register */

+#define SAM3U_SPI_IDR_OFFSET        0x18 /* Interrupt Disable Register */

+#define SAM3U_SPI_IMR_OFFSET        0x1c /* Interrupt Mask Register */

+                                         /* 0x20-0x2c: Reserved */

+#define SAM3U_SPI_CSR0_OFFSET       0x30 /* Chip Select Register 0 */

+#define SAM3U_SPI_CSR1_OFFSET       0x34 /* Chip Select Register 1 */

+#define SAM3U_SPI_CSR2_OFFSET       0x38 /* Chip Select Register 2 */

+#define SAM3U_SPI_CSR3_OFFSET       0x3c /* Chip Select Register 3 */

+                                         /* 0x40-0xe0: Reserved */

+#define SAM3U_SPI_WPCR_OFFSET       0xe4 /* Write Protection Control Register */

+#define SAM3U_SPI_WPSR_OFFSET       0xe8 /* Write Protection Status Register */

+                                         /* 0xec-0xf8: Reserved*/

+

+/* SPI register adresses ****************************************************************/

+

+#define SAM3U_SPI_CR                (SAM3U_SPI_BASE+SAM3U_SPI_CR_OFFSET)   /* Control Register */

+#define SAM3U_SPI_MR                (SAM3U_SPI_BASE+SAM3U_SPI_MR_OFFSET)   /* Mode Register */

+#define SAM3U_SPI_RDR               (SAM3U_SPI_BASE+SAM3U_SPI_RDR_OFFSET)  /* Receive Data Register */

+#define SAM3U_SPI_TDR               (SAM3U_SPI_BASE+SAM3U_SPI_TDR_OFFSET)  /* Transmit Data Register */

+#define SAM3U_SPI_SR                (SAM3U_SPI_BASE+SAM3U_SPI_SR_OFFSET)   /* Status Register */

+#define SAM3U_SPI_IER               (SAM3U_SPI_BASE+SAM3U_SPI_IER_OFFSET)  /* Interrupt Enable Register */

+#define SAM3U_SPI_IDR               (SAM3U_SPI_BASE+SAM3U_SPI_IDR_OFFSET)  /* Interrupt Disable Register */

+#define SAM3U_SPI_IMR               (SAM3U_SPI_BASE+SAM3U_SPI_IMR_OFFSET)  /* Interrupt Mask Register */

+#define SAM3U_SPI_CSR0              (SAM3U_SPI_BASE+SAM3U_SPI_CSR0_OFFSET) /* Chip Select Register 0 */

+#define SAM3U_SPI_CSR1              (SAM3U_SPI_BASE+SAM3U_SPI_CSR1_OFFSET) /* Chip Select Register 1 */

+#define SAM3U_SPI_CSR2              (SAM3U_SPI_BASE+SAM3U_SPI_CSR2_OFFSET) /* Chip Select Register 2 */

+#define SAM3U_SPI_CSR3              (SAM3U_SPI_BASE+SAM3U_SPI_CSR3_OFFSET) /* Chip Select Register 3 */

+#define SAM3U_SPI_WPCR              (SAM3U_SPI_BASE+SAM3U_SPI_WPCR_OFFSET) /* Write Protection Control Register */

+#define SAM3U_SPI_WPSR              (SAM3U_SPI_BASE+SAM3U_SPI_WPSR_OFFSET) /* Write Protection Status Register */

+

+/* SPI register bit definitions *********************************************************/

+

+/* SPI Control Register */

+

+#define SPI_CR_SPIEN                (1 << 0)  /* Bit 0:  SPI Enable */

+#define SPI_CR_SPIDIS               (1 << 1)  /* Bit 1:  SPI Disable */

+#define SPI_CR_SWRST                (1 << 7)  /* Bit 7:  SPI Software Reset */

+#define SPI_CR_LASTXFER             (1 << 24) /* Bit 24: Last Transfer */

+

+/* SPI Mode Register */

+

+#define SPI_MR_MSTR                 (1 << 0)  /* Bit 0:  Master/Slave Mode */

+#define SPI_MR_PS                   (1 << 1)  /* Bit 1:  Peripheral Select */

+#define SPI_MR_PCSDEC               (1 << 2)  /* Bit 2:  Chip Select Decode */

+#define SPI_MR_MODFDIS              (1 << 4)  /* Bit 4:  Mode Fault Detection */

+#define SPI_MR_WDRBT                (1 << 5)  /* Bit 5:  Wait Data Read Before Transfer */

+#define SPI_MR_LLB                  (1 << 7)  /* Bit 7:  Local Loopback Enable */

+#define SPI_MR_PCS_SHIFT            (16)      /* Bits 16-19: Peripheral Chip Select */

+#define SPI_MR_PCS_MASK             (15 << SPI_MR_PCS_SHIFT)

+#define SPI_MR_DLYBCS_SHIFT         (24)      /* Bits 24-31: Delay Between Chip Selects */

+#define SPI_MR_DLYBCS_MASK          (0xff << SPI_MR_DLYBCS_SHIFT)

+

+/* SPI Receive Data Register */

+

+#define SPI_RDR_RD_SHIFT            (0)       /* Bits 0-15: Receive Data */

+#define SPI_RDR_RD_MASK             (0xffff << SPI_RDR_RD_SHIFT)

+#define SPI_RDR_PCS_SHIFT           (16)      /* Bits 16-19: Peripheral Chip Select */

+#define SPI_RDR_PCS_MASK            (15 << SPI_RDR_PCS_SHIFT)

+

+/* SPI Transmit Data Register */

+

+#define SPI_TDR_TD_SHIFT            (0)       /* Bits 0-15:  Transmit Data */

+#define SPI_TDR_TD_MASK             (0xffff << SPI_TDR_TD_SHIFT)

+#define SPI_TDR_PCS_SHIFT           (16)      /* Bits 16-19: Peripheral Chip Select */

+#define SPI_TDR_PCS_MASK            (15 << SPI_TDR_PCS_SHIFT)

+#define SPI_TDR_LASTXFER            (1 << 24) /* Bit 24: Last Transfer */

+

+/* SPI Status Register, SPI Interrupt Enable Register, SPI Interrupt Disable Register,

+ * and SPI Interrupt Mask Register (common bit fields)

+ */

+

+#define SPI_INT_RDRF                (1 << 0)  /* Bit 0:  Receive Data Register Full Interrupt */

+#define SPI_INT_TDRE                (1 << 1)  /* Bit 1:  Transmit Data Register Empty Interrupt */

+#define SPI_INT_MODF                (1 << 2)  /* Bit 2:  Mode Fault Error Interrupt */

+#define SPI_INT_OVRES               (1 << 3)  /* Bit 3:  Overrun Error Interrupt */

+#define SPI_INT_NSSR                (1 << 8)  /* Bit 8:  NSS Rising Interrupt */

+#define SPI_INT_TXEMPTY             (1 << 9)  /* Bit 9:  Transmission Registers Empty Interrupt */

+#define SPI_INT_UNDES               (1 << 10) /* Bit 10: Underrun Error Status Interrupt (slave) */

+#define SPI_SR_SPIENS               (1 << 16) /* Bit 16:  SPI Enable Status (SR only) */

+

+/* SPI Chip Select Registers 0-3 */

+

+#define SPI_CSR_CPOL                (1 << 0)  /* Bit 0:  Clock Polarity */

+#define SPI_CSR_NCPHA               (1 << 1)  /* Bit 1:  Clock Phase */

+#define SPI_CSR_CSNAAT              (1 << 2)  /* Bit 2:  Chip Select Not Active After Transfer */

+#define SPI_CSR_CSAAT               (1 << 3)  /* Bit 3:  Chip Select Active After Transfer */

+#define SPI_CSR_BITS_SHIFT          (4)       /* Bits 4-7: Bits Per Transfer */

+#define SPI_CSR_BITS_MASK           (15 << SPI_CSR_BITS_SHIFT)

+#  define SPI_CSR_BITS8             (0 << SPI_CSR_BITS_SHIFT) /* 8 */

+#  define SPI_CSR_BITS9             (1 << SPI_CSR_BITS_SHIFT) /* 9 */

+#  define SPI_CSR_BITS10            (2 << SPI_CSR_BITS_SHIFT) /* 10 */

+#  define SPI_CSR_BITS11            (3 << SPI_CSR_BITS_SHIFT) /* 11 */

+#  define SPI_CSR_BITS12            (4 << SPI_CSR_BITS_SHIFT) /* 12 */

+#  define SPI_CSR_BITS13            (5 << SPI_CSR_BITS_SHIFT) /* 13 */

+#  define SPI_CSR_BITS14            (6 << SPI_CSR_BITS_SHIFT) /* 14 */

+#  define SPI_CSR_BITS15            (7 << SPI_CSR_BITS_SHIFT) /* 15 */

+#  define SPI_CSR_BITS15            (8 << SPI_CSR_BITS_SHIFT) /* 16 */

+#define SPI_CSR_SCBR_SHIFT          (8)       /* Bits 8-15: Serial Clock Baud Rate */

+#define SPI_CSR_SCBR_MASK           (0xff << SPI_CSR_SCBR_SHIFT)

+#define SPI_CSR_DLYBS_SHIFT         (16)      /* Bits 16-23: Delay Before SPCK */

+#define SPI_CSR_DLYBS_MASK          (0xff << SPI_CSR_DLYBS_SHIFT)

+#define SPI_CSR_DLYBCT_SHIFT        (24)      /* Bits 24-31: Delay Between Consecutive Transfers */

+#define SPI_CSR_DLYBCT_MASK         (0xff << SPI_CSR_DLYBCT_SHIFT)

+

+/* SPI Write Protection Control Register */

+

+#define SPI_WPCR_SPIWPEN            (1 << 0)  /* Bit 0:  SPI Write Protection Enable */

+#define SPI_WPCR_SPIWPKEY_SHIFT     (8)       /* Bits 8-31: SPI Write Protection Key Password */

+#define SPI_WPCR_SPIWPKEY_MASK      (0x00ffffff << SPI_WPCR_SPIWPKEY_SHIFT)

+

+/* SPI Write Protection Status Register */

+

+#define SPI_WPSR_SPIWPVS_SHIFT      (0)      /* Bits 0-2: SPI Write Protection Violation Status */

+#define SPI_WPSR_SPIWPVS_MASK       (7 << SPI_WPSR_SPIWPVS_SHIFT)

+#define SPI_WPSR_SPIWPVSRC_SHIFT    (8)      /* Bits 8-15: SPI Write Protection Violation Source */

+#define SPI_WPSR_SPIWPVSRC_MASK     (0xff << SPI_WPSR_SPIWPVSRC_SHIFT)

+

+/****************************************************************************************

+ * Public Types

+ ****************************************************************************************/

+

+/****************************************************************************************

+ * Public Data

+ ****************************************************************************************/

+

+/****************************************************************************************

+ * Public Functions

+ ****************************************************************************************/

+

+#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_SPI_H */

diff --git a/nuttx/arch/arm/src/sam3u/sam3u_supc.h b/nuttx/arch/arm/src/sam3u/sam3u_supc.h
index bf7741f76..bf494649d 100755
--- a/nuttx/arch/arm/src/sam3u/sam3u_supc.h
+++ b/nuttx/arch/arm/src/sam3u/sam3u_supc.h
@@ -133,7 +133,7 @@
 #define SUPC_WUIR_WKUPEN_SHIFT         (0)       /* Bits 0-15:  Wake Up Input Enable 0 to 15 */

 #define SUPC_WUIR_WKUPEN_MASK          (0xffff << SUPC_WUIR_WKUPEN_SHIFT)

 #define SUPC_WUIR_WKUPEN(n)            ((1 << (n)) << SUPC_WUIR_WKUPEN_SHIFT)

-#define SUPC_WUIR_WKUPT_SHIFT          (16)      /* Bits 16-bb31  Wake Up Input Transition 0 to 15 */

+#define SUPC_WUIR_WKUPT_SHIFT          (16)      /* Bits 16-31  Wake Up Input Transition 0 to 15 */

 #define SUPC_WUIR_WKUPT_MASK           (0xffff << SUPC_WUIR_WKUPT_SHIFT)

 #define SUPC_WUIR_WKUPT(n)             ((1 << (n)) << SUPC_WUIR_WKUPT_SHIFT)