From d32b85a9383ce36151ca3453d57d12961dc0ca3a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 13 Mar 2014 14:07:35 -0600 Subject: [PATCH] SAM4E-EK: Add support for the SAM4E-EK AT25 serial flash --- arch/arm/src/sam34/Kconfig | 6 +++--- arch/arm/src/sam34/sam_spi.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig index 97b73f5763..1ec5c9a8a5 100644 --- a/arch/arm/src/sam34/Kconfig +++ b/arch/arm/src/sam34/Kconfig @@ -340,7 +340,7 @@ config SAM34_EIC depends on ARCH_CHIP_SAM4L || ARCH_CHIP_SAM4E config SAM34_DMAC - bool "DMA controller" + bool "DMA controller (DMAC)" default n depends on ARCH_CHIP_SAM3U || ARCH_CHIP_SAM3X || ARCH_CHIP_SAM3A || ARCH_CHIP_SAM4E select ARCH_DMA @@ -875,7 +875,7 @@ endmenu # AT91SAM3/4 GPIO Interrupt Configuration if SAM34_SPI0 || SAM34_SPI1 -menu "SPI device driver options" +menu "AT91SAM3/4 SPI device driver options" config SAM34_SPI_DMA bool "SPI DMA" @@ -911,7 +911,7 @@ config SAM34_SPI_REGDEBUG Output detailed register-level SPI device debug information. Requires also DEBUG. -endmenu # SPI device driver options +endmenu # AT91SAM3/4 SPI device driver options endif # SAM34_SPI0 || SAM34_SPI1 if SAM34_EMAC diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c index 36e3b6aaec..7d020b804e 100644 --- a/arch/arm/src/sam34/sam_spi.c +++ b/arch/arm/src/sam34/sam_spi.c @@ -213,7 +213,7 @@ typedef void (*select_t)(enum spi_dev_e devid, bool selected); struct sam_spidev_s { uint32_t base; /* SPI controller register base address */ - sem_t spisem; /* Assures mutually exclusive acess to SPI */ + sem_t spisem; /* Assures mutually exclusive access to SPI */ select_t select; /* SPI select callout */ bool initialized; /* TRUE: Controller has been initialized */ #ifdef CONFIG_SAM34_SPI_DMA