summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-03-14 11:00:46 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-03-14 11:00:46 -0600
commit5cc8061e83eb14141a1598d41842a177d9a172a2 (patch)
tree77c1c2a7ae857ef0f21013dbb43fe247acbd191a /nuttx/arch/arm
parent84621bf24b778753d9a82e737d822bc8ca59b7ba (diff)
downloadpx4-nuttx-5cc8061e83eb14141a1598d41842a177d9a172a2.tar.gz
px4-nuttx-5cc8061e83eb14141a1598d41842a177d9a172a2.tar.bz2
px4-nuttx-5cc8061e83eb14141a1598d41842a177d9a172a2.zip
SAMV71-XULT: Add support for SDRAM (unverified)
Diffstat (limited to 'nuttx/arch/arm')
-rw-r--r--nuttx/arch/arm/src/common/up_udelay.c4
-rw-r--r--nuttx/arch/arm/src/samv7/chip/sam_sdramc.h2
-rw-r--r--nuttx/arch/arm/src/samv7/chip/sam_wdt.h2
-rw-r--r--nuttx/arch/arm/src/samv7/chip/samv71_pinmap.h2
4 files changed, 7 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/common/up_udelay.c b/nuttx/arch/arm/src/common/up_udelay.c
index 8fcb93522..f9b09f461 100644
--- a/nuttx/arch/arm/src/common/up_udelay.c
+++ b/nuttx/arch/arm/src/common/up_udelay.c
@@ -100,6 +100,7 @@ void up_udelay(useconds_t microseconds)
for (i = 0; i < CONFIG_BOARD_LOOPSPERMSEC; i++)
{
}
+
microseconds -= 1000;
}
@@ -108,6 +109,7 @@ void up_udelay(useconds_t microseconds)
for (i = 0; i < CONFIG_BOARD_LOOPSPER100USEC; i++)
{
}
+
microseconds -= 100;
}
@@ -116,6 +118,7 @@ void up_udelay(useconds_t microseconds)
for (i = 0; i < CONFIG_BOARD_LOOPSPER10USEC; i++)
{
}
+
microseconds -= 10;
}
@@ -124,6 +127,7 @@ void up_udelay(useconds_t microseconds)
for (i = 0; i < CONFIG_BOARD_LOOPSPERUSEC; i++)
{
}
+
microseconds--;
}
}
diff --git a/nuttx/arch/arm/src/samv7/chip/sam_sdramc.h b/nuttx/arch/arm/src/samv7/chip/sam_sdramc.h
index 89ecde084..40653f52e 100644
--- a/nuttx/arch/arm/src/samv7/chip/sam_sdramc.h
+++ b/nuttx/arch/arm/src/samv7/chip/sam_sdramc.h
@@ -42,7 +42,7 @@
****************************************************************************************/
#include <nuttx/config.h>
-#include <arch/armv7/chip.h>
+#include <arch/samv7/chip.h>
#include "chip/sam_memorymap.h"
diff --git a/nuttx/arch/arm/src/samv7/chip/sam_wdt.h b/nuttx/arch/arm/src/samv7/chip/sam_wdt.h
index 7f9af708f..9b298c443 100644
--- a/nuttx/arch/arm/src/samv7/chip/sam_wdt.h
+++ b/nuttx/arch/arm/src/samv7/chip/sam_wdt.h
@@ -42,7 +42,7 @@
****************************************************************************************/
#include <nuttx/config.h>
-#include <arch/armv7/chip.h>
+#include <arch/samv7/chip.h>
#include "chip/sam_memorymap.h"
diff --git a/nuttx/arch/arm/src/samv7/chip/samv71_pinmap.h b/nuttx/arch/arm/src/samv7/chip/samv71_pinmap.h
index 563a2dd27..0c20598cf 100644
--- a/nuttx/arch/arm/src/samv7/chip/samv71_pinmap.h
+++ b/nuttx/arch/arm/src/samv7/chip/samv71_pinmap.h
@@ -333,7 +333,7 @@
#define GPIO_SDRAMC_RAS (GPIO_PERIPHC | GPIO_CFG_DEFAULT | GPIO_PORT_PIOD | GPIO_PIN16)
#define GPIO_SDRAMC_WE (GPIO_PERIPHC | GPIO_CFG_DEFAULT | GPIO_PORT_PIOD | GPIO_PIN29)
-/* Static Memory Controller (SMC) */
+/* Static Memory Controller (SMC). Many pins shared with SDRAMC */
#define GPIO_SMC_A0 (GPIO_PERIPHA | GPIO_CFG_PULLUP | GPIO_PORT_PIOC | GPIO_PIN18)
#define GPIO_SMC_A1 (GPIO_PERIPHA | GPIO_CFG_PULLUP | GPIO_PORT_PIOC | GPIO_PIN19)