1./arch/arm/src/samv7/sam_spi.c DMA Tx/Rx timeout issue.

2./arch/arm/src/samv7/sam_qspi.c   compiling error when set CONFIG_SAMV7_QSPI_DLYBCT
3. fix compiling error when set CONFIG_BOARDCTL_IOCTL/CONFIG_BOARDCTL_UNIQUEID
This commit is contained in:
Kevin Liu
2019-01-30 10:07:01 -06:00
committed by Gregory Nutt
parent 8dd17362e3
commit 46895dc86b
3 changed files with 31 additions and 3 deletions
+1 -1
View File
@@ -1189,7 +1189,7 @@ static uint32_t qspi_setfrequency(struct qspi_dev_s *dev, uint32_t frequency)
regval &= ~QSPI_MR_DLYBCT_MASK;
#if CONFIG_SAMV7_QSPI_DLYBCT > 0
dlybct = ((CONFIG_SAMV7_QSPI_DLYBCT * (SAM_QSPI_CLOCK /1000000)) / 1000 / 32;
dlybct = ((CONFIG_SAMV7_QSPI_DLYBCT * (SAM_QSPI_CLOCK /1000000)) / 1000 / 32);
regval |= dlybct << QSPI_MR_DLYBCT_SHIFT;
#endif
+2 -2
View File
@@ -1736,7 +1736,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
rxflags = DMACH_FLAG_FIFOCFG_LARGEST | DMACH_FLAG_PERIPHPID(spi->pid) |
DMACH_FLAG_PERIPHH2SEL | DMACH_FLAG_PERIPHISPERIPH |
DMACH_FLAG_PERIPHCHUNKSIZE_1 | DMACH_FLAG_MEMPID_MAX |
DMACH_FLAG_MEMCHUNKSIZE_1;
DMACH_FLAG_MEMCHUNKSIZE_1 | DMACH_FLAG_PERIPHAHB_AHB_IF1;
/* Set the source and destination width bits */
@@ -1772,7 +1772,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer,
txflags = DMACH_FLAG_FIFOCFG_LARGEST | DMACH_FLAG_PERIPHPID(spi->pid) |
DMACH_FLAG_PERIPHH2SEL | DMACH_FLAG_PERIPHISPERIPH |
DMACH_FLAG_PERIPHCHUNKSIZE_1 | DMACH_FLAG_MEMPID_MAX |
DMACH_FLAG_MEMCHUNKSIZE_1;
DMACH_FLAG_MEMCHUNKSIZE_1 | DMACH_FLAG_PERIPHAHB_AHB_IF1;
/* Set the source and destination width bits */