Merge branch 'master' of http://git.code.sf.net/p/nuttx/git

123 files changed, 11207 insertions, 9587 deletions

diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index f8ba10f72..71f7da62a 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -572,3 +572,5 @@
 	  clean .dSYM files in directories where .exe may be built (2013-5-30).
 	* apps/examples/nrf35l01_term: Add an example application to demo the
 	  nRF24L01 driver.  From Laurent Latil (2013-6-1).
+	* apps/nshlib/Kconfig:  Add some missing NSH configuration values.
+	  From Lorenz Meier (2013-6-2).
diff --git a/apps/README.txt b/apps/README.txt
index 55accfcf6..4451ef03f 100644
--- a/apps/README.txt
+++ b/apps/README.txt
@@ -33,7 +33,7 @@ NuttX directory.  Like:
  `- apps
 
 If all of the above conditions are TRUE, then NuttX will be able to
-find the application directory.  If your application directory has a 
+find the application directory.  If your application directory has a
 different name or is location at a different position, then you will
 have to inform the NuttX build system of that location.  There are several
 ways to do that:
@@ -61,7 +61,7 @@ collected during the make context build phase.
 
 To execute an application function:
 
-  exec_builtin() is defined in the nuttx/include/apps/builtin.h 
+  exec_builtin() is defined in the nuttx/include/apps/builtin.h
 
 NuttShell (NSH) Built-In Commands
 ---------------------------------
@@ -98,7 +98,7 @@ Application Configuration File
 The old-style NuttX configuration uses a special configuration file is
 used to configure which applications are to be included in the build.
 The source for this file is  configs/<board>/<configuration>/appconfig.
-The existence of the appconfig file in the board configuration directory\
+The existence of the appconfig file in the board configuration directory
 is sufficient to enable building of applications.
 
 The appconfig file is copied into the apps/ directory as .config when
@@ -250,12 +250,13 @@ A: Here are four:
       a) Copy 'MyBoard' directory to configs/MyBoard.
       b) Add a symbolic link to MyApplication at apps/external
       c) Configure NuttX (usually by:
-      
+
          tools/configure.sh MyBoard/MyConfiguration
 
          or simply by copying defconfig->nutt/.config,
-         setenv.sh->nuttx/setenv.sh, Make.defs->nuttx/Make.defs,
-         appconfig->apps/.config
+         setenv.sh->nuttx/setenv.sh, and Make.defs->nuttx/Make.defs
+         (and appconfig->apps/.config for the old-style, deprecated
+         configuration files).
 
       Using the 'external' link makes it especially easy to add a
       'built-in' application an existing configuration.
diff --git a/apps/examples/Makefile b/apps/examples/Makefile
index 4c093e129..eadb2db21 100644
--- a/apps/examples/Makefile
+++ b/apps/examples/Makefile
@@ -60,9 +60,9 @@ CNTXTDIRS = pwm
 
 ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 CNTXTDIRS += adc can cdcacm composite cxxtest dhcpd discover flash_test ftpd
-CNTXTDIRS += hello helloxx json keypadtestmodbus mtdpart nettest nxlines
-CNTXTDIRS += nrf24l01_term relays qencoder slcd smart_test tcpecho telnetd
-CNTXTDIRS += watchdog wgetjson
+CNTXTDIRS += hello helloxx json keypadtestmodbus mtdpart nettest nxhello
+CNTXTDIRS += nxlines nrf24l01_term relays qencoder slcd smart_test tcpecho
+CNTXTDIRS += telnetd touchscreen watchdog wgetjson
 endif
 
 ifeq ($(CONFIG_EXAMPLES_LCDRW_BUILTIN),y)
@@ -71,9 +71,6 @@ endif
 ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y)
 CNTXTDIRS += nx
 endif
-ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y)
-CNTXTDIRS += nxhello
-endif
 ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y)
 CNTXTDIRS += nximage
 endif
@@ -86,9 +83,6 @@ endif
 ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y)
 CNTXTDIRS += tiff
 endif
-ifeq ($(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN),y)
-CNTXTDIRS += touchscreen
-endif
 ifeq ($(CONFIG_EXAMPLES_USBMSC_BUILTIN),y)
 CNTXTDIRS += usbstorage
 endif
diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 2e1454b3f..7e3b0d0f0 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -1,16 +1,14 @@
 examples
 ^^^^^^^^
 
-  appconfig and CONFIG_APPS
-  
+  Selecting examples:
+
     The examples directory contains several sample applications that
     can be linked with NuttX.  The specific example is selected in the
-    configs/<board-name>/appconfig file via the CONFIGURED_APPS setting.
-    This setting provides the path to the directory containing the
-    application Makefile (this path is a relative to the apps/ top-
-    level directory).  For example, 
+    configs/<board-name>/defconfig file via the CONFIG_EXAMPLES_xyz
+    setting where xyz is the name of the example. For example,
 
-      CONFIGURE_APPS += examples/ostest
+      CONFIG_EXAMPLES_OSTEST=y
 
     Selects the examples/ostest example.
 
@@ -30,6 +28,25 @@ examples
       the specific example.  See the following for examples that
       support this option).
 
+      NOTE: The use of CONFIG_EXAMPLES_XYZ_BUILTIN is being phased
+      out.  For many example, the definition of CONFIG_NSH_BUILTIN_APPS
+      is sufficient built the example as an NSH built-in application.
+
+  Older configurations.
+
+    Older, deprecated configuration files might use a variable called
+    CONFIGURED_APPS to selected examples.  Those CONFIGURED_APPS settings
+    where kept in files called appconfig.  For example, in those older
+    configuration files, the OS test example would have been selected with
+    an entry like the following in the appconfig file:
+
+      CONFIGURED_APPS += examples/ostest
+
+    appconfig files are not longer used in the current NuttX configuration
+    system.  And syntax like the above is being phased out (but is still
+    supported by the make system butonly until the last configuration is
+    converted to the newer style configuration files).
+
 examples/adc
 ^^^^^^^^^^^^
 
@@ -44,7 +61,7 @@ examples/adc
       Default: Built as a standalone problem
 
   Specific configuration options for this example include:
- 
+
     CONFIG_EXAMPLES_ADC_DEVPATH - The default path to the ADC device. Default: /dev/adc0
     CONFIG_EXAMPLES_ADC_NSAMPLES - If CONFIG_NSH_BUILTIN_APPS
       is defined, then the number of samples is provided on the command line
@@ -69,7 +86,7 @@ examples/buttons
   CONFIG_EXAMPLES_IRQBUTTONS_MAX      - Highest interrupting button number (MAX=7)
 
   Name strings for buttons:
-  
+
     CONFIG_EXAMPLES_BUTTONS_NAME0, CONFIG_EXAMPLES_BUTTONS_NAME1,
     CONFIG_EXAMPLES_BUTTONS_NAME2, CONFIG_EXAMPLES_BUTTONS_NAME3,
     CONFIG_EXAMPLES_BUTTONS_NAME4, CONFIG_EXAMPLES_BUTTONS_NAME5,
@@ -99,9 +116,9 @@ examples/can
       mode for testing. The STM32 CAN driver does support loopback mode.
     CONFIG_NSH_BUILTIN_APPS - Build the CAN test as an NSH built-in function.
       Default: Built as a standalone problem
- 
+
   Specific configuration options for this example include:
- 
+
     CONFIG_EXAMPLES_CAN_DEVPATH - The path to the CAN device. Default: /dev/can0
     CONFIG_EXAMPLES_CAN_NMSGS - If CONFIG_NSH_BUILTIN_APPS
       is defined, then the number of loops is provided on the command line
@@ -223,7 +240,7 @@ examples/composite
     emulation) or "/dev/ttyACM0" (for the CDC/ACM serial device).
   CONFIG_EXAMPLES_COMPOSITE_BUFSIZE - The size of the serial I/O buffer in
     bytes.  Default 256 bytes.
- 
+
   If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB), then
   the example code will also manage the USB trace output.  The amount of trace output
   can be controlled using:
@@ -266,7 +283,7 @@ examples/dhcpd
 ^^^^^^^^^^^^^^
 
   This examples builds a tiny DCHP server for the target system.
-  
+
   NOTE: For test purposes, this example can be built as a
   host-based DHCPD server.  This can be built as follows:
 
@@ -274,7 +291,7 @@ examples/dhcpd
     make -f Makefile.host TOPDIR=<nuttx-directory>
 
   NuttX configuration settings:
-  
+
     CONFIG_NET=y                   - Of course
     CONFIG_NSOCKET_DESCRIPTORS     - And, of course, you must allocate some
                                      socket descriptors.
@@ -282,6 +299,7 @@ examples/dhcpd
                                      (as well as various other UDP-related
                                      configuration settings)
     CONFIG_NET_BROADCAST=y         - UDP broadcast support is needed.
+    CONFIG_NETUTILS_UIPLIB=y       - The UIP library is needed
 
     CONFIG_EXAMPLES_DHCPD_NOMAC     - (May be defined to use software assigned MAC)
     CONFIG_EXAMPLES_DHCPD_IPADDR    - Target IP address
@@ -292,12 +310,6 @@ examples/dhcpd
   and used in netutils/dhcpd/dhcpd.c. These settings are required
   to described the behavior of the daemon.
 
-  Applications using this example will need to provide an appconfig
-  file in the configuration driver with instruction to build applications
-  like:
-
-  CONFIGURED_APPS += uiplib
-
 examples/discover
 ^^^^^^^^^^^^^^^^^
 
@@ -354,7 +366,7 @@ examples/elf
 
        LDELFFLAGS = -r -e main
 
-     If you use GCC to link, you make also need to include '-nostdlib' or 
+     If you use GCC to link, you make also need to include '-nostdlib' or
      '-nostartfiles' and '-nodefaultlibs'.
 
   3. This example also requires genromfs.  genromfs can be build as part of the
@@ -421,9 +433,9 @@ examples/ftpc
   optional port number.
 
   NOTE:  By default, FTPC uses readline to get data from stdin.  So your
-  appconfig file must have the following build path:
+  defconfig file must have the following build path:
 
-    CONFIGURED_APPS += system/readline
+    CONFIG_SYSTEM_READLINE=y
 
   NOTE: If you use the ftpc task over a telnet NSH connection, then you
   should set the following configuration item:
@@ -437,7 +449,7 @@ examples/ftpc
 
   You may also want to define the following in your configuration file.
   Otherwise, you will have not feeback about what is going on:
- 
+
     CONFIG_DEBUG=y
     CONFIG_DEBUG_VERBOSE=y
     CONFIG_DEBUG_FTPC=y
@@ -449,6 +461,7 @@ examples/ftpd
   configurations specific to the FTPD example (the FTPD daemon itself may
   require other configuration options as well).
 
+   CONFIG_EXAMPLES_FTPD - Enable the FTPD example.
    CONFIG_EXAMPLES_FTPD_PRIO - Priority of the FTP daemon.
      Default: SCHED_PRIORITY_DEFAULT
    CONFIG_EXAMPLES_FTPD_STACKSIZE - Stack size allocated for the
@@ -495,11 +508,11 @@ examples/ftpd
     CONFIG_FTPD_WORKERSTACKSIZE - The stacksize to allocate for each
       FTP daemon worker thread.  Default:  2048 bytes.
 
-  The appconfig file (apps/.config) should include:
+  The following netutils libraries should be enabled in your defconfig
+  file:
 
-    CONFIGURED_APPS += examples/ftpd
-    CONFIGURED_APPS += netutils/uiplib
-    CONFIGURED_APPS += netutils/ftpd
+    CONFIG_NETUTILS_UIPLIB=y
+    CONFIG_NETUTILS_TELNED=y
 
 examples/hello
 ^^^^^^^^^^^^^^
@@ -524,7 +537,7 @@ examples/helloxx
     CONFIG_HAVE_CXX -- Enable C++ Support
 
   Optional NuttX configuration settings:
-  
+
     CONFIG_HAVE_CXXINITIALIZE -- Enable support for static constructors
       (may not be available on all platforms).
 
@@ -589,12 +602,8 @@ examples/igmp
       Network mask
   * CONFIG_EXAMPLES_IGMP_GRPADDR
       Multicast group address
-
-  Applications using this example will need to provide an appconfig
-  file in the configuration driver with instruction to build applications
-  like:
-
-  CONFIGURED_APPS += uiplib
+  * CONFIG_EXAMPLES_UIPLIB
+      The UIP library is needed
 
 examples/json
 ^^^^^^^^^^^^^
@@ -635,7 +644,7 @@ examples/lcdrw
       LCD X resolution.  Default: 240
   * CONFIG_EXAMPLES_LDCRW_YRES
       LCD Y resolution.  Default: 320
-  
+
   NOTE: This test exercises internal lcd driver interfaces.  As such, it
   relies on internal OS interfaces that are not normally available to a
   user-space program.  As a result, this example cannot be used if a
@@ -721,14 +730,23 @@ examples/nettest
   This is a simple network test for verifying client- and server-
   functionality in a TCP/IP connection.
 
-  Applications using this example will need to provide an appconfig
-  file in the configuration driver with instruction to build applications
-  like:
-
-  CONFIGURED_APPS += uiplib
+    CONFIG_EXAMPLES_NETTEST=y - Enables the nettest example
+    CONFIG_EXAMPLES_UIPLIB=y  - The UIP livrary in needed.
 
   See also examples/tcpecho
 
+examples/nrf24l01_term
+^^^^^^^^^^^^^^^^^^^^^^
+
+  These is a simple test of NRF24L01-based wireless connectivity.  Enabled\
+  with:
+
+    CONFIG_EXAMPLES_NRF24L01TERM
+
+  Options:
+
+    CONFIG_NSH_BUILTIN_APPS - Built as an NSH built-in applications.
+
 examples/nsh
 ^^^^^^^^^^^^
 
@@ -737,37 +755,37 @@ examples/nsh
   application.  NSH is described in its own README located at
   apps/nshlib/README.txt
 
-  Applications using this example will need to provide an appconfig
-  file in the configuration driver with instruction to build applications
-  like:
+  Applications using this example will need to provide an defconfig
+  file in the configuration directory with instruction to build
+  applicationslike:
 
-  CONFIGURED_APPS += nshlib
+    CONFIG_NSH_LIBRARY=y
 
   NOTE:  If the NSH serial console is used, then following is also
   required to build the readline() library:
 
-  CONFIGURED_APPS += system/readline
+    CONFIG_SYSTEM_READLINE=y
 
   And if networking is included:
 
-  CONFIGURED_APPS += uiplib
-  CONFIGURED_APPS += dhcpc
-  CONFIGURED_APPS += resolv
-  CONFIGURED_APPS += tftp
-  CONFIGURED_APPS += webclient
+    CONFIG_NETUTILS_UIPLIB=y
+    CONFIG_NETUTILS_DHCPC=y
+    CONFIG_NETUTILS_RESOLV=y
+    CONFIG_NETUTILS_TFTPC=y
+    CONFIG_NETUTILS_WEBCLIENT=y
 
-  If the Telnet console is enabled, then the appconfig file (apps/.config)
-  should also include:
+  If the Telnet console is enabled, then the defconfig file should
+  also include:
 
-  CONFIGURED_APPS += netutils/telnetd
+    CONFIG_NETUTILS_TELNETD=y
 
   Also if the Telnet console is enabled, make sure that you have the
   following set in the NuttX configuration file or else the performance
   will be very bad (because there will be only one character per TCP
   transfer):
-  
-  CONFIG_STDIO_BUFFER_SIZE - Some value >= 64
-  CONFIG_STDIO_LINEBUFFER=y
+
+    CONFIG_STDIO_BUFFER_SIZE - Some value >= 64
+    CONFIG_STDIO_LINEBUFFER=y
 
 examples/nx
 ^^^^^^^^^^^
@@ -777,7 +795,7 @@ examples/nx
   can be selected:
 
     CONFIG_EXAMPLES_NX_BUILTIN -- Build the NX example as a "built-in"
-      that can be executed from the NSH command line    
+      that can be executed from the NSH command line
     CONFIG_EXAMPLES_NX_VPLANE -- The plane to select from the frame-
       buffer driver for use in the test.  Default: 0
     CONFIG_EXAMPLES_NX_DEVNO - The LCD device to select from the LCD
@@ -930,7 +948,7 @@ examplex/nxhello
   The following configuration options can be selected:
 
     CONFIG_EXAMPLES_NXHELLO_BUILTIN -- Build the NXHELLO example as a "built-in"
-      that can be executed from the NSH command line    
+      that can be executed from the NSH command line
     CONFIG_EXAMPLES_NXHELLO_VPLANE -- The plane to select from the frame-
       buffer driver for use in the test.  Default: 0
     CONFIG_EXAMPLES_NXHELLO_DEVNO - The LCD device to select from the LCD
@@ -963,7 +981,7 @@ examples/nximage
   and 8-bit greyscale for now.
 
     CONFIG_EXAMPLES_NXIMAGE_BUILTIN -- Build the NXIMAGE example as a "built-in"
-      that can be executed from the NSH command line    
+      that can be executed from the NSH command line
     CONFIG_EXAMPLES_NXIMAGE_VPLANE -- The plane to select from the frame-
       buffer driver for use in the test.  Default: 0
     CONFIG_EXAMPLES_NXIMAGE_DEVNO - The LCD device to select from the LCD
@@ -1066,11 +1084,11 @@ examples/nxtext
   garbage on the display or a failure at the point where the display
   should scroll, it is probably because you have an LCD driver that is
   write-only.
-  
+
   The following configuration options can be selected:
 
     CONFIG_EXAMPLES_NXTEXT_BUILTIN -- Build the NXTEXT example as a "built-in"
-      that can be executed from the NSH command line    
+      that can be executed from the NSH command line
     CONFIG_EXAMPLES_NXTEXT_VPLANE -- The plane to select from the frame-
       buffer driver for use in the test.  Default: 0
     CONFIG_EXAMPLES_NXTEXT_DEVNO - The LCD device to select from the LCD
@@ -1243,10 +1261,10 @@ examples/poll
   the host.  The host should then receive the echo'ed message.
 
   If networking is enabled, applications using this example will need to
-  provide an appconfig file in the configuration driver with instruction
-  to build applications like:
+  provide the following definition in the defconfig file to enable the
+  UIP library:
 
-  CONFIGURED_APPS += uiplib
+    CONFIG_NETUTILS_UIPLIB=y
 
 examples/posix_spawn
 ^^^^^^^^^^^^^^^^^^^^
@@ -1294,7 +1312,7 @@ examples/posix_spawn
 
        LDELFFLAGS = -r -e main
 
-     If you use GCC to link, you make also need to include '-nostdlib' or 
+     If you use GCC to link, you make also need to include '-nostdlib' or
      '-nostartfiles' and '-nodefaultlibs'.
 
   3. This example also requires genromfs.  genromfs can be build as part of the
@@ -1338,9 +1356,9 @@ examples/pwm
     CONFIG_NSH_BUILTIN_APPS - Build the PWM test as an NSH built-in function.
       Default: Not built!  The example can only be used as an NSH built-in
       application
- 
+
   Specific configuration options for this example include:
- 
+
     CONFIG_EXAMPLES_PWM_DEVPATH - The path to the default PWM device. Default: /dev/pwm0
     CONFIG_EXAMPLES_PWM_FREQUENCY - The initial PWM frequency.  Default: 100 Hz
     CONFIG_EXAMPLES_PWM_DUTYPCT - The initial PWM duty as a percentage.  Default: 50%
@@ -1369,7 +1387,7 @@ examples/qencoder
   directory.
 
   Specific configuration options for this example include:
- 
+
     CONFIG_EXAMPLES_QENCODER_DEVPATH - The path to the QE device. Default:
       /dev/qe0
     CONFIG_EXAMPLES_QENCODER_NSAMPLES - If CONFIG_NSH_BUILTIN_APPS
@@ -1396,7 +1414,7 @@ examples/relays
 examples/rgmp
 ^^^^^^^^^^^^^
 
-  RGMP stands for RTOS and GPOS on Multi-Processor.  RGMP is a project for 
+  RGMP stands for RTOS and GPOS on Multi-Processor.  RGMP is a project for
   running GPOS and RTOS simultaneously on multi-processor platforms. You can
   port your favorite RTOS to RGMP together with an unmodified Linux to form a
   hybrid operating system. This makes your application able to use both RTOS
@@ -1446,18 +1464,17 @@ examples/sendmail
   NOTE: This test has not been verified on the NuttX target environment.
   As of this writing, unit-tested in the Cygwin/Linux host environment.
 
-  NOTE 2: This sendmail example only works for the simplest of 
+  NOTE 2: This sendmail example only works for the simplest of
   environments.  Virus protection software on your host may have
   to be disabled to allow you to send messages.  Only very open,
   unprotected recipients can be used.  Most will protect themselves
   from this test email because it looks like SPAM.
 
-  Applications using this example will need to provide an appconfig
-  file in the configuration driver with instruction to build applications
-  like:
+  Applications using this example will need to enble the following
+  netutils libraries in their defconfig file:
 
-  CONFIGURED_APPS += uiplib
-  CONFIGURED_APPS += smtp
+    CONFIG_NETUTILS_UIPLIB=y
+    CONFIG_NETUTILS_SMTP=y
 
 examples/serloop
 ^^^^^^^^^^^^^^^^
@@ -1507,7 +1524,7 @@ examples/smart_test
 ^^^^^^^^^^^^^^^^^^^
 
   Performs a file-based test on a SMART (or any) filesystem. Validates
-  seek, append and seek-with-write operations.  
+  seek, append and seek-with-write operations.
 
     * CONFIG_EXAMPLES_SMART_TEST=y
 
@@ -1542,6 +1559,9 @@ examples/telnetd
   the NuttX environment, the NuttShell (at apps/nshlib) supercedes this
   tiny shell and also supports telnetd.
 
+    CONFIG_EXAMPLES_TELNETD - Enable the Telnetd example
+    CONFIG_NETUTILS_UIPLIB, CONFIG_NETUTILS_TELNED - Enable netutils
+      libraries needed by the Telnetd example.
     CONFIG_EXAMPLES_TELNETD_DAEMONPRIO - Priority of the Telnet daemon.
       Default: SCHED_PRIORITY_DEFAULT
     CONFIG_EXAMPLES_TELNETD_DAEMONSTACKSIZE - Stack size allocated for the
@@ -1556,17 +1576,11 @@ examples/telnetd
     CONFIG_EXAMPLES_TELNETD_DRIPADDR - The default router address. Default
       10.0.0.1
     CONFIG_EXAMPLES_TELNETD_NETMASK - The network mask.  Default: 255.255.255.0
- 
-  The appconfig file (apps/.config) should include:
-
-    CONFIGURED_APPS += examples/telnetd
-    CONFIGURED_APPS += netutils/uiplib
-    CONFIGURED_APPS += netutils/telnetd
 
   Also, make sure that you have the following set in the NuttX configuration
   file or else the performance will be very bad (because there will be only
   one character per TCP transfer):
-  
+
     CONFIG_STDIO_BUFFER_SIZE - Some value >= 64
     CONFIG_STDIO_LINEBUFFER=y
 
@@ -1581,12 +1595,11 @@ examples/thttpd
     CONFIG_EXAMPLES_THTTPD_DRIPADDR - Default router IP addess
     CONFIG_EXAMPLES_THTTPD_NETMASK  - Network mask
 
-  Applications using this example will need to provide an appconfig
-  file in the configuration directory with instruction to build applications
-  like:
+  Applications using this example will need to enable the following
+  netutils libraries in the defconfig file:
 
-    CONFIGURED_APPS += uiplib
-    CONFIGURED_APPS += thttpd
+    CONFIG_NETUTILS_UIPLIB=y
+    CONFIG_NETUTILS_THTTPD=y
 
 examples/tiff
 ^^^^^^^^^^^^^
@@ -1611,18 +1624,18 @@ examples/tiff
 
   The following must also be defined in your apps/ configuration file:
 
-    CONFIGURED_APPS += examples/tiff
-    CONFIGURED_APPS += graphics/tiff
+    CONFIG_EXAMPLES_TIFF=y
+    CONFIG_GRAPHICS_TIFF=y
 
 examples/touchscreen
 ^^^^^^^^^^^^^^^^^^^^
 
   This configuration implements a simple touchscreen test at
   apps/examples/touchscreen.  This test will create an empty X11 window
-  and will print the touchscreen output as it is received from the 
+  and will print the touchscreen output as it is received from the
   simulated touchscreen driver.
 
-    CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN - Build the touchscreen test as 
+    CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN - Build the touchscreen test as
       an NSH built-in function.  Default: Built as a standalone problem
     CONFIG_EXAMPLES_TOUCHSCREEN_MINOR - The minor device number.  Minor=N
       corresponds to touchscreen device /dev/inputN.  Note this value must
@@ -1638,13 +1651,13 @@ examples/touchscreen
 
   The following additional configurations must be set in the NuttX
   configuration file:
-  
+
     CONFIG_INPUT=y
     (Plus any touchscreen-specific settings).
 
   The following must also be defined in your apps configuration file:
 
-    CONFIGURED_APPS += examples/touchscreen
+    CONFIG_EXAMPLES_TOUCHSREEN=y
 
   The board-specific logic must provide the following interfaces that will
   be called by the example in order to initialize and uninitialize the
@@ -1659,11 +1672,10 @@ examples/udp
   This is a simple network test for verifying client- and server-
   functionality over UDP.
 
-  Applications using this example will need to provide an appconfig
-  file in the configuration driver with instruction to build applications
-  like:
+  Applications using this example will need to enabled the following
+  netutils libraries in the defconfig file:
 
-  CONFIGURED_APPS += uiplib
+    CONFIG_NETUTILS_UIPLIB=y
 
 examples/uip
 ^^^^^^^^^^^^
@@ -1699,14 +1711,13 @@ examples/uip
     CONFIG_NETUTILS_HTTPDFILESTATS
     CONFIG_NETUTILS_HTTPDNETSTATS
 
-  Applications using this example will need to provide an appconfig
-  file in the configuration driver with instruction to build applications
-  like:
+  Applications using this example will need to enable the following
+  netutils libraries in their defconfig file:
 
-    CONFIGURED_APPS += uiplib
-    CONFIGURED_APPS += dhcpc
-    CONFIGURED_APPS += resolv
-    CONFIGURED_APPS += webserver
+    CONFIG_NETUTILS_UIPLIB=y
+    CONFIG_NETUTILS_DHCPC=y
+    CONFIG_NETUTILS_RESOLV=y
+    CONFIG_NETUTILS_WEBSERVER=y
 
   NOTE:  This example does depend on the perl script at
   nuttx/tools/mkfsdata.pl.  You must have perl installed on your
@@ -1890,37 +1901,37 @@ examples/usbterm
 
   Configuration options:
 
-  CONFIG_EXAMPLES_USBTERM_BUILTIN - Build the usbterm example as an NSH
-    built-in command.  NOTE:  This is not fully functional as of this
-    writing.. It should work, but there is no mechanism in place yet
-    to exit the USB terminal program and return to NSH.
-  CONFIG_EXAMPLES_USBTERM_DEVINIT - If defined, then the example will
-    call a user provided function as part of its initialization:
-       int usbterm_devinit(void);
-    And another user provided function at termination:
-       void usbterm_devuninit(void);
-  CONFIG_EXAMPLES_USBTERM_BUFLEN - The size of the input and output
-    buffers used for receiving data. Default 256 bytes.
+    CONFIG_EXAMPLES_USBTERM_BUILTIN - Build the usbterm example as an NSH
+      built-in command.  NOTE:  This is not fully functional as of this
+      writing.. It should work, but there is no mechanism in place yet
+      to exit the USB terminal program and return to NSH.
+    CONFIG_EXAMPLES_USBTERM_DEVINIT - If defined, then the example will
+      call a user provided function as part of its initialization:
+         int usbterm_devinit(void);
+      And another user provided function at termination:
+         void usbterm_devuninit(void);
+    CONFIG_EXAMPLES_USBTERM_BUFLEN - The size of the input and output
+      buffers used for receiving data. Default 256 bytes.
 
   If CONFIG_USBDEV_TRACE is enabled (or CONFIG_DEBUG and CONFIG_DEBUG_USB, or
   CONFIG_USBDEV_TRACE), then the example code will also manage the USB trace
   output.  The amount of trace output can be controlled using:
 
-  CONFIG_EXAMPLES_USBTERM_TRACEINIT
-    Show initialization events
-  CONFIG_EXAMPLES_USBTERM_TRACECLASS
-    Show class driver events
-  CONFIG_EXAMPLES_USBTERM_TRACETRANSFERS
-    Show data transfer events
-  CONFIG_EXAMPLES_USBTERM_TRACECONTROLLER
-    Show controller events
-  CONFIG_EXAMPLES_USBTERM_TRACEINTERRUPTS
-    Show interrupt-related events.
+    CONFIG_EXAMPLES_USBTERM_TRACEINIT
+      Show initialization events
+    CONFIG_EXAMPLES_USBTERM_TRACECLASS
+      Show class driver events
+    CONFIG_EXAMPLES_USBTERM_TRACETRANSFERS
+      Show data transfer events
+    CONFIG_EXAMPLES_USBTERM_TRACECONTROLLER
+      Show controller events
+    CONFIG_EXAMPLES_USBTERM_TRACEINTERRUPTS
+      Show interrupt-related events.
 
   NOTE:  By default, USBterm uses readline to get data from stdin.  So your
-  appconfig file must have the following build path:
+  defconfig file must have the following build path:
 
-    CONFIGURED_APPS += system/readline
+    CONFIG_SYSTEM_READLINE=y
 
   NOTE: If you use the USBterm task over a telnet NSH connection, then you
   should set the following configuration item:
@@ -1953,9 +1964,9 @@ examples/watchdog
     CONFIG_NSH_BUILTIN_APPS - Build the watchdog time test as an NSH
       built-in function. Default: Not built!  The example can only be used
       as an NSH built-in application
- 
+
   Specific configuration options for this example include:
- 
+
     CONFIG_EXAMPLES_WATCHDOG_DEVPATH - The path to the Watchdog device.
       Default: /dev/watchdog0
     CONFIG_EXAMPLES_WATCHDOG_PINGTIME - Time in milliseconds that the example
@@ -2000,13 +2011,12 @@ examples/wget
     cd examples/wget
     make -f Makefile.host
 
-  Applications using this example will need to provide an appconfig
-  file in the configuration driver with instruction to build applications
-  like:
+  Applications using this example will need to enable the following netutils
+  libraries in the defconfig file:
 
-    CONFIGURED_APPS += uiplib
-    CONFIGURED_APPS += resolv
-    CONFIGURED_APPS += webclient
+    CONFIG_NETUTILS_UIPLIB=y
+    CONFIG_NETUTILS_RESOLV=y
+    CONFIG_NETUTILS_WEBCLIENT=y
 
 examples/wget
 ^^^^^^^^^^^^^
diff --git a/apps/examples/nx/Kconfig b/apps/examples/nx/Kconfig
index f636daf84..4dcc42579 100644
--- a/apps/examples/nx/Kconfig
+++ b/apps/examples/nx/Kconfig
@@ -70,7 +70,7 @@ config EXAMPLES_NX_DEFAULT_FONT
 	default y
 
 config EXAMPLES_NX_FONTID
-	bool "Font ID"
+	int "Font ID"
 	depends on !EXAMPLES_NX_DEFAULT_FONT
 	---help---
 		Selects the font (see font ID numbers in include/nuttx/nx/nxfonts.h)
diff --git a/apps/examples/nxhello/Kconfig b/apps/examples/nxhello/Kconfig
index 22f16c9b2..52924e38e 100644
--- a/apps/examples/nxhello/Kconfig
+++ b/apps/examples/nxhello/Kconfig
@@ -9,5 +9,84 @@ config EXAMPLES_NXHELLO
 	---help---
 		Enable the NX graphics \"Hello, World!\" example
 
-if EXAMPLES_HELLOXX
+if EXAMPLES_NXHELLO
+
+config EXAMPLES_NXHELLO_VPLANE
+	int "Video Plane"
+	default 0
+	---help---
+		The plane to select from the framebuffer driver for use in the test.
+		Default: 0
+
+config EXAMPLES_NXHELLO_DEVNO
+	int "Video Device Number"
+	default 0
+	---help---
+		The LCD device to select from the LCD driver for use in the test:
+		Default: 0
+
+config EXAMPLES_NXHELLO_BPP
+	int "Bits-Per-Pixel"
+	default 32
+	---help---
+		Pixels per pixel to use.  Valid options include 2, 4, 8, 16, 24,
+		and 32.  Default is 32.
+
+
+comment "Example Color Configuration"
+
+config EXAMPLES_NXHELLO_DEFAULT_COLORS
+	bool "Use Default Colors"
+	default y
+
+if !EXAMPLES_NXHELLO_DEFAULT_COLORS
+
+config EXAMPLES_NXHELLO_BGCOLOR
+	hex "Background color"
+	default 0x0
+	---help---
+		The color of the background.  Default depends on config
+		EXAMPLES_NXHELLO_BPP.
+
+config EXAMPLES_NXHELLO_FONTCOLOR
+	hex "Background font color"
+	default 0x0
+	---help---
+		The color of the fonts used in the background window. Default
+		depends on config EXAMPLES_NXHELLO_BPP.
+
+endif
+
+comment "Example Font Configuration"
+
+config EXAMPLES_NXHELLO_DEFAULT_FONT
+	bool "Use Default Font"
+	default y
+
+if !EXAMPLES_NXHELLO_DEFAULT_FONT
+
+config EXAMPLES_NXHELLO_FONTID
+	int "Background font ID"
+	default 0
+	---help---
+		Selects the font used in the background window (see font ID numbers
+		in include/nuttx/nx/nxfonts.h)
+
+endif
+
+config EXAMPLES_NXHELLO_EXTERNINIT
+	bool "External Device Initialization"
+	default n
+	---help---
+		The driver for the graphics device on this platform requires some
+		unusual initialization.  This is the case, for example, for SPI LCD/OLED
+		devices.  If this configuration is selected, then the platform code
+		must provide an LCD initialization function with a prototype like:
+
+		#ifdef CONFIG_NX_LCDDRIVER
+		FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno);
+		#else
+		FAR struct fb_vtable_s *up_nxdrvinit(unsigned int devno);
+		#endif
+
 endif
diff --git a/apps/examples/nxhello/Makefile b/apps/examples/nxhello/Makefile
index 4a72eb8c7..7b8d5ed04 100644
--- a/apps/examples/nxhello/Makefile
+++ b/apps/examples/nxhello/Makefile
@@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
-ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y)
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
diff --git a/apps/examples/nxtext/Kconfig b/apps/examples/nxtext/Kconfig
index 6b220b2a2..d7c6d507a 100644
--- a/apps/examples/nxtext/Kconfig
+++ b/apps/examples/nxtext/Kconfig
@@ -100,14 +100,14 @@ config EXAMPLES_NXTEXT_DEFAULT_FONT
 if !EXAMPLES_NXTEXT_DEFAULT_FONT
 
 config EXAMPLES_NXTEXT_BGFONTID
-	bool "Background font ID"
+	int "Background font ID"
 	default 0
 	---help---
 		Selects the font used in the background window (see font ID numbers
 		in include/nuttx/nx/nxfonts.h)
 
 config EXAMPLES_NXTEXT_PUFONTID
-	bool "Pop-up font ID"
+	int "Pop-up font ID"
 	default 0
 	---help---
 		Selects the font used in the pop-up window (see font ID numbers
diff --git a/apps/examples/touchscreen/Kconfig b/apps/examples/touchscreen/Kconfig
index 2f40b3d65..15f149e29 100644
--- a/apps/examples/touchscreen/Kconfig
+++ b/apps/examples/touchscreen/Kconfig
@@ -11,15 +11,6 @@ config EXAMPLES_TOUCHSCREEN
 
 if EXAMPLES_TOUCHSCREEN
 
-config EXAMPLES_TOUCHSCREEN_BUILTIN
-	bool "NSH built-in application"
-	default y
-	depends on NSH_BUILTIN_APPS
-	---help---
-		Build the touchscreen test as an NSH built-in function.  Default:
-		Built as a standalone problem unless NSH_BUILTIN_APPS is defined.
-		Then the default is to build as an NSH built-in application.
-
 config EXAMPLES_TOUCHSCREEN_MINOR
 	int "Touchscreen minor device number"
 	default 0
@@ -38,9 +29,9 @@ config EXAMPLES_TOUCHSCREEN_DEVPATH
 config EXAMPLES_TOUCHSCREEN_NSAMPLES
 	int "Number of samples"
 	default 0
-	depends on !EXAMPLES_TOUCHSCREEN_BUILTIN
+	depends on NSH_BUILTIN_APPS
 	---help---
-		If EXAMPLES_TOUCHSCREEN_BUILTIN is defined, then the number of
+		If NSH_BUILTIN_APPS is defined, then the number of touchscreen
 		samples is provided on the command line and this value is ignored.
 		Otherwise, this number of samples is collected and the program
 		terminates.  Default:  Zero (Samples are collected indefinitely).
diff --git a/apps/examples/touchscreen/Makefile b/apps/examples/touchscreen/Makefile
index 1a65c7282..6a3127f42 100644
--- a/apps/examples/touchscreen/Makefile
+++ b/apps/examples/touchscreen/Makefile
@@ -83,7 +83,7 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call ARCHIVE, $(BIN), $(OBJS))
 	@touch .built
 
-ifeq ($(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN),y)
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
 $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
 	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
 
diff --git a/apps/interpreters/README.txt b/apps/interpreters/README.txt
index 9fe39a69c..667268809 100644
--- a/apps/interpreters/README.txt
+++ b/apps/interpreters/README.txt
@@ -33,7 +33,7 @@ pcode
       sub-directory.
 
     Example:
-  
+
       ./INSTALL.sh -16 $PWD/../../../apps/interpreters
 
     After installation, the NuttX apps/interpresters directory will contain
@@ -52,11 +52,18 @@ pcode
               `-- model-specific source files
 
   pashello
-  
+
     There is a simple Pascal example at apps/examples/pashello.  This is the
     standard "Hello, World!" example written in Pascal and interpreted from
     Pascal P-Code at runtime.  To use this example, place the following in
-    your appconfig file"
+    your defonfig file:
+
+      CONFIG_EXAMPLES_PASHELLO=y
+      CONFIG_INTERPRETERS_PCODE=y
+
+    Old Style (deprecated).  In the older configuration files, you would have
+    used an appconfig file containing the following definitions in order to
+    accomplish the same thing:
 
       # Path to example in apps/examples containing the passhello_main entry point
 
diff --git a/apps/interpreters/ficl/README.txt b/apps/interpreters/ficl/README.txt
index bac9f3148..57e370338 100644
--- a/apps/interpreters/ficl/README.txt
+++ b/apps/interpreters/ficl/README.txt
@@ -29,12 +29,17 @@ information as "recommendations" -- not necessarily proven instructions.
    For example, './configure.sh ficl-4.1.0' will leave the Makefile
    fragment 'Make.srcs' in the ficl build directory.
 
-5. Create your NuttX configuration.  The appconfig file should include
-   (1) the path to your application code, and (2) the path to the Ficl
-   build directory.  That latter would appear as the following line in
-   your appconfig file:
+5. Create your NuttX configuration.  Using the 'make menuconfig', you
+   should select:
 
-   CONFIGURED_APPS += interpreters/ficl
+     CONFIG_INTERPRETERS_FICL=y
+
+   Deprecated: In the older style configuration, you would have used
+   an appconfig file to include (1) the path to your application code,
+   and (2) the path to the Ficl build directory.  That latter would
+   have appeared as the following line in your appconfig file:
+
+     CONFIGURED_APPS += interpreters/ficl
 
  6. Configure and build NuttX.  On successful completion, the Ficl objects
     will be available in apps/libapps.a and that NuttX binary will be
diff --git a/apps/netutils/README.txt b/apps/netutils/README.txt
index eaf508d48..52becf800 100644
--- a/apps/netutils/README.txt
+++ b/apps/netutils/README.txt
@@ -69,11 +69,13 @@ highly influenced by uIP) include:
               See http://acme.com/software/thttpd/ for general THTTPD
               information.  See apps/include/netutils/thttpd.h
               for interface information. Applications using this thttpd
-              will need to provide an appconfig file in the configuration
-              directory with instruction to build applications like:
+              will need to provide the following definitions in the
+              defconfig file to select the appropriate netutils
+              libraries:
+
+                CONFIG_NETUTILS_UIPLIB=y
+                CONFIG_NETUTILS_THTTPD=y
 
-               CONFIGURED_APPS += uiplib
-               CONFIGURED_APPS += thttpd
   xmlrpc    - The Embeddable Lightweight XML-RPC Server discussed at
               http://www.drdobbs.com/web-development/an-embeddable-lightweight-xml-rpc-server/184405364
 
@@ -85,16 +87,16 @@ Telnetd in NuttX is to support the NuttShell (NSH) Telnet front end.  See
 apps/include/netutils/telnetd.h for information about how to incorporate
 Telnetd into your custom applications.
 
-To enable and link the Telnetd daemon, you need to include the following in 
-in your appconfig (apps/.config) file:
+To enable and link the Telnetd daemon, you need to include the following in
+in your defconfig file:
 
-  CONFIGURED_APPS += uiplib
-  CONFIGURED_APPS += netutils/telnetd
+  CONFIG_NETUTILS_UIPLIB=y
+  CONFIG_NETUTILS_TELNETD=y
 
 Also if the Telnet console is enabled, make sure that you have the following
 set in the NuttX configuration file or else the performance will be very bad
 (because there will be only one character per TCP transfer):
-  
+
   CONFIG_STDIO_BUFFER_SIZE   Some value >= 64
   CONFIG_STDIO_LINEBUFFER=y  Since Telnetd is line oriented, line buffering
                              is optimal.
diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig
index 72041ec76..ded9f2e67 100644
--- a/apps/nshlib/Kconfig
+++ b/apps/nshlib/Kconfig
@@ -252,6 +252,13 @@ config NSH_LINELEN
 		The maximum length of one command line and of one output line.
 		Default: 80
 
+config NSH_MAXARGUMENTS
+	int "Maximum number of command arguments"
+	default 6
+	---help---
+		The maximum number of NSH command arguments.
+		Default: 6
+
 config NSH_NESTDEPTH
 	int "Maximum command nesting"
 	default 3
@@ -354,6 +361,16 @@ config NSH_ROMFSSECTSIZE
 		increased if the ROMFS volume were to be become large.  Any value
 		selected must be a power of 2.
 
+config NSH_ARCHROMFS
+	bool "Architecture-specific ROMFS header"
+	default n
+	depends on NSH_ROMFSETC
+	---help---
+		Enable this option to provide an architecture-specific ROMFS
+		header at <arch/board/nsh_romfsimg.h>. Note that this header
+		will be copied from nuttx/configs/<boardname>/include and should
+		be stored at this location.
+
 config NSH_FATDEVNO
 	int "FAT block device minor number"
 	default 0
diff --git a/apps/nshlib/README.txt b/apps/nshlib/README.txt
index a03f4a8ee..bd2dd75f7 100644
--- a/apps/nshlib/README.txt
+++ b/apps/nshlib/README.txt
@@ -273,7 +273,7 @@ o date [-s "MMM DD HH:MM:SS YYYY"]
 
   Only one format is used both on display and when setting the date/time:
   MMM DD HH:MM:SS YYYY.  For example,
-  
+
     data -s "Sep 1 11:30:00 2011"
 
   24-hour time format is assumed.
@@ -326,7 +326,7 @@ o df
     Size   Blocks     Used Available Mounted on
       64        6        6         0 /etc
      512      985        2       983 /tmp
-  nsh> 
+  nsh>
 
 o echo [<string|$name> [<string|$name>...]]
 
@@ -757,7 +757,7 @@ o rmdir <dir-path>
   Recall that NuttX uses a pseudo filesystem for its root file system. The
   rmdir command can only be used to remove directories from volumes set up
   with the mount command; it cannot be used to remove directories from the
-  pseudo filesystem. 
+  pseudo filesystem.
 
   Example:
   ^^^^^^^^
@@ -808,7 +808,7 @@ o unset <name>
     nsh>
 
  o urldecode [-f] <string or filepath>
- 
+
  o urlencode [-f] <string or filepath>
 
 o usleep <usec>
@@ -844,7 +844,7 @@ NSH Configuration Settings
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The availability of the above commands depends upon features that
-may or may not be enabled in the NuttX configuration file.  The 
+may or may not be enabled in the NuttX configuration file.  The
 following table indicates the dependency of each command on NuttX
 configuration settings.  General configuration settings are discussed
 in the NuttX Porting Guide.  Configuration settings specific to NSH
@@ -948,7 +948,7 @@ NSH-Specific Configuration Settings
       Support external registered, "builtin" applications that can be
       executed from the NSH command line (see apps/README.txt for
       more information).
-  
+
   * CONFIG_NSH_FILEIOSIZE
       Size of a static I/O buffer used for file access (ignored if
       there is no filesystem). Default is 1024.
@@ -1099,7 +1099,7 @@ NSH-Specific Configuration Settings
 
   * CONFIG_NET=y
       Of course, networking must be enabled
- 
+
   * CONFIG_NSOCKET_DESCRIPTORS
       And, of course, you must allocate some socket descriptors.
 
@@ -1137,7 +1137,7 @@ NSH-Specific Configuration Settings
 
   * CONFIG_NET=y
       Of course, networking must be enabled
- 
+
   * CONFIG_NSOCKET_DESCRIPTORS
       And, of course, you must allocate some socket descriptors.
 
@@ -1147,7 +1147,7 @@ NSH-Specific Configuration Settings
 
   * CONFIG_NET_BROADCAST=y
       UDP broadcast support is needed.
- 
+
   * CONFIG_NET_BUFSIZE=650 (or larger)
       Per RFC2131 (p. 9), the DHCP client must be prepared to receive DHCP
       messages of up to 576 bytes (excluding Ethernet, IP, or UDP headers and FCS).
@@ -1166,7 +1166,7 @@ NSH-Specific Configuration Settings
       start with '/'.
 
   * CONFIG_NSH_ROMFSDEVNO
-      This is the minor number of the ROMFS block device.  The default is 
+      This is the minor number of the ROMFS block device.  The default is
       '0' corresponding to /dev/ram0.
 
   * CONFIG_NSH_ROMFSSECTSIZE
@@ -1180,7 +1180,7 @@ NSH-Specific Configuration Settings
   describe that FAT FS.
 
   * CONFIG_NSH_FATDEVNO
-      This is the minor number of the FAT FS block device.  The default is 
+      This is the minor number of the FAT FS block device.  The default is
       '1' corresponding to /dev/ram1.
 
   * CONFIG_NSH_FATSECTSIZE
@@ -1212,7 +1212,6 @@ Common Problems
   Problem:
     The function 'readline' is undefined.
   Usual Cause:
-    The following is missing from your appconfig file:
-
-    CONFIGURED_APPS += system/readline
+    The following is missing from your defconfig file:
 
+      CONFIG_SYSTEM_READLINE=y
diff --git a/apps/system/i2c/README.txt b/apps/system/i2c/README.txt
index 7b432533b..1d6f22025 100644
--- a/apps/system/i2c/README.txt
+++ b/apps/system/i2c/README.txt
@@ -1,397 +1,400 @@
-README File for the I2C Tool

-============================

-

-The I2C tool provides a way to debug I2C related problems.  This README file

-will provide usage information for the I2C tools.

-

-CONTENTS

-========

-

-  o System Requirements

-    - I2C Driver

-    - Configuration Options

-  o Help

-  o Common Line Form

-  o Common Command Options

-    - "Sticky" Options

-    - Environment variables

-    - Common Option Summary

-  o Command summary

-    - bus

-    - dev

-    - get

-    - set

-    - verf

-  o I2C Build Configuration

-    - NuttX Configuration Requirements

-    - I2C Tool Configuration Options

-

-System Requirements

-===================

-

-I2C Driver

-----------

-In order to use the I2C driver, you system -- in particular, your I2C driver --

-must meet certain requirements:

-

-1. It support calling up_i2cinitialize() numerous times, resetting the I2C

-   hardware on each (initial) time.  up_i2cuninitialize() will be called after

-   each call to up_i2cinitialize() to free any resources and disable the I2C.

-2. up_i2cinitialize must accept any interface number without crashing.  It

-   must simply return NULL if the device is not supported.

-3. The I2C driver must support the transfer method (CONFIG_I2C_TRANSFER=y).

-

-The I2C tool is designed to be implemented as a NuttShell (NSH) add-on.  Read

-the apps/nshlib/README.txt file for information about add-ons.

-

-Configuration Options

----------------------

-CONFIG_I2CTOOL_BUILTIN - Build the tools as an NSH built-in command

-CONFIG_I2CTOOL_MINBUS - Smallest bus index supported by the hardware (default 0).

-CONFIG_I2CTOOL_MAXBUS - Largest bus index supported by the hardware (default 3)

-CONFIG_I2CTOOL_MINADDR - Minium device address (default: 0x03)

-CONFIG_I2CTOOL_MAXADDR - Largest device address (default: 0x77)

-CONFIG_I2CTOOL_MAXREGADDR - Largest register address (default: 0xff)

-CONFIG_I2CTOOL_DEFFREQ - Default frequency (default: 4000000)

-

-HELP

-====

-

-First of all, the I2C tools supports a pretty extensive help output.  That

-help output can be view by entering either:

-

-  nsh> i2c help

-

-or

-

-  nsh> i2c ?

-

-Here is an example of the help output.  I shows the general form of the

-command line, the various I2C commands supported with their unique command

-line options, and a more detailed summary of the command I2C command

-options.

-

-  nsh> i2c help

-  Usage: i2c <cmd> [arguments]

-  Where <cmd> is one of:

-

-    Show help     : ?

-    List buses    : bus

-    List devices  : dev [OPTIONS] <first> <last>

-    Read register : get [OPTIONS] [<repititions>]

-    Show help     : help

-    Write register: set [OPTIONS] <value> [<repititions>]

-    Verify access : verf [OPTIONS] <value> [<repititions>]

-

-  Where common "sticky" OPTIONS include:

-    [-a addr] is the I2C device address (hex).  Default: 03 Current: 03

-    [-b bus] is the I2C bus number (decimal).  Default: 1 Current: 1

-    [-r regaddr] is the I2C device register address (hex).  Default: 00 Current: 00

-    [-w width] is the data width (8 or 16 decimal).  Default: 8 Current: 8

-    [-s|n], send/don't send start between command and data.  Default: -n Current: -n

-    [-i|j], Auto increment|don't increment regaddr on repititions.  Default: NO Current: NO

-    [-f freq] I2C frequency.  Default: 100000 Current: 100000

-

-  NOTES:

-  o An environment variable like $PATH may be used for any argument.

-  o Arguments are "sticky".  For example, once the I2C address is

-    specified, that address will be re-used until it is changed.

-

-  WARNING:

-  o The I2C dev command may have bad side effects on your I2C devices.

-    Use only at your own risk.

-

-COMMAND LINE FORM

-=================

-

-The I2C is started from NSH by invoking the 'i2c' command from the NSH

-command line. The general form of the 'i2c' command is:

-

-  i2c <cmd> [arguments]

-

-Where <cmd> is a "sub-command" and identifies one I2C operations supported

-by the tool.  [arguments] represents the list of arguments needed to perform

-the I2C operation.  Those arguments vary from command to command as

-described below.  However, there is also a core set of common OPTIONS

-supported by all commands.  So perhaps a better representation of the

-general I2C command would be:

-

-  i2c <cmd> [OPTIONS] [arguments]

-

-Where [OPTIONS] represents the common options and and arguments represent

-the operation-specific arguments.

-

-COMMON COMMAND OPTIONS

-======================

-

-"Sticky" Options

-----------------

-In order to interact with I2C devices, there are a number of I2C parameters

-that must be set correctly.  One way to do this would be to provide to set

-the value of each separate command for each I2C parameter.  The I2C tool

-takes a different approach, instead:  The I2C configuration can be specified

-as a (potentially long) sequence of command line arguments.

-

-These arguments, however, are "sticky."  They are sticky in the sense that

-once you set the I2C parameter, that value will remain until it is reset

-with a new value (or until you reset the board).

-

-Environment Variables

----------------------

-NOTE also that if environment variables are not disabled (by

-CONFIG_DISABLE_ENVIRON=y), then these options may also be environment

-variables.  Environment variables must be preceded with the special

-character $.  For example, PWD is the variable that holds the current

-working directory and so $PWD could be used as a command line argument.  The

-use of environment variables on the I2C tools command is really only useful

-if you wish to write NSH scripts to execute a longer, more complex series of

-I2C commands.

-

-Common Option Summary

----------------------

-

-[-a addr] is the I2C device address (hex).  Default: 03 Current: 03

-

-  The [-a addr] sets the I2C device address.  The valid range is 0x03

-  through 0x77 (this valid range is controlled by the configuration settings

-  CONFIG_I2CTOOL_MINADDR and CONFIG_I2CTOOL_MAXADDR).  If you are working

-  with the same device, the address needs to be set only once.

-  

-  All I2C address are 7-bit, hexadecimal values.

-

-  NOTE 1: Notice in the "help" output above it shows both default value of

-  the I2C address (03 hex) and the current address value (also 03 hex).

-

-  NOTE 2: Sometimes I2C addresses are represented as 8-bit values (with

-  bit zero indicating a read or write operation).  The I2C tool uses a

-  7-bit representation of the address with bit 7 unused and no read/write

-  indication in bit 0.  Essentially, the 7-bit address is like the 8-bit

-  address shifted right by 1.

-

-  NOTE 3: Most I2C bus controllers will also support 10-bit addressing.

-  That capability has not been integrated into the I2C tool as of this

-  writing.

-

-[-b bus] is the I2C bus number (decimal).  Default: 1 Current: 1

-

-  Most devices support multiple I2C devices and also have unique bus

-  numbering.  This option identifies which bus you are working with now.

-  The valid range of bus numbers is controlled by the configuration settings

-  CONFIG_I2CTOOL_MINBUS and CONFIG_I2CTOOL_MAXBUS.

-  

-  The bus numbers are small, decimal numbers.

-

-[-r regaddr] is the I2C device register address (hex).  Default: 00 Current: 00

-

-  The I2C set and get commands will access registers on the I2C device.  This

-  option selects the device register address (sometimes called the sub-address).

-  This is an 8-bit hexadecimal value.  The maximum value is determined by

-  the configuration setting CONFIG_I2CTOOL_MAXREGADDR.

-

-[-w width] is the data width (8 or 16 decimal).  Default: 8 Current: 8

-

-  Device register data may be 8-bit or 16-bit.  This options selects one of

-  those two data widths.

-

-[-s|n], send/don't send start between command and data.  Default: -n Current: -n

-

-  This determines whether or not there should be a new I2C START between

-  sending of the register address and sending/receiving of the register data.

-

-[-i|j], Auto increment|don't increment regaddr on repititions.  Default: NO Current: NO

-

-  On commands that take a optional number of repetitions, the option can be

-  used to temporarily increment the regaddr value by one on each repitition.

-

-[-f freq] I2C frequency.  Default: 400000 Current: 400000

-

-  The [-f freq] sets the frequency of the I2C device.

-

-COMMAND SUMMARY

-===============

-

-We have already seen the I2C help (or ?) commands above.  This section will

-discuss the remaining commands.

-

-List buses: bus [OPTIONS]

---------------------------

-

-This command will simply list all of the configured I2C buses and indicate

-which are supported by the driver and which are not:

-  

-   BUS   EXISTS?

-  Bus 1: YES

-  Bus 2: NO

-

-The valid range of bus numbers is controlled by the configuration settings

-CONFIG_I2CTOOL_MINBUS and CONFIG_I2CTOOL_MAXBUS.

-

-List devices: dev [OPTIONS] <first> <last>

-------------------------------------------

-

-The 'dev' command will attempt to identify all of the I2C devices on the

-selected bus.  The <first> and <last> arguments are 7-bit, hexadecimal

-I2C addresses.  This command will examine a range of addresses beginning

-with <first> and continuing through <last>.  It will request the value

-of register zero from each device.

-

-If the device at an address responds, then this command will display the

-address of the device.  If the device does not respond, this command will

-display "--".  The resulting display is like:

-

-nsh> i2c dev 03 77

-     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f

-00:          -- -- -- -- -- -- -- -- -- -- -- -- --

-10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --

-20: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --

-30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --

-40: -- -- -- -- -- -- -- -- -- 49 -- -- -- -- -- --

-50: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --

-70: -- -- -- -- -- -- -- --

-

-WARNINGS:

-  o The I2C dev command may have bad side effects on certain I2C devices.

-    For example, if could cause data loss in an EEPROM device.

-  o The I2C dev command also depends upon the underlying behavior of the

-    I2C driver.  How does the driver respond to addressing failures?

-

-Read register: get [OPTIONS]

-----------------------------

-

-  This command will read the value of the I2C register using the selected

-  I2C parameters in the common options.  No other arguments are required.

-  

-  This command with write the 8-bit address value then read an 8- or 16-bit

-  data value from the device.  Optionally, it may re-start the transfer

-  before obtaining the data.

-

-  An optional <repititions> argument can be supplied to repeat the

-  read operation an arbitrary number of times (up to 2 billion).  If

-  auto-increment is select (-i), then the register address will be

-  temporarily incremented on each repitions.  The increment is temporary

-  in the since that it will not alter the "sticky" value of the

-  register address.

-

-  On success, the output will look like the following (the data value

-  read will be shown as a 4-character hexadecimal number if the 16-bit

-  data width option is selected).

-

-  READ Bus: 1 Addr: 49 Subaddr: 04 Value: 96

-

-  All values (except the bus numbers) are hexadecimal.

-

-Write register: set [OPTIONS] <value>

--------------------------------------

-

-  This command will write a value to an I2C register using the selected

-  I2C parameters in the common options.  The value to write must be provided

-  as the final, hexadecimal value.  This value may be an 8-bit value (in the

-  range 00-ff) or a 16-bit value (in the range 0000-ffff), depending upon

-  the selected data width.

-  

-  This command will write the 8-bit address value then write the 8- or 16-bit

-  data value to the device.  Optionally, it may re-start the transfer

-  before writing the data.

-

-  An optional <repititions> argument can be supplied to repeat the

-  write operation an arbitrary number of times (up to 2 billion).  If

-  auto-increment is select (-i), then the register address will be

-  temporarily incremented on each repitions.  The increment is temporary

-  in the since that it will not alter the "sticky" value of the

-  register address.

-

-  On success, the output will look like the following (the data value

-  written will be shown as a 4-character hexadecimal number if the 16-bit

-  data width option is selected).

-

-  WROTE Bus: 1 Addr: 49 Subaddr: 04 Value: 96

-

-  All values (except the bus numbers) are hexadecimal.

-

-Verify access : verf [OPTIONS] <value> [<repititions>]

-------------------------------------------------------

-

-  This command combines writing and reading from an I2C device register.

-  It will write a value to an will write a value to an I2C register using

-  the selected I2C parameters in the common options just as described for

-  tie 'set' command.  Then this command will read the value back just

-  as described with the 'get' command.  Finally, this command will compare

-  the value read and against the value written and emit an error message

-  if they do not match.

-

-  If no value is provided, then this command will use the register address

-  itself as the data, providing for a address-in-address test.

-

-  An optional <repititions> argument can be supplied to repeat the

-  verify operation an arbitrary number of times (up to 2 billion).  If

-  auto-increment is select (-i), then the register address will be

-  temporarily incremented on each repitions.  The increment is temporary

-  in the since that it will not alter the "sticky" value of the

-  register address.

-

-  On success, the output will look like the following (the data value

-  written will be shown as a 4-character hexadecimal number if the 16-bit

-  data width option is selected).

-

-  VERIFY Bus: 1 Addr: 49 Subaddr: 04 Wrote: 96 Read: 92 FAILURE

-

-  All values (except the bus numbers) are hexadecimal.

-

-I2C BUILD CONFIGURATION

-=======================

-

-NuttX Configuration Requirements

---------------------------------

-The I2C tools requires the following in your NuttX configuration:

-

-1. Device-specific I2C support must be enabled.  The I2C tool will call the

-   platform-specific function up_i2cinitialize() to get instances of the

-   I2C interface and the platform-specific function up_i2cuninitialize()

-   to discard instances of the I2C interface.

-

-   NOTE 1: The I2C interface is defined in include/nuttx/i2c.h.

-

-   NOTE 2: This I2C tool uses direct I2C device interfaces.  As such, it

-   relies on internal OS interfaces that are not normally available to a

-   user-space program.  As a result, the I2C tool cannot be used if a

-   NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL).

-

-2. I2C driver configuration

-

-   The CONFIG_I2C_TRANSFER option must also be set in your NuttX

-   configuration.  This configuration is the defconfig file in your

-   configuration directory that is copied to the NuttX top-level

-   directory as .config when NuttX is configured.

-

-     CONFIG_I2C_TRANSFER=y

-

-   NOTE:  CONFIG_I2C_TRANSFER adds extra methods to the I2C interface.

-   Not all I2C interfaces support these extra methods.  If your platform's

-   I2C driver does not support these extra methods, then you cannot use

-   the I2C tool unless you extend the support in your platform I2C

-   driver.

-

-3. Application configuration.

-

-   The path to the I2C tool directory must also be set in your NuttX

-   application configuration.  This application configuration is the

-   appconfig file in your configuration directory that is copied to the

-   NuttX application directory as .config when NuttX is configured.

-

-     CONFIGURE_APPS += system/i2c

-

-I2C Tool Configuration Options

-------------------------------

-

-The default behavior of the I2C tool can be modified by the setting the

-options in the NuttX configuration.  This configuration is the defconfig

-file in your configuration directory that is copied to the NuttX top-level

-directory as .config when NuttX is configured.

-

-  CONFIG_I2CTOOL_BUILTIN: Build the tools as an NSH built-in command

-  CONFIG_I2CTOOL_MINBUS: Smallest bus index supported by the hardware (default 0).

-  CONFIG_I2CTOOL_MAXBUS: Largest bus index supported by the hardware (default 3)

-  CONFIG_I2CTOOL_MINADDR: Minium device address (default: 0x03)

-  CONFIG_I2CTOOL_MAXADDR: Largest device address (default: 0x77)

-  CONFIG_I2CTOOL_MAXREGADDR: Largest register address (default: 0xff)

-  CONFIG_I2CTOOL_DEFFREQ: Default frequency (default: 4000000)

+README File for the I2C Tool
+============================
+
+The I2C tool provides a way to debug I2C related problems.  This README file
+will provide usage information for the I2C tools.
+
+CONTENTS
+========
+
+  o System Requirements
+    - I2C Driver
+    - Configuration Options
+  o Help
+  o Common Line Form
+  o Common Command Options
+    - "Sticky" Options
+    - Environment variables
+    - Common Option Summary
+  o Command summary
+    - bus
+    - dev
+    - get
+    - set
+    - verf
+  o I2C Build Configuration
+    - NuttX Configuration Requirements
+    - I2C Tool Configuration Options
+
+System Requirements
+===================
+
+I2C Driver
+----------
+In order to use the I2C driver, you system -- in particular, your I2C driver --
+must meet certain requirements:
+
+1. It support calling up_i2cinitialize() numerous times, resetting the I2C
+   hardware on each (initial) time.  up_i2cuninitialize() will be called after
+   each call to up_i2cinitialize() to free any resources and disable the I2C.
+2. up_i2cinitialize must accept any interface number without crashing.  It
+   must simply return NULL if the device is not supported.
+3. The I2C driver must support the transfer method (CONFIG_I2C_TRANSFER=y).
+
+The I2C tool is designed to be implemented as a NuttShell (NSH) add-on.  Read
+the apps/nshlib/README.txt file for information about add-ons.
+
+Configuration Options
+---------------------
+CONFIG_I2CTOOL_BUILTIN - Build the tools as an NSH built-in command
+CONFIG_I2CTOOL_MINBUS - Smallest bus index supported by the hardware (default 0).
+CONFIG_I2CTOOL_MAXBUS - Largest bus index supported by the hardware (default 3)
+CONFIG_I2CTOOL_MINADDR - Minium device address (default: 0x03)
+CONFIG_I2CTOOL_MAXADDR - Largest device address (default: 0x77)
+CONFIG_I2CTOOL_MAXREGADDR - Largest register address (default: 0xff)
+CONFIG_I2CTOOL_DEFFREQ - Default frequency (default: 4000000)
+
+HELP
+====
+
+First of all, the I2C tools supports a pretty extensive help output.  That
+help output can be view by entering either:
+
+  nsh> i2c help
+
+or
+
+  nsh> i2c ?
+
+Here is an example of the help output.  I shows the general form of the
+command line, the various I2C commands supported with their unique command
+line options, and a more detailed summary of the command I2C command
+options.
+
+  nsh> i2c help
+  Usage: i2c <cmd> [arguments]
+  Where <cmd> is one of:
+
+    Show help     : ?
+    List buses    : bus
+    List devices  : dev [OPTIONS] <first> <last>
+    Read register : get [OPTIONS] [<repititions>]
+    Show help     : help
+    Write register: set [OPTIONS] <value> [<repititions>]
+    Verify access : verf [OPTIONS] <value> [<repititions>]
+
+  Where common "sticky" OPTIONS include:
+    [-a addr] is the I2C device address (hex).  Default: 03 Current: 03
+    [-b bus] is the I2C bus number (decimal).  Default: 1 Current: 1
+    [-r regaddr] is the I2C device register address (hex).  Default: 00 Current: 00
+    [-w width] is the data width (8 or 16 decimal).  Default: 8 Current: 8
+    [-s|n], send/don't send start between command and data.  Default: -n Current: -n
+    [-i|j], Auto increment|don't increment regaddr on repititions.  Default: NO Current: NO
+    [-f freq] I2C frequency.  Default: 100000 Current: 100000
+
+  NOTES:
+  o An environment variable like $PATH may be used for any argument.
+  o Arguments are "sticky".  For example, once the I2C address is
+    specified, that address will be re-used until it is changed.
+
+  WARNING:
+  o The I2C dev command may have bad side effects on your I2C devices.
+    Use only at your own risk.
+
+COMMAND LINE FORM
+=================
+
+The I2C is started from NSH by invoking the 'i2c' command from the NSH
+command line. The general form of the 'i2c' command is:
+
+  i2c <cmd> [arguments]
+
+Where <cmd> is a "sub-command" and identifies one I2C operations supported
+by the tool.  [arguments] represents the list of arguments needed to perform
+the I2C operation.  Those arguments vary from command to command as
+described below.  However, there is also a core set of common OPTIONS
+supported by all commands.  So perhaps a better representation of the
+general I2C command would be:
+
+  i2c <cmd> [OPTIONS] [arguments]
+
+Where [OPTIONS] represents the common options and and arguments represent
+the operation-specific arguments.
+
+COMMON COMMAND OPTIONS
+======================
+
+"Sticky" Options
+----------------
+In order to interact with I2C devices, there are a number of I2C parameters
+that must be set correctly.  One way to do this would be to provide to set
+the value of each separate command for each I2C parameter.  The I2C tool
+takes a different approach, instead:  The I2C configuration can be specified
+as a (potentially long) sequence of command line arguments.
+
+These arguments, however, are "sticky."  They are sticky in the sense that
+once you set the I2C parameter, that value will remain until it is reset
+with a new value (or until you reset the board).
+
+Environment Variables
+---------------------
+NOTE also that if environment variables are not disabled (by
+CONFIG_DISABLE_ENVIRON=y), then these options may also be environment
+variables.  Environment variables must be preceded with the special
+character $.  For example, PWD is the variable that holds the current
+working directory and so $PWD could be used as a command line argument.  The
+use of environment variables on the I2C tools command is really only useful
+if you wish to write NSH scripts to execute a longer, more complex series of
+I2C commands.
+
+Common Option Summary
+---------------------
+
+[-a addr] is the I2C device address (hex).  Default: 03 Current: 03
+
+  The [-a addr] sets the I2C device address.  The valid range is 0x03
+  through 0x77 (this valid range is controlled by the configuration settings
+  CONFIG_I2CTOOL_MINADDR and CONFIG_I2CTOOL_MAXADDR).  If you are working
+  with the same device, the address needs to be set only once.
+
+  All I2C address are 7-bit, hexadecimal values.
+
+  NOTE 1: Notice in the "help" output above it shows both default value of
+  the I2C address (03 hex) and the current address value (also 03 hex).
+
+  NOTE 2: Sometimes I2C addresses are represented as 8-bit values (with
+  bit zero indicating a read or write operation).  The I2C tool uses a
+  7-bit representation of the address with bit 7 unused and no read/write
+  indication in bit 0.  Essentially, the 7-bit address is like the 8-bit
+  address shifted right by 1.
+
+  NOTE 3: Most I2C bus controllers will also support 10-bit addressing.
+  That capability has not been integrated into the I2C tool as of this
+  writing.
+
+[-b bus] is the I2C bus number (decimal).  Default: 1 Current: 1
+
+  Most devices support multiple I2C devices and also have unique bus
+  numbering.  This option identifies which bus you are working with now.
+  The valid range of bus numbers is controlled by the configuration settings
+  CONFIG_I2CTOOL_MINBUS and CONFIG_I2CTOOL_MAXBUS.
+
+  The bus numbers are small, decimal numbers.
+
+[-r regaddr] is the I2C device register address (hex).  Default: 00 Current: 00
+
+  The I2C set and get commands will access registers on the I2C device.  This
+  option selects the device register address (sometimes called the sub-address).
+  This is an 8-bit hexadecimal value.  The maximum value is determined by
+  the configuration setting CONFIG_I2CTOOL_MAXREGADDR.
+
+[-w width] is the data width (8 or 16 decimal).  Default: 8 Current: 8
+
+  Device register data may be 8-bit or 16-bit.  This options selects one of
+  those two data widths.
+
+[-s|n], send/don't send start between command and data.  Default: -n Current: -n
+
+  This determines whether or not there should be a new I2C START between
+  sending of the register address and sending/receiving of the register data.
+
+[-i|j], Auto increment|don't increment regaddr on repititions.  Default: NO Current: NO
+
+  On commands that take a optional number of repetitions, the option can be
+  used to temporarily increment the regaddr value by one on each repitition.
+
+[-f freq] I2C frequency.  Default: 400000 Current: 400000
+
+  The [-f freq] sets the frequency of the I2C device.
+
+COMMAND SUMMARY
+===============
+
+We have already seen the I2C help (or ?) commands above.  This section will
+discuss the remaining commands.
+
+List buses: bus [OPTIONS]
+--------------------------
+
+This command will simply list all of the configured I2C buses and indicate
+which are supported by the driver and which are not:
+
+   BUS   EXISTS?
+  Bus 1: YES
+  Bus 2: NO
+
+The valid range of bus numbers is controlled by the configuration settings
+CONFIG_I2CTOOL_MINBUS and CONFIG_I2CTOOL_MAXBUS.
+
+List devices: dev [OPTIONS] <first> <last>
+------------------------------------------
+
+The 'dev' command will attempt to identify all of the I2C devices on the
+selected bus.  The <first> and <last> arguments are 7-bit, hexadecimal
+I2C addresses.  This command will examine a range of addresses beginning
+with <first> and continuing through <last>.  It will request the value
+of register zero from each device.
+
+If the device at an address responds, then this command will display the
+address of the device.  If the device does not respond, this command will
+display "--".  The resulting display is like:
+
+nsh> i2c dev 03 77
+     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f
+00:          -- -- -- -- -- -- -- -- -- -- -- -- --
+10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+20: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+30: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+40: -- -- -- -- -- -- -- -- -- 49 -- -- -- -- -- --
+50: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+70: -- -- -- -- -- -- -- --
+
+WARNINGS:
+  o The I2C dev command may have bad side effects on certain I2C devices.
+    For example, if could cause data loss in an EEPROM device.
+  o The I2C dev command also depends upon the underlying behavior of the
+    I2C driver.  How does the driver respond to addressing failures?
+
+Read register: get [OPTIONS]
+----------------------------
+
+  This command will read the value of the I2C register using the selected
+  I2C parameters in the common options.  No other arguments are required.
+
+  This command with write the 8-bit address value then read an 8- or 16-bit
+  data value from the device.  Optionally, it may re-start the transfer
+  before obtaining the data.
+
+  An optional <repititions> argument can be supplied to repeat the
+  read operation an arbitrary number of times (up to 2 billion).  If
+  auto-increment is select (-i), then the register address will be
+  temporarily incremented on each repitions.  The increment is temporary
+  in the since that it will not alter the "sticky" value of the
+  register address.
+
+  On success, the output will look like the following (the data value
+  read will be shown as a 4-character hexadecimal number if the 16-bit
+  data width option is selected).
+
+  READ Bus: 1 Addr: 49 Subaddr: 04 Value: 96
+
+  All values (except the bus numbers) are hexadecimal.
+
+Write register: set [OPTIONS] <value>
+-------------------------------------
+
+  This command will write a value to an I2C register using the selected
+  I2C parameters in the common options.  The value to write must be provided
+  as the final, hexadecimal value.  This value may be an 8-bit value (in the
+  range 00-ff) or a 16-bit value (in the range 0000-ffff), depending upon
+  the selected data width.
+
+  This command will write the 8-bit address value then write the 8- or 16-bit
+  data value to the device.  Optionally, it may re-start the transfer
+  before writing the data.
+
+  An optional <repititions> argument can be supplied to repeat the
+  write operation an arbitrary number of times (up to 2 billion).  If
+  auto-increment is select (-i), then the register address will be
+  temporarily incremented on each repitions.  The increment is temporary
+  in the since that it will not alter the "sticky" value of the
+  register address.
+
+  On success, the output will look like the following (the data value
+  written will be shown as a 4-character hexadecimal number if the 16-bit
+  data width option is selected).
+
+  WROTE Bus: 1 Addr: 49 Subaddr: 04 Value: 96
+
+  All values (except the bus numbers) are hexadecimal.
+
+Verify access : verf [OPTIONS] <value> [<repititions>]
+------------------------------------------------------
+
+  This command combines writing and reading from an I2C device register.
+  It will write a value to an will write a value to an I2C register using
+  the selected I2C parameters in the common options just as described for
+  tie 'set' command.  Then this command will read the value back just
+  as described with the 'get' command.  Finally, this command will compare
+  the value read and against the value written and emit an error message
+  if they do not match.
+
+  If no value is provided, then this command will use the register address
+  itself as the data, providing for a address-in-address test.
+
+  An optional <repititions> argument can be supplied to repeat the
+  verify operation an arbitrary number of times (up to 2 billion).  If
+  auto-increment is select (-i), then the register address will be
+  temporarily incremented on each repitions.  The increment is temporary
+  in the since that it will not alter the "sticky" value of the
+  register address.
+
+  On success, the output will look like the following (the data value
+  written will be shown as a 4-character hexadecimal number if the 16-bit
+  data width option is selected).
+
+  VERIFY Bus: 1 Addr: 49 Subaddr: 04 Wrote: 96 Read: 92 FAILURE
+
+  All values (except the bus numbers) are hexadecimal.
+
+I2C BUILD CONFIGURATION
+=======================
+
+NuttX Configuration Requirements
+--------------------------------
+The I2C tools requires the following in your NuttX configuration:
+
+1. Application configuration.
+
+   Using 'make menuconfig', select the i2c tool.  The following
+   definition should appear in your .config file:
+
+     CONFIG_SYSTEM_I2C=y
+
+   Deprecated.  In the older style configuration, there would have been
+   an appconfig file containing the path to the I2C tool directory like:
+
+     CONFIGURE_APPS += system/i2c
+
+2. Device-specific I2C support must be enabled.  The I2C tool will call the
+   platform-specific function up_i2cinitialize() to get instances of the
+   I2C interface and the platform-specific function up_i2cuninitialize()
+   to discard instances of the I2C interface.
+
+   NOTE 1: The I2C interface is defined in include/nuttx/i2c.h.
+
+   NOTE 2: This I2C tool uses direct I2C device interfaces.  As such, it
+   relies on internal OS interfaces that are not normally available to a
+   user-space program.  As a result, the I2C tool cannot be used if a
+   NuttX is built as a protected, supervisor kernel (CONFIG_NUTTX_KERNEL).
+
+3. I2C driver configuration
+
+   The CONFIG_I2C_TRANSFER option must also be set in your NuttX
+   configuration.  This configuration is the defconfig file in your
+   configuration directory that is copied to the NuttX top-level
+   directory as .config when NuttX is configured.
+
+     CONFIG_I2C_TRANSFER=y
+
+   NOTE:  CONFIG_I2C_TRANSFER adds extra methods to the I2C interface.
+   Not all I2C interfaces support these extra methods.  If your platform's
+   I2C driver does not support these extra methods, then you cannot use
+   the I2C tool unless you extend the support in your platform I2C
+   driver.
+
+I2C Tool Configuration Options
+------------------------------
+
+The default behavior of the I2C tool can be modified by the setting the
+options in the NuttX configuration.  This configuration is the defconfig
+file in your configuration directory that is copied to the NuttX top-level
+directory as .config when NuttX is configured.
+
+  CONFIG_I2CTOOL_BUILTIN: Build the tools as an NSH built-in command
+  CONFIG_I2CTOOL_MINBUS: Smallest bus index supported by the hardware (default 0).
+  CONFIG_I2CTOOL_MAXBUS: Largest bus index supported by the hardware (default 3)
+  CONFIG_I2CTOOL_MINADDR: Minium device address (default: 0x03)
+  CONFIG_I2CTOOL_MAXADDR: Largest device address (default: 0x77)
+  CONFIG_I2CTOOL_MAXREGADDR: Largest register address (default: 0xff)
+  CONFIG_I2CTOOL_DEFFREQ: Default frequency (default: 4000000)
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 72096da5a..1906b3c12 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -4850,3 +4850,21 @@
 	  From Laurent Latil (2013-6-1).
 	* configs/stm32_tiny: Fix nRF24L01+ driver integration for the STM32
 	  Tiny.  From Laurent Latil (2013-6-01).
+	* configs/sam3u-ek:  All remaining configurations changed to use
+	  the kconfig-frontends tools (2013-6-2).
+	* arch/arm/src/sam3u/chip:  All SAM3U register definition files moved
+	  to this subdirectory.  Naming of registers changed from SAM3U_ to
+	  just SAM_.  This is in preparation for a SAM4L port (2013-6-2).
+	* arch/arm/src/sam3u:  Renamed files to sam_* vs. sam3u_*.
+	  Eliminated sam3u_internal.h; instead uses individual header
+	  files for each SAM interface block (2013-6-2).
+	* arch/arm/src/stm32/stm32f20xxx_rcc.c and stm32f40xxx_rcc.c, and
+	  configs/mikroe-stm32f4/src/up_clockconfig.c.  Correct some bad
+	  conditional compilation (CONFIG_ missing from setting name).  This
+	  affects some STM32 FLASH pre-fetch settings.  From Lorenz Meier
+	  (2013-6-2).
+	* arch/arm/include/sam34 and arch/arm/src/sam34:  The old sam3u/
+	  directories were renamed sam34/ to make room in the namespace for
+	  the SAM4L (2013-6-2).
+	* libc/stdio/lib_dprintd.c and lib_vdprintf.c:  Add dprintf() and
+	  vdprintf() (the latter from Andrew Tridgell, 2013-6-2).
diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig
index a512edf25..fdd120779 100644
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/arch/arm/Kconfig
@@ -110,12 +110,11 @@ config ARCH_CHIP_NUC1XX
 	---help---
 		NPX LPC43XX architectures (ARM Cortex-M4).
 
-config ARCH_CHIP_SAM3U
-	bool "Atmel AT91SAM3"
-	select ARCH_CORTEXM3
+config ARCH_CHIP_SAM34
+	bool "Atmel AT91SAM3/SAM4"
 	select ARCH_HAVE_MPU
 	---help---
-		Atmel AT91SAM3 architectures (ARM Cortex-M3)
+		Atmel AT91SAM3 (ARM Cortex-M3) and SAM4 (ARM Cortex-M4) architectures
 
 config ARCH_CHIP_STM32
 	bool "STMicro STM32"
@@ -178,7 +177,7 @@ config ARCH_CHIP
 	default "lpc31xx"	if ARCH_CHIP_LPC31XX
 	default "lpc43xx"	if ARCH_CHIP_LPC43XX
 	default "nuc1xx"	if ARCH_CHIP_NUC1XX
-	default "sam3u"		if ARCH_CHIP_SAM3U
+	default "sam34"		if ARCH_CHIP_SAM34
 	default "stm32"		if ARCH_CHIP_STM32
 	default "str71x"	if ARCH_CHIP_STR71X
 
@@ -325,8 +324,8 @@ endif
 if ARCH_CHIP_NUC1XX
 source arch/arm/src/nuc1xx/Kconfig
 endif
-if ARCH_CHIP_SAM3U
-source arch/arm/src/sam3u/Kconfig
+if ARCH_CHIP_SAM34
+source arch/arm/src/sam34/Kconfig
 endif
 if ARCH_CHIP_STM32
 source arch/arm/src/stm32/Kconfig
diff --git a/nuttx/arch/arm/include/sam3u/chip.h b/nuttx/arch/arm/include/sam34/chip.h
index da8c28345..9cc7d1b7c 100644
--- a/nuttx/arch/arm/include/sam3u/chip.h
+++ b/nuttx/arch/arm/include/sam34/chip.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/include/sam3u/chip.h
+ * arch/arm/include/sam34/chip.h
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_INCLUDE_SAM3U_CHIP_H
-#define __ARCH_ARM_INCLUDE_SAM3U_CHIP_H
+#ifndef __ARCH_ARM_INCLUDE_SAM34_CHIP_H
+#define __ARCH_ARM_INCLUDE_SAM34_CHIP_H
 
 /************************************************************************************
  * Included Files
@@ -51,19 +51,19 @@
 #ifdef CONFIG_ARCH_CHIP_AT91SAM3U4E
 /* Internal memory */
 
-#  define CONFIG_SAM3U_SRAM0_SIZE   0x00008000  /* 32Kb */
-#  define CONFIG_SAM3U_SRAM1_SIZE   0x00004000  /* 16Kb */
-#  define CONFIG_SAM3U_NFCSRAM_SIZE 0x00001000  /*  4Kb */
+#  define CONFIG_SAM34_SRAM0_SIZE    0x00008000  /* 32Kb */
+#  define CONFIG_SAM34_SRAM1_SIZE    0x00004000  /* 16Kb */
+#  define CONFIG_SAM34_NFCSRAM_SIZE  0x00001000  /*  4Kb */
 
 /* DMA */
 
-#  define CONFIG_SAM3U_NDMACHAN     4           /* 4 DMA Channels */
+#  define CONFIG_SAM34_NDMACHAN      4           /* 4 DMA Channels */
 
 /* Memory card interface */
 
-#  define CONFIG_SAM3U_MCI2         1
+#  define CONFIG_SAM34_MCI2          1
 #else
-#  error "Unknown SAM3U chip type"
+#  error "Unknown SAM3/4 chip type"
 #endif
 
 /* NVIC priority levels *************************************************************/
@@ -71,14 +71,14 @@
  * the priority of the corresponding interrupt. The processor implements only
  * bits[7:4] of each field, bits[3:0] read as zero and ignore writes.
  */
- 
-#define NVIC_SYSH_PRIORITY_MIN     0xf0 /* All bits[7:4] set is minimum priority */
-#define NVIC_SYSH_PRIORITY_DEFAULT 0x80 /* Midpoint is the default */
-#define NVIC_SYSH_PRIORITY_MAX     0x00 /* Zero is maximum priority */
-#define NVIC_SYSH_PRIORITY_STEP    0x10 /* Four bits of interrupt priority used */
 
-#define NVIC_SYSH_DISABLE_PRIORITY (NVIC_SYSH_PRIORITY_MAX + NVIC_SYSH_PRIORITY_STEP)
-#define NVIC_SYSH_SVCALL_PRIORITY  NVIC_SYSH_PRIORITY_MAX
+#define NVIC_SYSH_PRIORITY_MIN       0xf0 /* All bits[7:4] set is minimum priority */
+#define NVIC_SYSH_PRIORITY_DEFAULT   0x80 /* Midpoint is the default */
+#define NVIC_SYSH_PRIORITY_MAX       0x00 /* Zero is maximum priority */
+#define NVIC_SYSH_PRIORITY_STEP      0x10 /* Four bits of interrupt priority used */
+
+#define NVIC_SYSH_DISABLE_PRIORITY   (NVIC_SYSH_PRIORITY_MAX + NVIC_SYSH_PRIORITY_STEP)
+#define NVIC_SYSH_SVCALL_PRIORITY    NVIC_SYSH_PRIORITY_MAX
 
 /************************************************************************************
  * Public Types
@@ -92,4 +92,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_INCLUDE_SAM3U_CHIP_H */
+#endif /* __ARCH_ARM_INCLUDE_SAM34_CHIP_H */
diff --git a/nuttx/arch/arm/include/sam34/irq.h b/nuttx/arch/arm/include/sam34/irq.h
new file mode 100644
index 000000000..2c59f487a
--- /dev/null
+++ b/nuttx/arch/arm/include/sam34/irq.h
@@ -0,0 +1,297 @@
+/****************************************************************************************
+ * arch/arm/include/sam34/irq.h
+ *
+ *   Copyright (C) 2009-2011, 2013 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.
+ *
+ ****************************************************************************************/
+
+/* This file should never be included directed but, rather,
+ * only indirectly through nuttx/irq.h
+ */
+
+#ifndef __ARCH_ARM_INCLUDE_SAM34_IRQ_H
+#define __ARCH_ARM_INCLUDE_SAM34_IRQ_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Definitions
+ ****************************************************************************************/
+
+/* SAM3U Peripheral Identifiers */
+
+#define SAM_PID_SUPC           (0)  /* Supply Controller */
+#define SAM_PID_RSTC           (1)  /* Reset Controller */
+#define SAM_PID_RTC            (2)  /* Real Time Clock */
+#define SAM_PID_RTT            (3)  /* Real Time Timer */
+#define SAM_PID_WDT            (4)  /* Watchdog Timer */
+#define SAM_PID_PMC            (5)  /* Power Management Controller */
+#define SAM_PID_EEFC0          (6)  /* Enhanced Embedded Flash Controller 0 */
+#define SAM_PID_EEFC1          (7)  /* Enhanced Embedded Flash Controller 1 */
+#define SAM_PID_UART           (8)  /* Universal Asynchronous Receiver Transmitter */
+#define SAM_PID_SMC            (9)  /* Static Memory Controller */
+#define SAM_PID_PIOA          (10)  /* Parallel I/O Controller A */
+#define SAM_PID_PIOB          (11)  /* Parallel I/O Controller B */
+#define SAM_PID_PIOC          (12)  /* Parallel I/O Controller C */
+#define SAM_PID_USART0        (13)  /* USART 0 */
+#define SAM_PID_USART1        (14)  /* USART 1 */
+#define SAM_PID_USART2        (15)  /* USART 2 */
+#define SAM_PID_USART3        (16)  /* USART 3 */
+#define SAM_PID_HSMCI         (17)  /* High Speed Multimedia Card Interface */
+#define SAM_PID_TWI0          (18)  /* Two-Wire Interface 0 */
+#define SAM_PID_TWI1          (19)  /* Two-Wire Interface 1 */
+#define SAM_PID_SPI           (20)  /* Serial Peripheral Interface */
+#define SAM_PID_SSC           (21)  /* Synchronous Serial Controller */
+#define SAM_PID_TC0           (22)  /* Timer Counter 0 */
+#define SAM_PID_TC1           (23)  /* Timer Counter 1 */
+#define SAM_PID_TC2           (24)  /* Timer Counter 2 */
+#define SAM_PID_PWM           (25)  /* Pulse Width Modulation Controller */
+#define SAM_PID_ADC12B        (26)  /* 12-bit ADC Controller */
+#define SAM_PID_ADC           (27)  /* 10-bit ADC Controller */
+#define SAM_PID_DMAC          (28)  /* DMA Controller */
+#define SAM_PID_UDPHS         (29)  /* USB Device High Speed */
+#define NR_PIDS               (30)  /* Number of peripheral identifiers */
+
+/* IRQ numbers.  The IRQ number corresponds vector number and hence map directly to
+ * bits in the NVIC.  This does, however, waste several words of memory in the IRQ
+ * to handle mapping tables.
+ */
+
+/* Processor Exceptions (vectors 0-15) */
+
+#define SAM_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
+                                   /* Vector  0: Reset stack pointer value */
+                                   /* Vector  1: Reset (not handler as an IRQ) */
+#define SAM_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
+#define SAM_IRQ_HARDFAULT      (3) /* Vector  3: Hard fault */
+#define SAM_IRQ_MEMFAULT       (4) /* Vector  4: Memory management (MPU) */
+#define SAM_IRQ_BUSFAULT       (5) /* Vector  5: Bus fault */
+#define SAM_IRQ_USAGEFAULT     (6) /* Vector  6: Usage fault */
+#define SAM_IRQ_SVCALL        (11) /* Vector 11: SVC call */
+#define SAM_IRQ_DBGMONITOR    (12) /* Vector 12: Debug Monitor */
+                                   /* Vector 13: Reserved */
+#define SAM_IRQ_PENDSV        (14) /* Vector 14: Pendable system service request */
+#define SAM_IRQ_SYSTICK       (15) /* Vector 15: System tick */
+
+/* External interrupts (vectors >= 16) */
+
+#define SAM_IRQ_EXTINT        (16) /* Vector number of the first external interrupt */
+#define SAM_IRQ_SUPC          (SAM_IRQ_EXTINT+SAM_PID_SUPC)   /* Supply Controller */
+#define SAM_IRQ_RSTC          (SAM_IRQ_EXTINT+SAM_PID_RSTC)   /* Reset Controller */
+#define SAM_IRQ_RTC           (SAM_IRQ_EXTINT+SAM_PID_RTC)    /* Real Time Clock */
+#define SAM_IRQ_RTT           (SAM_IRQ_EXTINT+SAM_PID_RTT)    /* Real Time Timer */
+#define SAM_IRQ_WDT           (SAM_IRQ_EXTINT+SAM_PID_WDT)    /* Watchdog Timer */
+#define SAM_IRQ_PMC           (SAM_IRQ_EXTINT+SAM_PID_PMC)    /* Power Management Controller */
+#define SAM_IRQ_EEFC0         (SAM_IRQ_EXTINT+SAM_PID_EEFC0)  /* Enhanced Embedded Flash Controller 0 */
+#define SAM_IRQ_EEFC1         (SAM_IRQ_EXTINT+SAM_PID_EEFC1)  /* Enhanced Embedded Flash Controller 1 */
+#define SAM_IRQ_UART          (SAM_IRQ_EXTINT+SAM_PID_UART)   /* Universal Asynchronous Receiver Transmitter */
+#define SAM_IRQ_SMC           (SAM_IRQ_EXTINT+SAM_PID_SMC)    /* Static Memory Controller */
+#define SAM_IRQ_PIOA          (SAM_IRQ_EXTINT+SAM_PID_PIOA)   /* Parallel I/O Controller A */
+#define SAM_IRQ_PIOB          (SAM_IRQ_EXTINT+SAM_PID_PIOB)   /* Parallel I/O Controller B */
+#define SAM_IRQ_PIOC          (SAM_IRQ_EXTINT+SAM_PID_PIOC)   /* Parallel I/O Controller C */
+#define SAM_IRQ_USART0        (SAM_IRQ_EXTINT+SAM_PID_USART0) /* USART 0 */
+#define SAM_IRQ_USART1        (SAM_IRQ_EXTINT+SAM_PID_USART1) /* USART 1 */
+#define SAM_IRQ_USART2        (SAM_IRQ_EXTINT+SAM_PID_USART2) /* USART 2 */
+#define SAM_IRQ_USART3        (SAM_IRQ_EXTINT+SAM_PID_USART3) /* USART 3 */
+#define SAM_IRQ_HSMCI         (SAM_IRQ_EXTINT+SAM_PID_HSMCI)  /* High Speed Multimedia Card Interface */
+#define SAM_IRQ_TWI0          (SAM_IRQ_EXTINT+SAM_PID_TWI0)   /* Two-Wire Interface 0 */
+#define SAM_IRQ_TWI1          (SAM_IRQ_EXTINT+SAM_PID_TWI1)   /* Two-Wire Interface 1 */
+#define SAM_IRQ_SPI           (SAM_IRQ_EXTINT+SAM_PID_SPI)    /* Serial Peripheral Interface */
+#define SAM_IRQ_SSC           (SAM_IRQ_EXTINT+SAM_PID_SSC)    /* Synchronous Serial Controller */
+#define SAM_IRQ_TC0           (SAM_IRQ_EXTINT+SAM_PID_TC0)    /* Timer Counter 0 */
+#define SAM_IRQ_TC1           (SAM_IRQ_EXTINT+SAM_PID_TC1)    /* Timer Counter 1 */
+#define SAM_IRQ_TC2           (SAM_IRQ_EXTINT+SAM_PID_TC2)    /* Timer Counter 2 */
+#define SAM_IRQ_PWM           (SAM_IRQ_EXTINT+SAM_PID_PWM)    /* Pulse Width Modulation Controller */
+#define SAM_IRQ_ADC12B        (SAM_IRQ_EXTINT+SAM_PID_ADC12B) /* 12-bit ADC Controller */
+#define SAM_IRQ_ADC           (SAM_IRQ_EXTINT+SAM_PID_ADC)    /* 10-bit ADC Controller */
+#define SAM_IRQ_DMAC          (SAM_IRQ_EXTINT+SAM_PID_DMAC)   /* DMA Controller */
+#define SAM_IRQ_UDPHS         (SAM_IRQ_EXTINT+SAM_PID_UDPHS)  /* USB Device High Speed */
+#define SAM_IRQ_NEXTINT       NR_PIDS                         /* Total number of external interrupt numbers */
+#define SAM_IRQ_NIRQS         (SAM_IRQ_EXTINT+NR_PIDS)        /* The number of real IRQs */
+
+/* GPIO interrupts (derived from SAM_IRQ_PIOA/B/C) */
+
+#ifdef CONFIG_GPIOA_IRQ
+#  define SAM_IRQ_GPIOA_PINS  (SAM_IRQ_EXTINT+SAM_IRQ_NEXTINT)
+#  define SAM_IRQ_PA0         (SAM_IRQ_GPIOA_PINS+0)          /* GPIOA, PIN 0 */
+#  define SAM_IRQ_PA1         (SAM_IRQ_GPIOA_PINS+1)          /* GPIOA, PIN 1 */
+#  define SAM_IRQ_PA2         (SAM_IRQ_GPIOA_PINS+2)          /* GPIOA, PIN 2 */
+#  define SAM_IRQ_PA3         (SAM_IRQ_GPIOA_PINS+3)          /* GPIOA, PIN 3 */
+#  define SAM_IRQ_PA4         (SAM_IRQ_GPIOA_PINS+4)          /* GPIOA, PIN 4 */
+#  define SAM_IRQ_PA5         (SAM_IRQ_GPIOA_PINS+5)          /* GPIOA, PIN 5 */
+#  define SAM_IRQ_PA6         (SAM_IRQ_GPIOA_PINS+6)          /* GPIOA, PIN 6 */
+#  define SAM_IRQ_PA7         (SAM_IRQ_GPIOA_PINS+7)          /* GPIOA, PIN 7 */
+#  define SAM_IRQ_PA8         (SAM_IRQ_GPIOA_PINS+8)          /* GPIOA, PIN 8 */
+#  define SAM_IRQ_PA9         (SAM_IRQ_GPIOA_PINS+9)          /* GPIOA, PIN 9 */
+#  define SAM_IRQ_PA10        (SAM_IRQ_GPIOA_PINS+10)         /* GPIOA, PIN 10 */
+#  define SAM_IRQ_PA11        (SAM_IRQ_GPIOA_PINS+11)         /* GPIOA, PIN 11 */
+#  define SAM_IRQ_PA12        (SAM_IRQ_GPIOA_PINS+12)         /* GPIOA, PIN 12 */
+#  define SAM_IRQ_PA13        (SAM_IRQ_GPIOA_PINS+13)         /* GPIOA, PIN 13 */
+#  define SAM_IRQ_PA14        (SAM_IRQ_GPIOA_PINS+14)         /* GPIOA, PIN 14 */
+#  define SAM_IRQ_PA15        (SAM_IRQ_GPIOA_PINS+15)         /* GPIOA, PIN 15 */
+#  define SAM_IRQ_PA16        (SAM_IRQ_GPIOA_PINS+16)         /* GPIOA, PIN 16 */
+#  define SAM_IRQ_PA17        (SAM_IRQ_GPIOA_PINS+17)         /* GPIOA, PIN 17 */
+#  define SAM_IRQ_PA18        (SAM_IRQ_GPIOA_PINS+18)         /* GPIOA, PIN 18 */
+#  define SAM_IRQ_PA19        (SAM_IRQ_GPIOA_PINS+19)         /* GPIOA, PIN 19 */
+#  define SAM_IRQ_PA20        (SAM_IRQ_GPIOA_PINS+20)         /* GPIOA, PIN 20 */
+#  define SAM_IRQ_PA21        (SAM_IRQ_GPIOA_PINS+21)         /* GPIOA, PIN 21 */
+#  define SAM_IRQ_PA22        (SAM_IRQ_GPIOA_PINS+22)         /* GPIOA, PIN 22 */
+#  define SAM_IRQ_PA23        (SAM_IRQ_GPIOA_PINS+23)         /* GPIOA, PIN 23 */
+#  define SAM_IRQ_PA24        (SAM_IRQ_GPIOA_PINS+24)         /* GPIOA, PIN 24 */
+#  define SAM_IRQ_PA25        (SAM_IRQ_GPIOA_PINS+25)         /* GPIOA, PIN 25 */
+#  define SAM_IRQ_PA26        (SAM_IRQ_GPIOA_PINS+26)         /* GPIOA, PIN 26 */
+#  define SAM_IRQ_PA27        (SAM_IRQ_GPIOA_PINS+27)         /* GPIOA, PIN 27 */
+#  define SAM_IRQ_PA28        (SAM_IRQ_GPIOA_PINS+28)         /* GPIOA, PIN 28 */
+#  define SAM_IRQ_PA29        (SAM_IRQ_GPIOA_PINS+29)         /* GPIOA, PIN 29 */
+#  define SAM_IRQ_PA30        (SAM_IRQ_GPIOA_PINS+30)         /* GPIOA, PIN 30 */
+#  define SAM_IRQ_PA31        (SAM_IRQ_GPIOA_PINS+31)         /* GPIOA, PIN 31 */
+#  define SAM_NGPIOAIRQS      32
+#else
+#  define SAM_NGPIOAIRQS      0
+#endif
+
+#ifdef CONFIG_GPIOB_IRQ
+#  define SAM_IRQ_GPIOB_PINS  (SAM_IRQ_EXTINT+SAM_IRQ_NEXTINT+SAM_IRQ_GPIOA_PINS)
+#  define SAM_IRQ_PB0         (SAM_IRQ_GPIOB_PINS+0)          /* GPIOB, PIN 0 */
+#  define SAM_IRQ_PB1         (SAM_IRQ_GPIOB_PINS+1)          /* GPIOB, PIN 1 */
+#  define SAM_IRQ_PB2         (SAM_IRQ_GPIOB_PINS+2)          /* GPIOB, PIN 2 */
+#  define SAM_IRQ_PB3         (SAM_IRQ_GPIOB_PINS+3)          /* GPIOB, PIN 3 */
+#  define SAM_IRQ_PB4         (SAM_IRQ_GPIOB_PINS+4)          /* GPIOB, PIN 4 */
+#  define SAM_IRQ_PB5         (SAM_IRQ_GPIOB_PINS+5)          /* GPIOB, PIN 5 */
+#  define SAM_IRQ_PB6         (SAM_IRQ_GPIOB_PINS+6)          /* GPIOB, PIN 6 */
+#  define SAM_IRQ_PB7         (SAM_IRQ_GPIOB_PINS+7)          /* GPIOB, PIN 7 */
+#  define SAM_IRQ_PB8         (SAM_IRQ_GPIOB_PINS+8)          /* GPIOB, PIN 8 */
+#  define SAM_IRQ_PB9         (SAM_IRQ_GPIOB_PINS+9)          /* GPIOB, PIN 9 */
+#  define SAM_IRQ_PB10        (SAM_IRQ_GPIOB_PINS+10)         /* GPIOB, PIN 10 */
+#  define SAM_IRQ_PB11        (SAM_IRQ_GPIOB_PINS+11)         /* GPIOB, PIN 11 */
+#  define SAM_IRQ_PB12        (SAM_IRQ_GPIOB_PINS+12)         /* GPIOB, PIN 12 */
+#  define SAM_IRQ_PB13        (SAM_IRQ_GPIOB_PINS+13)         /* GPIOB, PIN 13 */
+#  define SAM_IRQ_PB14        (SAM_IRQ_GPIOB_PINS+14)         /* GPIOB, PIN 14 */
+#  define SAM_IRQ_PB15        (SAM_IRQ_GPIOB_PINS+15)         /* GPIOB, PIN 15 */
+#  define SAM_IRQ_PB16        (SAM_IRQ_GPIOB_PINS+16)         /* GPIOB, PIN 16 */
+#  define SAM_IRQ_PB17        (SAM_IRQ_GPIOB_PINS+17)         /* GPIOB, PIN 17 */
+#  define SAM_IRQ_PB18        (SAM_IRQ_GPIOB_PINS+18)         /* GPIOB, PIN 18 */
+#  define SAM_IRQ_PB19        (SAM_IRQ_GPIOB_PINS+19)         /* GPIOB, PIN 19 */
+#  define SAM_IRQ_PB20        (SAM_IRQ_GPIOB_PINS+20)         /* GPIOB, PIN 20 */
+#  define SAM_IRQ_PB21        (SAM_IRQ_GPIOB_PINS+21)         /* GPIOB, PIN 21 */
+#  define SAM_IRQ_PB22        (SAM_IRQ_GPIOB_PINS+22)         /* GPIOB, PIN 22 */
+#  define SAM_IRQ_PB23        (SAM_IRQ_GPIOB_PINS+23)         /* GPIOB, PIN 23 */
+#  define SAM_IRQ_PB24        (SAM_IRQ_GPIOB_PINS+24)         /* GPIOB, PIN 24 */
+#  define SAM_IRQ_PB25        (SAM_IRQ_GPIOB_PINS+25)         /* GPIOB, PIN 25 */
+#  define SAM_IRQ_PB26        (SAM_IRQ_GPIOB_PINS+26)         /* GPIOB, PIN 26 */
+#  define SAM_IRQ_PB27        (SAM_IRQ_GPIOB_PINS+27)         /* GPIOB, PIN 27 */
+#  define SAM_IRQ_PB28        (SAM_IRQ_GPIOB_PINS+28)         /* GPIOB, PIN 28 */
+#  define SAM_IRQ_PB29        (SAM_IRQ_GPIOB_PINS+29)         /* GPIOB, PIN 29 */
+#  define SAM_IRQ_PB30        (SAM_IRQ_GPIOB_PINS+30)         /* GPIOB, PIN 30 */
+#  define SAM_IRQ_PB31        (SAM_IRQ_GPIOB_PINS+31)         /* GPIOB, PIN 31 */
+#  define SAM_NGPIOAIRQS      32
+#else
+#  define SAM_NGPIOBIRQS      0
+#endif
+
+#ifdef CONFIG_GPIOC_IRQ
+#  define SAM_IRQ_GPIOC_PINS  (SAM_IRQ_EXTINT+SAM_IRQ_NEXTINT+SAM_IRQ_GPIOA_PINS+SAM_IRQ_GPIOB_PINS)
+#  define SAM_IRQ_PC0         (SAM_IRQ_GPIOC_PINS+0)          /* GPIOC, PIN 0 */
+#  define SAM_IRQ_PC1         (SAM_IRQ_GPIOC_PINS+1)          /* GPIOC, PIN 1 */
+#  define SAM_IRQ_PC2         (SAM_IRQ_GPIOC_PINS+2)          /* GPIOC, PIN 2 */
+#  define SAM_IRQ_PC3         (SAM_IRQ_GPIOC_PINS+3)          /* GPIOC, PIN 3 */
+#  define SAM_IRQ_PC4         (SAM_IRQ_GPIOC_PINS+4)          /* GPIOC, PIN 4 */
+#  define SAM_IRQ_PC5         (SAM_IRQ_GPIOC_PINS+5)          /* GPIOC, PIN 5 */
+#  define SAM_IRQ_PC6         (SAM_IRQ_GPIOC_PINS+6)          /* GPIOC, PIN 6 */
+#  define SAM_IRQ_PC7         (SAM_IRQ_GPIOC_PINS+7)          /* GPIOC, PIN 7 */
+#  define SAM_IRQ_PC8         (SAM_IRQ_GPIOC_PINS+8)          /* GPIOC, PIN 8 */
+#  define SAM_IRQ_PC9         (SAM_IRQ_GPIOC_PINS+9)          /* GPIOC, PIN 9 */
+#  define SAM_IRQ_PC10        (SAM_IRQ_GPIOC_PINS+10)         /* GPIOC, PIN 10 */
+#  define SAM_IRQ_PC11        (SAM_IRQ_GPIOC_PINS+11)         /* GPIOC, PIN 11 */
+#  define SAM_IRQ_PC12        (SAM_IRQ_GPIOC_PINS+12)         /* GPIOC, PIN 12 */
+#  define SAM_IRQ_PC13        (SAM_IRQ_GPIOC_PINS+13)         /* GPIOC, PIN 13 */
+#  define SAM_IRQ_PC14        (SAM_IRQ_GPIOC_PINS+14)         /* GPIOC, PIN 14 */
+#  define SAM_IRQ_PC15        (SAM_IRQ_GPIOC_PINS+15)         /* GPIOC, PIN 15 */
+#  define SAM_IRQ_PC16        (SAM_IRQ_GPIOC_PINS+16)         /* GPIOC, PIN 16 */
+#  define SAM_IRQ_PC17        (SAM_IRQ_GPIOC_PINS+17)         /* GPIOC, PIN 17 */
+#  define SAM_IRQ_PC18        (SAM_IRQ_GPIOC_PINS+18)         /* GPIOC, PIN 18 */
+#  define SAM_IRQ_PC19        (SAM_IRQ_GPIOC_PINS+19)         /* GPIOC, PIN 19 */
+#  define SAM_IRQ_PC20        (SAM_IRQ_GPIOC_PINS+20)         /* GPIOC, PIN 20 */
+#  define SAM_IRQ_PC21        (SAM_IRQ_GPIOC_PINS+21)         /* GPIOC, PIN 21 */
+#  define SAM_IRQ_PC22        (SAM_IRQ_GPIOC_PINS+22)         /* GPIOC, PIN 22 */
+#  define SAM_IRQ_PC23        (SAM_IRQ_GPIOC_PINS+23)         /* GPIOC, PIN 23 */
+#  define SAM_IRQ_PC24        (SAM_IRQ_GPIOC_PINS+24)         /* GPIOC, PIN 24 */
+#  define SAM_IRQ_PC25        (SAM_IRQ_GPIOC_PINS+25)         /* GPIOC, PIN 25 */
+#  define SAM_IRQ_PC26        (SAM_IRQ_GPIOC_PINS+26)         /* GPIOC, PIN 26 */
+#  define SAM_IRQ_PC27        (SAM_IRQ_GPIOC_PINS+27)         /* GPIOC, PIN 27 */
+#  define SAM_IRQ_PC28        (SAM_IRQ_GPIOC_PINS+28)         /* GPIOC, PIN 28 */
+#  define SAM_IRQ_PC29        (SAM_IRQ_GPIOC_PINS+29)         /* GPIOC, PIN 29 */
+#  define SAM_IRQ_PC30        (SAM_IRQ_GPIOC_PINS+30)         /* GPIOC, PIN 30 */
+#  define SAM_IRQ_PC31        (SAM_IRQ_GPIOC_PINS+31)         /* GPIOC, PIN 31 */
+#  define SAM_NGPIOAIRQS      32
+#else
+#  define SAM_NGPIOCIRQS      0
+#endif
+
+/* Total number of IRQ numbers */
+
+#define NR_IRQS               (SAM_IRQ_EXTINT+SAM_IRQ_NEXTINT+\
+                               SAM_NGPIOAIRQS+SAM_NGPIOBIRQS+SAM_NGPIOCIRQS)
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Inline functions
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Variables
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************************/
+
+#ifndef __ASSEMBLY__
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+#endif
+
+#endif /* __ARCH_ARM_INCLUDE_SAM34_IRQ_H */
+
diff --git a/nuttx/arch/arm/include/sam3u/irq.h b/nuttx/arch/arm/include/sam3u/irq.h
deleted file mode 100644
index 481db74a2..000000000
--- a/nuttx/arch/arm/include/sam3u/irq.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/****************************************************************************************
- * arch/arm/include/sam3u/irq.h
- *
- *   Copyright (C) 2009-2011 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.
- *
- ****************************************************************************************/
-
-/* This file should never be included directed but, rather,
- * only indirectly through nuttx/irq.h
- */
-
-#ifndef __ARCH_ARM_INCLUDE_SAM3U_IRQ_H
-#define __ARCH_ARM_INCLUDE_SAM3U_IRQ_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-/****************************************************************************************
- * Definitions
- ****************************************************************************************/
-
-/* SAM3U Peripheral Identifiers */
-
-#define SAM3U_PID_SUPC           (0)  /* Supply Controller */
-#define SAM3U_PID_RSTC           (1)  /* Reset Controller */
-#define SAM3U_PID_RTC            (2)  /* Real Time Clock */
-#define SAM3U_PID_RTT            (3)  /* Real Time Timer */
-#define SAM3U_PID_WDT            (4)  /* Watchdog Timer */
-#define SAM3U_PID_PMC            (5)  /* Power Management Controller */
-#define SAM3U_PID_EEFC0          (6)  /* Enhanced Embedded Flash Controller 0 */
-#define SAM3U_PID_EEFC1          (7)  /* Enhanced Embedded Flash Controller 1 */
-#define SAM3U_PID_UART           (8)  /* Universal Asynchronous Receiver Transmitter */
-#define SAM3U_PID_SMC            (9)  /* Static Memory Controller */
-#define SAM3U_PID_PIOA          (10)  /* Parallel I/O Controller A */
-#define SAM3U_PID_PIOB          (11)  /* Parallel I/O Controller B */
-#define SAM3U_PID_PIOC          (12)  /* Parallel I/O Controller C */
-#define SAM3U_PID_USART0        (13)  /* USART 0 */
-#define SAM3U_PID_USART1        (14)  /* USART 1 */
-#define SAM3U_PID_USART2        (15)  /* USART 2 */
-#define SAM3U_PID_USART3        (16)  /* USART 3 */
-#define SAM3U_PID_HSMCI         (17)  /* High Speed Multimedia Card Interface */
-#define SAM3U_PID_TWI0          (18)  /* Two-Wire Interface 0 */
-#define SAM3U_PID_TWI1          (19)  /* Two-Wire Interface 1 */
-#define SAM3U_PID_SPI           (20)  /* Serial Peripheral Interface */
-#define SAM3U_PID_SSC           (21)  /* Synchronous Serial Controller */
-#define SAM3U_PID_TC0           (22)  /* Timer Counter 0 */
-#define SAM3U_PID_TC1           (23)  /* Timer Counter 1 */
-#define SAM3U_PID_TC2           (24)  /* Timer Counter 2 */
-#define SAM3U_PID_PWM           (25)  /* Pulse Width Modulation Controller */
-#define SAM3U_PID_ADC12B        (26)  /* 12-bit ADC Controller */
-#define SAM3U_PID_ADC           (27)  /* 10-bit ADC Controller */
-#define SAM3U_PID_DMAC          (28)  /* DMA Controller */
-#define SAM3U_PID_UDPHS         (29)  /* USB Device High Speed */
-#define NR_PIDS                 (30)  /* Number of peripheral identifiers */
-
-/* IRQ numbers.  The IRQ number corresponds vector number and hence map directly to
- * bits in the NVIC.  This does, however, waste several words of memory in the IRQ
- * to handle mapping tables.
- */
-
-/* Processor Exceptions (vectors 0-15) */
-
-#define SAM3U_IRQ_RESERVED       (0) /* Reserved vector (only used with CONFIG_DEBUG) */
-                                     /* Vector  0: Reset stack pointer value */
-                                     /* Vector  1: Reset (not handler as an IRQ) */
-#define SAM3U_IRQ_NMI            (2) /* Vector  2: Non-Maskable Interrupt (NMI) */
-#define SAM3U_IRQ_HARDFAULT      (3) /* Vector  3: Hard fault */
-#define SAM3U_IRQ_MEMFAULT       (4) /* Vector  4: Memory management (MPU) */
-#define SAM3U_IRQ_BUSFAULT       (5) /* Vector  5: Bus fault */
-#define SAM3U_IRQ_USAGEFAULT     (6) /* Vector  6: Usage fault */
-#define SAM3U_IRQ_SVCALL        (11) /* Vector 11: SVC call */
-#define SAM3U_IRQ_DBGMONITOR    (12) /* Vector 12: Debug Monitor */
-                                     /* Vector 13: Reserved */
-#define SAM3U_IRQ_PENDSV        (14) /* Vector 14: Pendable system service request */
-#define SAM3U_IRQ_SYSTICK       (15) /* Vector 15: System tick */
-
-/* External interrupts (vectors >= 16) */
-
-#define SAM3U_IRQ_EXTINT        (16) /* Vector number of the first external interrupt */
-#define SAM3U_IRQ_SUPC          (SAM3U_IRQ_EXTINT+SAM3U_PID_SUPC)   /* Supply Controller */
-#define SAM3U_IRQ_RSTC          (SAM3U_IRQ_EXTINT+SAM3U_PID_RSTC)   /* Reset Controller */
-#define SAM3U_IRQ_RTC           (SAM3U_IRQ_EXTINT+SAM3U_PID_RTC)    /* Real Time Clock */
-#define SAM3U_IRQ_RTT           (SAM3U_IRQ_EXTINT+SAM3U_PID_RTT)    /* Real Time Timer */
-#define SAM3U_IRQ_WDT           (SAM3U_IRQ_EXTINT+SAM3U_PID_WDT)    /* Watchdog Timer */
-#define SAM3U_IRQ_PMC           (SAM3U_IRQ_EXTINT+SAM3U_PID_PMC)    /* Power Management Controller */
-#define SAM3U_IRQ_EEFC0         (SAM3U_IRQ_EXTINT+SAM3U_PID_EEFC0)  /* Enhanced Embedded Flash Controller 0 */
-#define SAM3U_IRQ_EEFC1         (SAM3U_IRQ_EXTINT+SAM3U_PID_EEFC1)  /* Enhanced Embedded Flash Controller 1 */
-#define SAM3U_IRQ_UART          (SAM3U_IRQ_EXTINT+SAM3U_PID_UART)   /* Universal Asynchronous Receiver Transmitter */
-#define SAM3U_IRQ_SMC           (SAM3U_IRQ_EXTINT+SAM3U_PID_SMC)    /* Static Memory Controller */
-#define SAM3U_IRQ_PIOA          (SAM3U_IRQ_EXTINT+SAM3U_PID_PIOA)   /* Parallel I/O Controller A */
-#define SAM3U_IRQ_PIOB          (SAM3U_IRQ_EXTINT+SAM3U_PID_PIOB)   /* Parallel I/O Controller B */
-#define SAM3U_IRQ_PIOC          (SAM3U_IRQ_EXTINT+SAM3U_PID_PIOC)   /* Parallel I/O Controller C */
-#define SAM3U_IRQ_USART0        (SAM3U_IRQ_EXTINT+SAM3U_PID_USART0) /* USART 0 */
-#define SAM3U_IRQ_USART1        (SAM3U_IRQ_EXTINT+SAM3U_PID_USART1) /* USART 1 */
-#define SAM3U_IRQ_USART2        (SAM3U_IRQ_EXTINT+SAM3U_PID_USART2) /* USART 2 */
-#define SAM3U_IRQ_USART3        (SAM3U_IRQ_EXTINT+SAM3U_PID_USART3) /* USART 3 */
-#define SAM3U_IRQ_HSMCI         (SAM3U_IRQ_EXTINT+SAM3U_PID_HSMCI)  /* High Speed Multimedia Card Interface */
-#define SAM3U_IRQ_TWI0          (SAM3U_IRQ_EXTINT+SAM3U_PID_TWI0)   /* Two-Wire Interface 0 */
-#define SAM3U_IRQ_TWI1          (SAM3U_IRQ_EXTINT+SAM3U_PID_TWI1)   /* Two-Wire Interface 1 */
-#define SAM3U_IRQ_SPI           (SAM3U_IRQ_EXTINT+SAM3U_PID_SPI)    /* Serial Peripheral Interface */
-#define SAM3U_IRQ_SSC           (SAM3U_IRQ_EXTINT+SAM3U_PID_SSC)    /* Synchronous Serial Controller */
-#define SAM3U_IRQ_TC0           (SAM3U_IRQ_EXTINT+SAM3U_PID_TC0)    /* Timer Counter 0 */
-#define SAM3U_IRQ_TC1           (SAM3U_IRQ_EXTINT+SAM3U_PID_TC1)    /* Timer Counter 1 */
-#define SAM3U_IRQ_TC2           (SAM3U_IRQ_EXTINT+SAM3U_PID_TC2)    /* Timer Counter 2 */
-#define SAM3U_IRQ_PWM           (SAM3U_IRQ_EXTINT+SAM3U_PID_PWM)    /* Pulse Width Modulation Controller */
-#define SAM3U_IRQ_ADC12B        (SAM3U_IRQ_EXTINT+SAM3U_PID_ADC12B) /* 12-bit ADC Controller */
-#define SAM3U_IRQ_ADC           (SAM3U_IRQ_EXTINT+SAM3U_PID_ADC)    /* 10-bit ADC Controller */
-#define SAM3U_IRQ_DMAC          (SAM3U_IRQ_EXTINT+SAM3U_PID_DMAC)   /* DMA Controller */
-#define SAM3U_IRQ_UDPHS         (SAM3U_IRQ_EXTINT+SAM3U_PID_UDPHS)  /* USB Device High Speed */
-#define SAM3U_IRQ_NEXTINT       NR_PIDS                             /* Total number of external interrupt numbers */
-#define SAM3U_IRQ_NIRQS         (SAM3U_IRQ_EXTINT+NR_PIDS)          /* The number of real IRQs */
-
-/* GPIO interrupts (derived from SAM3U_IRQ_PIOA/B/C) */
-
-#ifdef CONFIG_GPIOA_IRQ
-#  define SAM3U_IRQ_GPIOA_PINS  (SAM3U_IRQ_EXTINT+SAM3U_IRQ_NEXTINT)
-#  define SAM3U_IRQ_PA0         (SAM3U_IRQ_GPIOA_PINS+0)            /* GPIOA, PIN 0 */
-#  define SAM3U_IRQ_PA1         (SAM3U_IRQ_GPIOA_PINS+1)            /* GPIOA, PIN 1 */
-#  define SAM3U_IRQ_PA2         (SAM3U_IRQ_GPIOA_PINS+2)            /* GPIOA, PIN 2 */
-#  define SAM3U_IRQ_PA3         (SAM3U_IRQ_GPIOA_PINS+3)            /* GPIOA, PIN 3 */
-#  define SAM3U_IRQ_PA4         (SAM3U_IRQ_GPIOA_PINS+4)            /* GPIOA, PIN 4 */
-#  define SAM3U_IRQ_PA5         (SAM3U_IRQ_GPIOA_PINS+5)            /* GPIOA, PIN 5 */
-#  define SAM3U_IRQ_PA6         (SAM3U_IRQ_GPIOA_PINS+6)            /* GPIOA, PIN 6 */
-#  define SAM3U_IRQ_PA7         (SAM3U_IRQ_GPIOA_PINS+7)            /* GPIOA, PIN 7 */
-#  define SAM3U_IRQ_PA8         (SAM3U_IRQ_GPIOA_PINS+8)            /* GPIOA, PIN 8 */
-#  define SAM3U_IRQ_PA9         (SAM3U_IRQ_GPIOA_PINS+9)            /* GPIOA, PIN 9 */
-#  define SAM3U_IRQ_PA10        (SAM3U_IRQ_GPIOA_PINS+10)           /* GPIOA, PIN 10 */
-#  define SAM3U_IRQ_PA11        (SAM3U_IRQ_GPIOA_PINS+11)           /* GPIOA, PIN 11 */
-#  define SAM3U_IRQ_PA12        (SAM3U_IRQ_GPIOA_PINS+12)           /* GPIOA, PIN 12 */
-#  define SAM3U_IRQ_PA13        (SAM3U_IRQ_GPIOA_PINS+13)           /* GPIOA, PIN 13 */
-#  define SAM3U_IRQ_PA14        (SAM3U_IRQ_GPIOA_PINS+14)           /* GPIOA, PIN 14 */
-#  define SAM3U_IRQ_PA15        (SAM3U_IRQ_GPIOA_PINS+15)           /* GPIOA, PIN 15 */
-#  define SAM3U_IRQ_PA16        (SAM3U_IRQ_GPIOA_PINS+16)           /* GPIOA, PIN 16 */
-#  define SAM3U_IRQ_PA17        (SAM3U_IRQ_GPIOA_PINS+17)           /* GPIOA, PIN 17 */
-#  define SAM3U_IRQ_PA18        (SAM3U_IRQ_GPIOA_PINS+18)           /* GPIOA, PIN 18 */
-#  define SAM3U_IRQ_PA19        (SAM3U_IRQ_GPIOA_PINS+19)           /* GPIOA, PIN 19 */
-#  define SAM3U_IRQ_PA20        (SAM3U_IRQ_GPIOA_PINS+20)           /* GPIOA, PIN 20 */
-#  define SAM3U_IRQ_PA21        (SAM3U_IRQ_GPIOA_PINS+21)           /* GPIOA, PIN 21 */
-#  define SAM3U_IRQ_PA22        (SAM3U_IRQ_GPIOA_PINS+22)           /* GPIOA, PIN 22 */
-#  define SAM3U_IRQ_PA23        (SAM3U_IRQ_GPIOA_PINS+23)           /* GPIOA, PIN 23 */
-#  define SAM3U_IRQ_PA24        (SAM3U_IRQ_GPIOA_PINS+24)           /* GPIOA, PIN 24 */
-#  define SAM3U_IRQ_PA25        (SAM3U_IRQ_GPIOA_PINS+25)           /* GPIOA, PIN 25 */
-#  define SAM3U_IRQ_PA26        (SAM3U_IRQ_GPIOA_PINS+26)           /* GPIOA, PIN 26 */
-#  define SAM3U_IRQ_PA27        (SAM3U_IRQ_GPIOA_PINS+27)           /* GPIOA, PIN 27 */
-#  define SAM3U_IRQ_PA28        (SAM3U_IRQ_GPIOA_PINS+28)           /* GPIOA, PIN 28 */
-#  define SAM3U_IRQ_PA29        (SAM3U_IRQ_GPIOA_PINS+29)           /* GPIOA, PIN 29 */
-#  define SAM3U_IRQ_PA30        (SAM3U_IRQ_GPIOA_PINS+30)           /* GPIOA, PIN 30 */
-#  define SAM3U_IRQ_PA31        (SAM3U_IRQ_GPIOA_PINS+31)           /* GPIOA, PIN 31 */
-#  define SAM3U_NGPIOAIRQS      32
-#else
-#  define SAM3U_NGPIOAIRQS      0
-#endif
-
-#ifdef CONFIG_GPIOB_IRQ
-#  define SAM3U_IRQ_GPIOB_PINS  (SAM3U_IRQ_EXTINT+SAM3U_IRQ_NEXTINT+SAM3U_IRQ_GPIOA_PINS)
-#  define SAM3U_IRQ_PB0         (SAM3U_IRQ_GPIOB_PINS+0)            /* GPIOB, PIN 0 */
-#  define SAM3U_IRQ_PB1         (SAM3U_IRQ_GPIOB_PINS+1)            /* GPIOB, PIN 1 */
-#  define SAM3U_IRQ_PB2         (SAM3U_IRQ_GPIOB_PINS+2)            /* GPIOB, PIN 2 */
-#  define SAM3U_IRQ_PB3         (SAM3U_IRQ_GPIOB_PINS+3)            /* GPIOB, PIN 3 */
-#  define SAM3U_IRQ_PB4         (SAM3U_IRQ_GPIOB_PINS+4)            /* GPIOB, PIN 4 */
-#  define SAM3U_IRQ_PB5         (SAM3U_IRQ_GPIOB_PINS+5)            /* GPIOB, PIN 5 */
-#  define SAM3U_IRQ_PB6         (SAM3U_IRQ_GPIOB_PINS+6)            /* GPIOB, PIN 6 */
-#  define SAM3U_IRQ_PB7         (SAM3U_IRQ_GPIOB_PINS+7)            /* GPIOB, PIN 7 */
-#  define SAM3U_IRQ_PB8         (SAM3U_IRQ_GPIOB_PINS+8)            /* GPIOB, PIN 8 */
-#  define SAM3U_IRQ_PB9         (SAM3U_IRQ_GPIOB_PINS+9)            /* GPIOB, PIN 9 */
-#  define SAM3U_IRQ_PB10        (SAM3U_IRQ_GPIOB_PINS+10)           /* GPIOB, PIN 10 */
-#  define SAM3U_IRQ_PB11        (SAM3U_IRQ_GPIOB_PINS+11)           /* GPIOB, PIN 11 */
-#  define SAM3U_IRQ_PB12        (SAM3U_IRQ_GPIOB_PINS+12)           /* GPIOB, PIN 12 */
-#  define SAM3U_IRQ_PB13        (SAM3U_IRQ_GPIOB_PINS+13)           /* GPIOB, PIN 13 */
-#  define SAM3U_IRQ_PB14        (SAM3U_IRQ_GPIOB_PINS+14)           /* GPIOB, PIN 14 */
-#  define SAM3U_IRQ_PB15        (SAM3U_IRQ_GPIOB_PINS+15)           /* GPIOB, PIN 15 */
-#  define SAM3U_IRQ_PB16        (SAM3U_IRQ_GPIOB_PINS+16)           /* GPIOB, PIN 16 */
-#  define SAM3U_IRQ_PB17        (SAM3U_IRQ_GPIOB_PINS+17)           /* GPIOB, PIN 17 */
-#  define SAM3U_IRQ_PB18        (SAM3U_IRQ_GPIOB_PINS+18)           /* GPIOB, PIN 18 */
-#  define SAM3U_IRQ_PB19        (SAM3U_IRQ_GPIOB_PINS+19)           /* GPIOB, PIN 19 */
-#  define SAM3U_IRQ_PB20        (SAM3U_IRQ_GPIOB_PINS+20)           /* GPIOB, PIN 20 */
-#  define SAM3U_IRQ_PB21        (SAM3U_IRQ_GPIOB_PINS+21)           /* GPIOB, PIN 21 */
-#  define SAM3U_IRQ_PB22        (SAM3U_IRQ_GPIOB_PINS+22)           /* GPIOB, PIN 22 */
-#  define SAM3U_IRQ_PB23        (SAM3U_IRQ_GPIOB_PINS+23)           /* GPIOB, PIN 23 */
-#  define SAM3U_IRQ_PB24        (SAM3U_IRQ_GPIOB_PINS+24)           /* GPIOB, PIN 24 */
-#  define SAM3U_IRQ_PB25        (SAM3U_IRQ_GPIOB_PINS+25)           /* GPIOB, PIN 25 */
-#  define SAM3U_IRQ_PB26        (SAM3U_IRQ_GPIOB_PINS+26)           /* GPIOB, PIN 26 */
-#  define SAM3U_IRQ_PB27        (SAM3U_IRQ_GPIOB_PINS+27)           /* GPIOB, PIN 27 */
-#  define SAM3U_IRQ_PB28        (SAM3U_IRQ_GPIOB_PINS+28)           /* GPIOB, PIN 28 */
-#  define SAM3U_IRQ_PB29        (SAM3U_IRQ_GPIOB_PINS+29)           /* GPIOB, PIN 29 */
-#  define SAM3U_IRQ_PB30        (SAM3U_IRQ_GPIOB_PINS+30)           /* GPIOB, PIN 30 */
-#  define SAM3U_IRQ_PB31        (SAM3U_IRQ_GPIOB_PINS+31)           /* GPIOB, PIN 31 */
-#  define SAM3U_NGPIOAIRQS      32
-#else
-#  define SAM3U_NGPIOBIRQS      0
-#endif
-
-#ifdef CONFIG_GPIOC_IRQ
-#  define SAM3U_IRQ_GPIOC_PINS  (SAM3U_IRQ_EXTINT+SAM3U_IRQ_NEXTINT+SAM3U_IRQ_GPIOA_PINS+SAM3U_IRQ_GPIOB_PINS)
-#  define SAM3U_IRQ_PC0         (SAM3U_IRQ_GPIOC_PINS+0)            /* GPIOC, PIN 0 */
-#  define SAM3U_IRQ_PC1         (SAM3U_IRQ_GPIOC_PINS+1)            /* GPIOC, PIN 1 */
-#  define SAM3U_IRQ_PC2         (SAM3U_IRQ_GPIOC_PINS+2)            /* GPIOC, PIN 2 */
-#  define SAM3U_IRQ_PC3         (SAM3U_IRQ_GPIOC_PINS+3)            /* GPIOC, PIN 3 */
-#  define SAM3U_IRQ_PC4         (SAM3U_IRQ_GPIOC_PINS+4)            /* GPIOC, PIN 4 */
-#  define SAM3U_IRQ_PC5         (SAM3U_IRQ_GPIOC_PINS+5)            /* GPIOC, PIN 5 */
-#  define SAM3U_IRQ_PC6         (SAM3U_IRQ_GPIOC_PINS+6)            /* GPIOC, PIN 6 */
-#  define SAM3U_IRQ_PC7         (SAM3U_IRQ_GPIOC_PINS+7)            /* GPIOC, PIN 7 */
-#  define SAM3U_IRQ_PC8         (SAM3U_IRQ_GPIOC_PINS+8)            /* GPIOC, PIN 8 */
-#  define SAM3U_IRQ_PC9         (SAM3U_IRQ_GPIOC_PINS+9)            /* GPIOC, PIN 9 */
-#  define SAM3U_IRQ_PC10        (SAM3U_IRQ_GPIOC_PINS+10)           /* GPIOC, PIN 10 */
-#  define SAM3U_IRQ_PC11        (SAM3U_IRQ_GPIOC_PINS+11)           /* GPIOC, PIN 11 */
-#  define SAM3U_IRQ_PC12        (SAM3U_IRQ_GPIOC_PINS+12)           /* GPIOC, PIN 12 */
-#  define SAM3U_IRQ_PC13        (SAM3U_IRQ_GPIOC_PINS+13)           /* GPIOC, PIN 13 */
-#  define SAM3U_IRQ_PC14        (SAM3U_IRQ_GPIOC_PINS+14)           /* GPIOC, PIN 14 */
-#  define SAM3U_IRQ_PC15        (SAM3U_IRQ_GPIOC_PINS+15)           /* GPIOC, PIN 15 */
-#  define SAM3U_IRQ_PC16        (SAM3U_IRQ_GPIOC_PINS+16)           /* GPIOC, PIN 16 */
-#  define SAM3U_IRQ_PC17        (SAM3U_IRQ_GPIOC_PINS+17)           /* GPIOC, PIN 17 */
-#  define SAM3U_IRQ_PC18        (SAM3U_IRQ_GPIOC_PINS+18)           /* GPIOC, PIN 18 */
-#  define SAM3U_IRQ_PC19        (SAM3U_IRQ_GPIOC_PINS+19)           /* GPIOC, PIN 19 */
-#  define SAM3U_IRQ_PC20        (SAM3U_IRQ_GPIOC_PINS+20)           /* GPIOC, PIN 20 */
-#  define SAM3U_IRQ_PC21        (SAM3U_IRQ_GPIOC_PINS+21)           /* GPIOC, PIN 21 */
-#  define SAM3U_IRQ_PC22        (SAM3U_IRQ_GPIOC_PINS+22)           /* GPIOC, PIN 22 */
-#  define SAM3U_IRQ_PC23        (SAM3U_IRQ_GPIOC_PINS+23)           /* GPIOC, PIN 23 */
-#  define SAM3U_IRQ_PC24        (SAM3U_IRQ_GPIOC_PINS+24)           /* GPIOC, PIN 24 */
-#  define SAM3U_IRQ_PC25        (SAM3U_IRQ_GPIOC_PINS+25)           /* GPIOC, PIN 25 */
-#  define SAM3U_IRQ_PC26        (SAM3U_IRQ_GPIOC_PINS+26)           /* GPIOC, PIN 26 */
-#  define SAM3U_IRQ_PC27        (SAM3U_IRQ_GPIOC_PINS+27)           /* GPIOC, PIN 27 */
-#  define SAM3U_IRQ_PC28        (SAM3U_IRQ_GPIOC_PINS+28)           /* GPIOC, PIN 28 */
-#  define SAM3U_IRQ_PC29        (SAM3U_IRQ_GPIOC_PINS+29)           /* GPIOC, PIN 29 */
-#  define SAM3U_IRQ_PC30        (SAM3U_IRQ_GPIOC_PINS+30)           /* GPIOC, PIN 30 */
-#  define SAM3U_IRQ_PC31        (SAM3U_IRQ_GPIOC_PINS+31)           /* GPIOC, PIN 31 */
-#  define SAM3U_NGPIOAIRQS      32
-#else
-#  define SAM3U_NGPIOCIRQS      0
-#endif
-
-/* Total number of IRQ numbers */
-
-#define NR_IRQS                 (SAM3U_IRQ_EXTINT+SAM3U_IRQ_NEXTINT+\
-                                 SAM3U_NGPIOAIRQS+SAM3U_NGPIOBIRQS+SAM3U_NGPIOCIRQS)
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Inline functions
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Variables
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Function Prototypes
- ****************************************************************************************/
-
-#ifndef __ASSEMBLY__
-#ifdef __cplusplus
-#define EXTERN extern "C"
-extern "C" {
-#else
-#define EXTERN extern
-#endif
-
-#undef EXTERN
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-#endif /* __ARCH_ARM_INCLUDE_SAM3U_IRQ_H */
-
diff --git a/nuttx/arch/arm/src/sam3u/Kconfig b/nuttx/arch/arm/src/sam34/Kconfig
index 7170fdac3..9cd9a019a 100644
--- a/nuttx/arch/arm/src/sam3u/Kconfig
+++ b/nuttx/arch/arm/src/sam34/Kconfig
@@ -3,54 +3,63 @@
 # see misc/tools/kconfig-language.txt.
 #
 
-comment "AT91SAM3 Configuration Options"
+comment "AT91SAM3/SAM4 Configuration Options"
 
 choice
 	prompt "AT91SAM3 Chip Selection"
 	default ARCH_CHIP_AT91SAM3U4E
-	depends on ARCH_CHIP_SAM3U
+	depends on ARCH_CHIP_SAM34
 
 config ARCH_CHIP_AT91SAM3U4E
 	bool "AT91SAM3U4E"
+	select ARCH_CORTEXM3
+	select ARCH_CHIP_SAM3U
 
 endchoice
 
+config ARCH_CHIP_SAM3U
+	bool
+
 menu "AT91SAM3 Peripheral Support"
 
-config SAM3U_DMA
+config SAM34_DMA
 	bool "DMA"
 	default n
 	select ARCH_DMA
 
-config SAM3U_NAND
+config SAM34_NAND
 	bool "NAND support"
 	default n
 
-config SAM3U_HSMCI
+config SAM34_HSMCI
 	bool "HSMCI"
 	default n
 
-config SAM3U_UART
+config SAM34_UART
 	bool "UART"
 	default y
 	select ARCH_HAVE_UART
 
-config SAM3U_USART0
+config SAM34_USART0
 	bool "USART0"
 	default n
 
-config SAM3U_USART1
+config SAM34_USART1
 	bool "USART1"
 	default n
 
-config SAM3U_USART2
+config SAM34_USART2
 	bool "USART2"
 	default n
 
-config SAM3U_USART3
+config SAM34_USART3
 	bool "USART3"
 	default n
 
+config SAM34_SPI
+	bool "SPI"
+	default n
+
 endmenu
 
 menu "AT91SAM3 UART Configuration"
@@ -58,25 +67,25 @@ menu "AT91SAM3 UART Configuration"
 config USART0_ISUART
 	bool "USART0 is a UART"
 	default y
-	depends on SAM3U_USART0
+	depends on SAM34_USART0
 	select ARCH_HAVE_USART0
 
 config USART1_ISUART
 	bool "USART1 is a UART"
 	default y
-	depends on SAM3U_USART1
+	depends on SAM34_USART1
 	select ARCH_HAVE_USART1
 
 config USART2_ISUART
 	bool "USART2 is a UART"
 	default n
-	depends on SAM3U_USART2
+	depends on SAM34_USART2
 	select ARCH_HAVE_USART2
 
 config USART3_ISUART
 	bool "USART3 is a UART"
 	default y
-	depends on SAM3U_USART3
+	depends on SAM34_USART3
 	select ARCH_HAVE_USART2
 
 endmenu
diff --git a/nuttx/arch/arm/src/sam3u/Make.defs b/nuttx/arch/arm/src/sam34/Make.defs
index b2b3bf3b5..813bcbe4c 100644
--- a/nuttx/arch/arm/src/sam3u/Make.defs
+++ b/nuttx/arch/arm/src/sam34/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# arch/arm/src/sam3u/Make.defs
+# arch/arm/src/sam34/Make.defs
 #
 #   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,7 +35,7 @@
 
 # The start-up, "head", file
 
-HEAD_ASRC = sam3u_vectors.S
+HEAD_ASRC = sam_vectors.S
 
 # Common ARM and Cortex-M3 files
 
@@ -74,27 +74,27 @@ ifeq ($(CONFIG_ELF),y)
 CMN_CSRCS += up_elf.c
 endif
 
-# Required SAM3U files
+# Required SAM3/4 files
 
-CHIP_ASRCS  = 
-CHIP_CSRCS  = sam3u_allocateheap.c sam3u_clockconfig.c sam3u_gpioirq.c
-CHIP_CSRCS += sam3u_irq.c sam3u_lowputc.c sam3u_pio.c sam3u_serial.c
-CHIP_CSRCS += sam3u_start.c sam3u_timerisr.c
+CHIP_ASRCS  =
+CHIP_CSRCS  = sam_allocateheap.c sam_clockconfig.c sam_gpioirq.c
+CHIP_CSRCS += sam_irq.c sam_lowputc.c sam_gpio.c sam_serial.c
+CHIP_CSRCS += sam_start.c sam_timerisr.c
 
-# Configuration-dependent SAM3U files
+# Configuration-dependent SAM3/4 files
 
 ifeq ($(CONFIG_NUTTX_KERNEL),y)
-CHIP_CSRCS += sam3u_userspace.c sam3u_mpuinit.c
+CHIP_CSRCS += sam_userspace.c sam_mpuinit.c
 endif
 
-ifeq ($(CONFIG_SAM3U_DMA),y)
-CHIP_CSRCS += sam3u_dmac.c
+ifeq ($(CONFIG_SAM34_DMA),y)
+CHIP_CSRCS += sam_dmac.c
 endif
 
-ifeq ($(CONFIG_SAM3U_HSMCI),y)
-CHIP_CSRCS += sam3u_hsmci.c
+ifeq ($(CONFIG_SAM34_HSMCI),y)
+CHIP_CSRCS += sam_hsmci.c
 endif
 
-ifeq ($(CONFIG_SAM3U_SPI),y)
-CHIP_CSRCS += sam3u_spi.c
+ifeq ($(CONFIG_SAM34_SPI),y)
+CHIP_CSRCS += sam_spi.c
 endif
diff --git a/nuttx/arch/arm/src/sam3u/chip.h b/nuttx/arch/arm/src/sam34/chip.h
index 1ce104ab2..cd5f76d89 100644
--- a/nuttx/arch/arm/src/sam3u/chip.h
+++ b/nuttx/arch/arm/src/sam34/chip.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sam3u/chip.h
+ * arch/arm/src/sam34/chip.h
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_CHIP_H
-#define __ARCH_ARM_SRC_SAM3U_CHIP_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_H
 
 /************************************************************************************
  * Included Files
@@ -46,8 +46,8 @@
  * should then include this file for the proper setup.
  */
 
-#include <arch/sam3u/chip.h>
-#include "sam3u_memorymap.h"
+#include <arch/sam34/chip.h>
+#include "chip/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -65,4 +65,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_CHIP_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam3u_memorymap.h b/nuttx/arch/arm/src/sam34/chip/sam3u_memorymap.h
new file mode 100644
index 000000000..ea61f57d8
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam3u_memorymap.h
@@ -0,0 +1,145 @@
+/************************************************************************************************
+ * arch/arm/src/sam34/chip/sam3u_memorymap.h
+ *
+ *   Copyright (C) 2009-2010, 2013 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_SAM34_SAM3U_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAM34_SAM3U_MEMORYMAP_H
+
+/************************************************************************************************
+ * Included Files
+ ************************************************************************************************/
+
+#include <nuttx/config.h>
+#include "chip.h"
+
+/************************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************************/
+
+#define   SAM_CODE_BASE        0x00000000 /* 0x00000000-0x1fffffff: Code space */
+#  define SAM_BOOTMEMORY_BASE  0x00000000 /* 0x00000000-0x0007ffff:   Boot Memory */
+#  define SAM_INTFLASH0_BASE   0x00080000 /* 0x00080000-0x000fffff:   Internal FLASH 0 */
+#  define SAM_INTFLASH1_BASE   0x00100000 /* 0x00100000-0x0017ffff:   Internal FLASH 1 */
+#  define SAM_INTROM_BASE      0x00180000 /* 0x00180000-0x001fffff:   Internal ROM */
+                                          /* 0x00200000-0x1fffffff:   Reserved */
+#define   SAM_INTSRAM_BASE     0x20000000 /* 0x20000000-0x3fffffff: Internal SRAM */
+#  define SAM_INTSRAM0_BASE    0x20000000 /* 0x20000000-0x2007ffff:   SRAM0 (see chip.h) */
+#  define SAM_INTSRAM1_BASE    0x20080000 /* 0x20080000-0x200fffff:   SRAM1 (see chip.h) */
+#  define SAM_NFCSRAM_BASE     0x20100000 /* 0x20100000-0x207fffff:   NAND FLASH controller (SRAM) */
+#  define SAM_UDPHPSDMS_BASE   0x20180000 /* 0x20180000-0x201fffff:   USB Device High Speed (DMA) */
+                                          /* 0x20200000-0x2fffffff:   Undefined */
+#  define SAM_BBSRAM_BASE      0x22000000 /* 0x22000000-0x23ffffff:   32Mb bit-band alias */
+                                          /* 0x24000000-0x3fffffff:   Undefined */
+#define SAM_PERIPHERALS_BASE   0x40000000 /* 0x40000000-0x5fffffff: Peripherals */
+#  define SAM_MCI_BASE         0x40000000 /* 0x40000000-0x400003ff:   High Speed Multimedia Card Interface */
+#  define SAM_SSC_BASE         0x40004000 /* 0x40004000-0x40007fff:   Synchronous Serial Controller */
+#  define SAM_SPI_BASE         0x40008000 /* 0x40008000-0x4000bfff:   Serial Peripheral Interface */
+                                          /* 0x4000c000-0x4007ffff:   Reserved */
+#  define SAM_TC_BASE          0x40080000 /* 0x40080000-0x40083fff:   Timer Counters */
+#    define SAM_TCN_BASE(n)    (0x40080000+((n)<<6))
+#    define SAM_TC0_BASE       0x40080000 /* 0x40080000-0x4008003f:     Timer Counter 0 */
+#    define SAM_TC1_BASE       0x40080040 /* 0x40080040-0x4008007f:     Timer Counter 1 */
+#    define SAM_TC2_BASE       0x40080080 /* 0x40080080-0x400800bf:     Timer Counter 2 */
+#  define SAM_TWI_BASE         0x40084000 /* 0x40084000-0x4008ffff:   Two-Wire Interface */
+#    define SAM_TWIN_BASE(n)   (0x40084000+((n)<<14))
+#    define SAM_TWI0_BASE      0x40084000 /* 0x40084000-0x40087fff:     Two-Wire Interface 0 */
+#    define SAM_TWI1_BASE      0x40088000 /* 0x40088000-0x4008bfff:     Two-Wire Interface 1 */
+#  define SAM_PWM_BASE         0x4008c000 /* 0x4008c000-0x4008ffff:   Pulse Width Modulation Controller */
+#  define SAM_USART_BASE       0x40090000 /* 0x40090000-0x4009ffff:   USART */
+#    define SAM_USARTN_BASE(n) (0x40090000+((n)<<14))
+#    define SAM_USART0_BASE    0x40090000 /* 0x40090000-0x40093fff:     USART0 */
+#    define SAM_USART1_BASE    0x40094000 /* 0x40094000-0x40097fff:     USART1 */
+#    define SAM_USART2_BASE    0x40098000 /* 0x40098000-0x4009bfff:     USART2 */
+#    define SAM_USART3_BASE    0x4009c000 /* 0x4009c000-0x4009ffff:     USART3 */
+                                          /* 0x400a0000-0x400a3fff:   Reserved */
+#  define SAM_UDPHS_BASE       0x400a4000 /* 0x400a4000-0x400a7fff:   USB Device High Speed */
+#  define SAM_ADC12B_BASE      0x400a8000 /* 0x400a8000-0x400abfff:   12-bit ADC Controller */
+#  define SAM_ADC_BASE         0x400ac000 /* 0x400ac000-0x400affff:   10-bit ADC Controller */
+#  define SAM_DMAC_BASE        0x400b0000 /* 0x400b0000-0x400b3fff:   DMA controller */
+                                          /* 0x400b4000-0x400dffff:   Reserved */
+#  define SAM_SYSCTRLR_BASE    0x400e0000 /* 0x400e0000-0x400e25ff:   System controller */
+                                          /* 0x400e2600-0x400fffff:   Reserved */
+                                          /* 0x40100000-0x41ffffff:   Reserved */
+#  define SAM_BBPERIPH__BASE   0x42000000 /* 0x42000000-0x43ffffff:   32Mb bit-band alias */
+                                          /* 0x44000000-0x5fffffff:   Reserved */
+#define   SAM_EXTSRAM_BASE     0x60000000 /* 0x60000000-0x9fffffff: External SRAM */
+#  define SAM_EXTCS_BASE       0x60000000 /* 0x60000000-0x63ffffff:   Chip selects */
+#    define SAM_EXTCSN_BASE(n) (0x60000000*((n)<<24))
+#    define SAM_EXTCS0_BASE    0x60000000 /* 0x60000000-0x60ffffff:     Chip select 0 */
+#    define SAM_EXTCS1_BASE    0x61000000 /* 0x61000000-0x601fffff:     Chip select 1 */
+#    define SAM_EXTCS2_BASE    0x62000000 /* 0x62000000-0x62ffffff:     Chip select 2 */
+#    define SAM_EXTCS3_BASE    0x63000000 /* 0x63000000-0x63ffffff:     Chip select 3 */
+                                          /* 0x64000000-0x67ffffff:   Reserved */
+#  define SAM_NFC_BASE         0x68000000 /* 0x68000000-0x68ffffff:   NAND FLASH controller */
+                                          /* 0x69000000-0x9fffffff:   Reserved */
+                                          /* 0xa0000000-0xdfffffff:   Reserved */
+#define   SAM_SYSTEM_BASE      0xe0000000 /* 0xe0000000-0xffffffff: System */
+
+/* System Controller Register Blocks:  0x400e0000-0x4007ffff */
+
+#define SAM_SMC_BASE           0x400e0000 /* 0x400e0000-0x400e01ff: Static Memory Controller */
+#define SAM_MATRIX_BASE        0x400e0200 /* 0x400e0200-0x400e03ff: MATRIX */
+#define SAM_PMC_BASE           0x400e0400 /* 0x400e0400-0x400e05ff: Power Management Controller */
+#define SAM_UART_BASE          0x400e0600 /* 0x400e0600-0x400e073f: UART */
+#define SAM_CHIPID_BASE        0x400e0740 /* 0x400e0740-0x400e07ff: CHIP ID */
+#define SAM_EEFC_BASE          0x400e0800 /* 0x400e0800-0x400e0bff: Enhanced Embedded Flash Controllers*/
+#  define SAM_EEFCN_BASE(n)    (0x400e0800+((n)<<9))
+#  define SAM_EEFC0_BASE       0x400e0800 /* 0x400e0800-0x400e09ff:   Enhanced Embedded Flash Controller 0 */
+#  define SAM_EEFC1_BASE       0x400e0a00 /* 0x400e0a00-0x400e0bff:   Enhanced Embedded Flash Controller 1 */
+#define SAM_PIO_BASE           0x400e0c00 /* 0x400e0c00-0x400e11ff: Parallel I/O Controllers */
+#  define SAM_PION_BASE(n)     (0x400e0c00+((n)<<9))
+#  define SAM_PIOA_BASE        0x400e0c00 /* 0x400e0c00-0x400e0dff:   Parallel I/O Controller A */
+#  define SAM_PIOB_BASE        0x400e0e00 /* 0x400e0e00-0x400e0fff:   Parallel I/O Controller B */
+#  define SAM_PIOC_BASE        0x400e1000 /* 0x400e1000-0x400e11ff:   Parallel I/O Controller C */
+#define SAM_RSTC_BASE          0x400e1200 /* 0x400e1200-0x400e120f: Reset Controller */
+#define SAM_SUPC_BASE          0x400e1210 /* 0x400e1210-0x400e122f: Supply Controller */
+#define SAM_RTT_BASE           0x400e1230 /* 0x400e1230-0x400e124f: Real Time Timer */
+#define SAM_WDT_BASE           0x400e1250 /* 0x400e1250-0x400e125f: Watchdog Timer */
+#define SAM_RTC_BASE           0x400e1260 /* 0x400e1260-0x400e128f: Real Time Clock */
+#define SAM_GPBR_BASE          0x400e1290 /* 0x400e1290-0x400e13ff: GPBR */
+                                            /* 0x490e1400-0x4007ffff: Reserved */
+
+/************************************************************************************************
+ * Public Types
+ ************************************************************************************************/
+
+/************************************************************************************************
+ * Public Data
+ ************************************************************************************************/
+
+/************************************************************************************************
+ * Public Functions
+ ************************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_SAM3U_MEMORYMAP_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam3u_pinmap.h b/nuttx/arch/arm/src/sam34/chip/sam3u_pinmap.h
new file mode 100644
index 000000000..fbcffbfd0
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam3u_pinmap.h
@@ -0,0 +1,223 @@
+/************************************************************************************
+ * arch/arm/src/sam34/chip/sam3u_pinmap.h
+ *
+ *   Copyright (C) 2009-2011, 2013 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_SAM34_CHIP_SAM3U_PINMAP_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "sam_gpio.h"
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/* GPIO pin definitions *************************************************************/
+
+#define GPIO_ADC0_AD0       (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN21)
+#define GPIO_ADC0_AD1       (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN30)
+#define GPIO_ADC0_AD2       (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN3)
+#define GPIO_ADC0_AD3       (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN4)
+#define GPIO_ADC0_AD4       (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN15)
+#define GPIO_ADC0_AD5       (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN16)
+#define GPIO_ADC0_AD6       (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN17)
+#define GPIO_ADC0_AD7       (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN18)
+
+#define GPIO_CAN_XCVR_RS    (GPIO_OUTPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_OUTPUT_SET|GPIO_PIN23)
+#define GPIO_CAN1_XCVR_TXD  (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN27)
+#define GPIO_CAN1_XCVR_RXD  (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN26)
+#define GPIO_CAN2_XCVR_TXD  (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN29)
+#define GPIO_CAN2_XCVR_RXD  (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN28)
+
+#define GPIO_SMC_D0         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN9)  /* Check! */
+#define GPIO_SMC_D1         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN10) /* Check! */
+#define GPIO_SMC_D2         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN11) /* Check! */
+#define GPIO_SMC_D3         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN12) /* Check! */
+#define GPIO_SMC_D4         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN13) /* Check! */
+#define GPIO_SMC_D5         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN14) /* Check! */
+#define GPIO_SMC_D6         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN15) /* Check! */
+#define GPIO_SMC_D7         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN16) /* Check! */
+#define GPIO_SMC_D8         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN25) /* Check! */
+#define GPIO_SMC_D9         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN26) /* Check! */
+#define GPIO_SMC_D10        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN27) /* Check! */
+#define GPIO_SMC_D11        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN28) /* Check! */
+#define GPIO_SMC_D12        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN29) /* Check! */
+#define GPIO_SMC_D13        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN30) /* Check! */
+#define GPIO_SMC_D14        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN31) /* Check! */
+#define GPIO_SMC_D15        (GPIO_PERIPHB|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN6)   /* Check! */
+#define GPIO_SMC_NCS0       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN20)
+#define GPIO_SMC_NRD        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN19)
+#define GPIO_SMC_NWE        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN23)
+#define GPIO_SMC_PSRAM_A0   (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN0)  /* Check! */
+#define GPIO_SMC_PSRAM_A1   (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN1)  /* Check! */
+#define GPIO_SMC_PSRAM_A2   (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN2)  /* Check! */
+#define GPIO_SMC_PSRAM_A3   (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN3)  /* Check! */
+#define GPIO_SMC_PSRAM_A4   (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN4)  /* Check! */
+#define GPIO_SMC_PSRAM_A5   (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN5)  /* Check! */
+#define GPIO_SMC_PSRAM_A6   (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN6)  /* Check! */
+#define GPIO_SMC_PSRAM_A7   (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN7)  /* Check! */
+#define GPIO_SMC_PSRAM_A8   (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN8)  /* Check! */
+#define GPIO_SMC_PSRAM_A9   (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN9)  /* Check! */
+#define GPIO_SMC_PSRAM_A10  (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN10) /* Check! */
+#define GPIO_SMC_PSRAM_A11  (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN11) /* Check! */
+#define GPIO_SMC_PSRAM_A12  (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN24) /* Check! */
+#define GPIO_SMC_PSRAM_A13  (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN25) /* Check! */
+#define GPIO_SMC_PSRAM_A14  (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN26) /* Check! */
+#define GPIO_SMC_PSRAM_A15  (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN27) /* Check! */
+#define GPIO_SMC_PSRAM_A16  (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN27) /* Check! */
+#define GPIO_SMC_PSRAM_A17  (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN28) /* Check! */
+#define GPIO_SMC_PSRAM_A18  (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN29) /* Check! */
+#define GPIO_SMC_PSRAM_NBS0 (GPIO_PERIPHB|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN7)   /* Check! */
+#define GPIO_SMC_PSRAM_NBS1 (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|GPIO_PIN15)
+#define GPIO_SMC_A1         (GPIO_PERIPHB|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN8)
+#define GPIO_SMC_NCS2       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|GPIO_PIN16)
+#define GPIO_SMC_LCD_RS     (GPIO_PERIPHB|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN8)
+
+#define GPIO_MCI_DAT0       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN5)
+#define GPIO_MCI_DAT1       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN6)
+#define GPIO_MCI_DAT2       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN7)
+#define GPIO_MCI_DAT3       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN8)
+#define GPIO_MCI_DAT4       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN28)
+#define GPIO_MCI_DAT5       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN29)
+#define GPIO_MCI_DAT6       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN30)
+#define GPIO_MCI_DAT7       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN31)
+#define GPIO_MCI_CK         (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN3)
+#define GPIO_MCI_DA         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN4)
+#define GPIO_MCI_DAT0IN     (GPIO_INPUT|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN5)
+
+#define GPIO_PWMC_PWMH0     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN0)
+#define GPIO_PWMC_PWML0     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN7)
+#define GPIO_PWMC_PWMH1     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN1)
+#define GPIO_PWMC_PWML1     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN8)
+#define GPIO_PWMC_PWMH2     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN2)
+#define GPIO_PWMC_PWML2     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN9)
+
+#define GPIO_SPI0_MISO      (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN13)
+#define GPIO_SPI0_MOSI      (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN14)
+#define GPIO_SPI0_SPCK      (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN15)
+#define GPIO_SPI0_NPCS0     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN16)
+
+#define GPIO_SPI0_NPCS1_1   (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN0)
+#define GPIO_SPI0_NPCS1_2   (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN3)
+#define GPIO_SPI0_NPCS1_3   (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN19)
+#define GPIO_SPI0_NPCS2_1   (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN1)
+#define GPIO_SPI0_NPCS2_2   (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN4)
+#define GPIO_SPI0_NPCS2_3   (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN14)
+#define GPIO_SPI0_NPCS3_1   (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN19)
+#define GPIO_SPI0_NPCS3_2   (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN5)
+
+#define GPIO_SSC_TD         (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN26)
+#define GPIO_SSC_TK         (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN28)
+#define GPIO_SSC_TF         (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN30)
+
+#define GPIO_PCK0           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN21)
+
+#define GPIO_TWI_TWD0       (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN9)
+#define GPIO_TWI_TWCK0      (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN10)
+#define GPIO_TWI_TWD1       (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN24)
+#define GPIO_TWI_TWCK1      (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN25)
+
+#define GPIO_UART_TXD       (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN12)
+#define GPIO_UART_RXD       (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN11)
+
+#define GPIO_USART0_CTS     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN8)
+#define GPIO_USART0_DCD     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN11)
+#define GPIO_USART0_DSR     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN10)
+#define GPIO_USART0_DTR     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN9)
+#define GPIO_USART0_RI      (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN12)
+#define GPIO_USART0_RTS     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN7)
+#define GPIO_USART0_RXD     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN19)
+#define GPIO_USART0_SCK     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN17)
+#define GPIO_USART0_TXD     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN18)
+
+#define GPIO_USART1_CTS     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN23)
+#define GPIO_USART1_RTS     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN22)
+#define GPIO_USART1_RXD     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN21)
+#define GPIO_USART1_SCK     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN24)
+#define GPIO_USART1_TXD     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN20)
+
+#define GPIO_USART2_CTS     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN22)
+#define GPIO_USART2_RTS     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN21)
+#define GPIO_USART2_RXD     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN23)
+#define GPIO_USART2_SCK     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN25)
+#define GPIO_USART2_TXD     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN22)
+
+#define GPIO_USART3_CTS     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN10)
+#define GPIO_USART3_RTS     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN11)
+#define GPIO_USART3_RXD     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN13)
+#define GPIO_USART3_SCK     (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN19)
+#define GPIO_USART3_TXD     (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN12)
+
+#define GPIO_USB_VBUS       (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN0)
+
+/************************************************************************************
+ * 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
+ ************************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM3U_PINMAP_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam3u_vectors.h b/nuttx/arch/arm/src/sam34/chip/sam3u_vectors.h
new file mode 100644
index 000000000..d1828ddd8
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam3u_vectors.h
@@ -0,0 +1,90 @@
+/************************************************************************************************
+ * arch/arm/src/sam34/chip/sam3u_vectors.h
+ *
+ *   Copyright (C) 2009-2010, 2013 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.
+ *
+ ************************************************************************************************/
+
+/************************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************************/
+/* This file is included by sam_vectors.S.  It provides the macro VECTOR that
+ * supplies ach SAM3U vector in terms of a (lower-case) ISR label and an
+ * (upper-case) IRQ number as defined in arch/arm/include/sam/sam3u_irq.h.
+ * sam_vectors.S will defined the VECTOR in different ways in order to generate
+ * the interrupt vectors and handlers in their final form.
+ *
+ *
+ * Vectors for low and medium density devices
+ */
+
+/* If the common ARMv7-M vector handling is used, then all it needs is the following
+ * definition that provides the number of supported vectors.
+ */
+
+#ifdef CONFIG_ARMV7M_CMNVECTOR
+
+/* Reserve 46 interrupt table entries for I/O interrupts. */
+
+# define ARMV7M_PERIPHERAL_INTERRUPTS 46
+
+#else
+  VECTOR(sam_supc, SAM_IRQ_SUPC)      /* Vector 16+0:  Supply Controller */
+  VECTOR(sam_rstc, SAM_IRQ_RSTC)      /* Vector 16+1:  Reset Controller */
+  VECTOR(sam_rtc, SAM_IRQ_RTC)        /* Vector 16+2:  Real Time Clock */
+  VECTOR(sam_rtt, SAM_IRQ_RTT)        /* Vector 16+3:  Real Time Timer */
+  VECTOR(sam_wdt, SAM_IRQ_WDT)        /* Vector 16+4:  Watchdog Timer */
+  VECTOR(sam_pmc, SAM_IRQ_PMC)        /* Vector 16+5:  Power Management Controller */
+  VECTOR(sam_eefc0, SAM_IRQ_EEFC0)    /* Vector 16+6:  Enhanced Embedded Flash Controller 0 */
+  VECTOR(sam_eefc1, SAM_IRQ_EEFC1)    /* Vector 16+7:  Enhanced Embedded Flash Controller 1 */
+  VECTOR(sam_uart, SAM_IRQ_UART)      /* Vector 16+8:  Universal Asynchronous Receiver Transmitter */
+  VECTOR(sam_smc, SAM_IRQ_SMC)        /* Vector 16+9:  Static Memory Controller */
+  VECTOR(sam_pioa, SAM_IRQ_PIOA)      /* Vector 16+10: Parallel I/O Controller A */
+  VECTOR(sam_piob, SAM_IRQ_PIOB)      /* Vector 16+11: Parallel I/O Controller B */
+  VECTOR(sam_pioc, SAM_IRQ_PIOC)      /* Vector 16+12: Parallel I/O Controller C */
+  VECTOR(sam_usart0, SAM_IRQ_USART0)  /* Vector 16+13: USART 0 */
+  VECTOR(sam_usart1, SAM_IRQ_USART1)  /* Vector 16+14: USART 1 */
+  VECTOR(sam_usart2, SAM_IRQ_USART2)  /* Vector 16+15: USART 2 */
+  VECTOR(sam_usart3, SAM_IRQ_USART3)  /* Vector 16+16: USART 3 */
+  VECTOR(sam_hsmci, SAM_IRQ_HSMCI)    /* Vector 16+17: High Speed Multimedia Card Interface */
+  VECTOR(sam_twi0, SAM_IRQ_TWI0)      /* Vector 16+18: Two-Wire Interface 0 */
+  VECTOR(sam_twi1, SAM_IRQ_TWI1)      /* Vector 16+19: Two-Wire Interface 1 */
+  VECTOR(sam_spi, SAM_IRQ_SPI)        /* Vector 16+20: Serial Peripheral Interface */
+  VECTOR(sam_ssc, SAM_IRQ_SSC)        /* Vector 16+21: Synchronous Serial Controller */
+  VECTOR(sam_tc0, SAM_IRQ_TC0)        /* Vector 16+22: Timer Counter 0 */
+  VECTOR(sam_tc1, SAM_IRQ_TC1)        /* Vector 16+23: Timer Counter 1 */
+  VECTOR(sam_tc2, SAM_IRQ_TC2)        /* Vector 16+24: Timer Counter 2 */
+  VECTOR(sam_pwm, SAM_IRQ_PWM)        /* Vector 16+25: Pulse Width Modulation Controller */
+  VECTOR(sam_adc12b, SAM_IRQ_ADC12B)  /* Vector 16+26: 12-bit ADC Controller */
+  VECTOR(sam_adc, SAM_IRQ_ADC)        /* Vector 16+27: 10-bit ADC Controller */
+  VECTOR(sam_dmac, SAM_IRQ_DMAC)      /* Vector 16+28: DMA Controller */
+  VECTOR(sam_udphs, SAM_IRQ_UDPHS)    /* Vector 16+29: USB Device High Speed */
+#endif
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_adc.h b/nuttx/arch/arm/src/sam34/chip/sam_adc.h
new file mode 100644
index 000000000..802fdcd2c
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_adc.h
@@ -0,0 +1,236 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_adc.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM_CHIP_SAM_ADC_H
+#define __ARCH_ARM_SRC_SAM_CHIP_SAM_ADC_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* ADC register offsets ****************************************************************/
+
+#define SAM_ADC_CR_OFFSET          0x00 /* Control Register (Both) */
+#define SAM_ADC_MR_OFFSET          0x04 /* Mode Register (Both) */
+                                        /* 0x08: Reserved */
+                                        /* 0x0c: Reserved */
+#define SAM_ADC_CHER_OFFSET        0x10 /* Channel Enable Register (Both) */
+#define SAM_ADC_CHDR_OFFSET        0x14 /* Channel Disable Register (Both) */
+#define SAM_ADC_CHSR_OFFSET        0x18 /* Channel Status Register (Both) */
+#define SAM_ADC_SR_OFFSET          0x1c /* Status Register (Both) */
+#define SAM_ADC_LCDR_OFFSET        0x20 /* Last Converted Data Register (Both) */
+#define SAM_ADC_IER_OFFSET         0x24 /* Interrupt Enable Register (Both) */
+#define SAM_ADC_IDR_OFFSET         0x28 /* Interrupt Disable Register (Both) */
+#define SAM_ADC_IMR_OFFSET         0x2c /* Interrupt Mask Register (Both) */
+#define SAM_ADC_CDR_OFFSET(n)      (0x30+((n)<<2))
+#define SAM_ADC_CDR0_OFFSET        0x30 /* Channel Data Register 0 (Both) */
+#define SAM_ADC_CDR1_OFFSET        0x34 /* Channel Data Register 1 (Both) */
+#define SAM_ADC_CDR2_OFFSET        0x38 /* Channel Data Register 2 (Both) */
+#define SAM_ADC_CDR3_OFFSET        0x3c /* Channel Data Register 3 (Both) */
+#define SAM_ADC_CDR4_OFFSET        0x40 /* Channel Data Register 4 (Both) */
+#define SAM_ADC_CDR5_OFFSET        0x44 /* Channel Data Register 5 (Both) */
+#define SAM_ADC_CDR6_OFFSET        0x48 /* Channel Data Register 6 (Both) */
+#define SAM_ADC_CDR7_OFFSET        0x4c /* Channel Data Register 7 (Both) */
+#define SAM_ADC12B_ACR_OFFSET      0x64 /* Analog Control Register (ADC12B only) */
+#define SAM_ADC12B_EMR_OFFSET      0x68 /* Extended Mode Register (ADC12B only) */
+
+/* ADC register adresses ***************************************************************/
+
+#define SAM_ADC12B_CR              (SAM_ADC12B_BASE+SAM_ADC_CR_OFFSET)
+#define SAM_ADC12B_MR              (SAM_ADC12B_BASE+SAM_ADC_MR_OFFSET)
+#define SAM_ADC12B_CHER            (SAM_ADC12B_BASE+SAM_ADC_CHER_OFFSET)
+#define SAM_ADC12B_CHDR            (SAM_ADC12B_BASE+SAM_ADC_CHDR_OFFSET)
+#define SAM_ADC12B_CHSR            (SAM_ADC12B_BASE+SAM_ADC_CHSR_OFFSET)
+#define SAM_ADC12B_SR              (SAM_ADC12B_BASE+SAM_ADC_SR_OFFSET)
+#define SAM_ADC12B_LCDR_           (SAM_ADC12B_BASE+SAM_ADC_LCDR_OFFSET)
+#define SAM_ADC12B_IER             (SAM_ADC12B_BASE+SAM_ADC_IER_OFFSET)
+#define SAM_ADC12B_IDR             (SAM_ADC12B_BASE+SAM_ADC_IDR_OFFSET)
+#define SAM_ADC12B_IMR             (SAM_ADC12B_BASE+SAM_ADC_IMR_OFFSET)
+#define SAM_ADC12B_CDR(n))         (SAM_ADC12B_BASE+SAM_ADC_CDR_OFFSET(n))
+#define SAM_ADC12B_CDR0            (SAM_ADC12B_BASE+SAM_ADC_CDR0_OFFSET)
+#define SAM_ADC12B_CDR1            (SAM_ADC12B_BASE+SAM_ADC_CDR1_OFFSET)
+#define SAM_ADC12B_CDR2            (SAM_ADC12B_BASE+SAM_ADC_CDR2_OFFSET)
+#define SAM_ADC12B_CDR3            (SAM_ADC12B_BASE+SAM_ADC_CDR3_OFFSET)
+#define SAM_ADC12B_CDR4            (SAM_ADC12B_BASE+SAM_ADC_CDR4_OFFSET)
+#define SAM_ADC12B_CDR5            (SAM_ADC12B_BASE+SAM_ADC_CDR5_OFFSET)
+#define SAM_ADC12B_CDR6            (SAM_ADC12B_BASE+SAM_ADC_CDR6_OFFSET)
+#define SAM_ADC12B_CDR7            (SAM_ADC12B_BASE+SAM_ADC_CDR7_OFFSET)
+#define SAM_ADC12B_ACR             (SAM_ADC12B_BASE+SAM_ADC12B_ACR_OFFSET)
+#define SAM_ADC12B_EMR             (SAM_ADC12B_BASE+SAM_ADC12B_EMR_OFFSET)
+
+#define SAM_ADC_CR                 (SAM_ADC_BASE+SAM_ADC_CR_OFFSET)
+#define SAM_ADC_MR                 (SAM_ADC_BASE+SAM_ADC_MR_OFFSET)
+#define SAM_ADC_CHER               (SAM_ADC_BASE+SAM_ADC_CHER_OFFSET)
+#define SAM_ADC_CHDR               (SAM_ADC_BASE+SAM_ADC_CHDR_OFFSET)
+#define SAM_ADC_CHSR               (SAM_ADC_BASE+SAM_ADC_CHSR_OFFSET)
+#define SAM_ADC_SR                 (SAM_ADC_BASE+SAM_ADC_SR_OFFSET)
+#define SAM_ADC_LCDR               (SAM_ADC_BASE+SAM_ADC_LCDR_OFFSET)
+#define SAM_ADC_IER                (SAM_ADC_BASE+SAM_ADC_IER_OFFSET)
+#define SAM_ADC_IDR                (SAM_ADC_BASE+SAM_ADC_IDR_OFFSET)
+#define SAM_ADC_IMR                (SAM_ADC_BASE+SAM_ADC_IMR_OFFSET)
+#define SAM_ADC_CDR(n))            (SAM_ADC_BASE+SAM_ADC_CDR_OFFSET(n))
+#define SAM_ADC_CDR0               (SAM_ADC_BASE+SAM_ADC_CDR0_OFFSET)
+#define SAM_ADC_CDR1               (SAM_ADC_BASE+SAM_ADC_CDR1_OFFSET)
+#define SAM_ADC_CDR2               (SAM_ADC_BASE+SAM_ADC_CDR2_OFFSET)
+#define SAM_ADC_CDR3               (SAM_ADC_BASE+SAM_ADC_CDR3_OFFSET)
+#define SAM_ADC_CDR4               (SAM_ADC_BASE+SAM_ADC_CDR4_OFFSET)
+#define SAM_ADC_CDR5               (SAM_ADC_BASE+SAM_ADC_CDR5_OFFSET)
+#define SAM_ADC_CDR6               (SAM_ADC_BASE+SAM_ADC_CDR6_OFFSET)
+#define SAM_ADC_CDR7               (SAM_ADC_BASE+SAM_ADC_CDR7_OFFSET)
+
+/* ADC register bit definitions ********************************************************/
+
+/* ADC12B Control Register and ADC(10B) Control Register common bit-field definitions */
+
+#define ADC_CR_SWRST               (1 << 0)  /* Bit 0:  Software Reset */
+#define ADC_CR_START               (1 << 1)  /* Bit 1:  Start Conversion */
+
+/* ADC12B Mode Register and ADC(10B) Mode Register common bit-field definitions */
+
+#define ADC_MR_TRGEN               (1 << 0)  /* Bit 0:  Trigger Enable */
+#define ADC_MR_TRGSEL_SHIFT        (1)       /* Bits 1-3: Trigger Selection */
+#define ADC_MR_TRGSEL_MASK         (7 << ADC_MR_TRGSEL_SHIFT)
+#define ADC_MR_LOWRES              (1 << 4)  /* Bit 4:  Resolution */
+#define ADC_MR_SLEEP               (1 << 5)  /* Bit 5:  Sleep Mode */
+#define ADC_MR_PRESCAL_SHIFT       (8)       /* Bits 8-15: Prescaler Rate Selection */
+#define ADC_MR_PRESCAL_MASK        (0xff << ADC_MR_PRESCAL_SHIFT)
+#define ADB12B_MRSTARTUP_SHIFT     (16)      /* Bits 16-23: Start Up Time (ADC12B) */
+#define ADB12B_MRSTARTUP_MASK      (0xff << ADB12B_MRSTARTUP_SHIFT
+#define ADB10B_MRSTARTUP_SHIFT     (16)      /* Bits 16-22: Start Up Time (ADC10B) */
+#define ADB10B_MRSTARTUP_MASK      (0x7f << ADB10B_MRSTARTUP_SHIFT)
+#define ADC_MR_SHTIM_SHIFT         (24)      /* Bits 24-27: Sample & Hold Time */
+#define ADC_MR_SHTIM_MASK          (15 << ADC_MR_SHTIM_SHIFT)
+
+/* ADC12B Channel Enable Register, ADC12B Channel Disable Register, ADC12B Channel
+ * Status Register, ADC(10B) Channel Enable Register, ADC(10B) Channel Disable Register,
+ * and ADC(10B) Channel Status Register common bit-field definitions
+ */
+
+#define ADC_CH(n)                  (1 << (n))
+#define ADC_CH0                    (1 << 0)  /* Bit 0:  Channel x Enable */
+#define ADC_CH1                    (1 << 1)  /* Bit 1:  Channel x Enable */
+#define ADC_CH2                    (1 << 2)  /* Bit 2:  Channel x Enable */
+#define ADC_CH3                    (1 << 3)  /* Bit 3:  Channel x Enable */
+#define ADC_CH4                    (1 << 4)  /* Bit 4:  Channel x Enable */
+#define ADC_CH5                    (1 << 5)  /* Bit 5:  Channel x Enable */
+#define ADC_CH6                    (1 << 6)  /* Bit 6:  Channel x Enable */
+#define ADC_CH7                    (1 << 7)  /* Bit 7:  Channel x Enable */
+
+/* ADC12B Analog Control Register (ADC12B only) */
+
+#define ADC12B_ACR_GAIN_SHIFT      (0)       /* Bits 0-1: Input Gain */
+#define ADC12B_ACR_GAIN_MASK       (3 << ADC12B_ACR_GAIN_SHIFT)
+#define ADC12B_ACR_IBCTL_SHIFT     (8)       /* Bits 8-9: Bias Current Control */
+#define ADC12B_ACR_IBCTL_MASK      (3 << ADC12B_ACR_IBCTL_SHIFT)
+#define ADC12B_ACR_DIFF            (1 << 16) /* Bit 16: Differential Mode */
+#define ADC12B_ACR_OFFSET          (1 << 17) /* Bit 17: Input OFFSET */
+
+/* ADC12B Extended Mode Register (ADC12B only) */
+
+#define ADC12B_EMR_OFFMODES        (1 << 0)  /* Bit 0:  Off Mode if Sleep Bit (ADC12B_MR) = 1 */
+#define ADC12B_EMR_OFFMSTIME_SHIFT (16)      /* Bits 16-23: Startup Time */
+#define ADC12B_EMR_OFFMSTIME_MASK  (0xff << ADC12B_EMR_OFFMSTIME_SHIFT)
+
+/* ADC12B Status Register , ADC12B Interrupt Enable Register, ADC12B Interrupt
+ * Disable Register, ADC12B Interrupt Mask Register, ADC(10B) Status Register,
+ * ADC(10B) Interrupt Enable Register, ADC(10B) Interrupt Disable Register, and
+ * ADC(10B) Interrupt Mask Register common bit-field definitions
+ */
+
+#define ADC_INT_EOC(n)             (1<<(n))
+#define ADC_INT_EOC0               (1 << 0)  /* Bit 0:  End of Conversion 0 */
+#define ADC_INT_EOC1               (1 << 1)  /* Bit 1:  End of Conversion 1 */
+#define ADC_INT_EOC2               (1 << 2)  /* Bit 2:  End of Conversion 2 */
+#define ADC_INT_EOC3               (1 << 3)  /* Bit 3:  End of Conversion 3 */
+#define ADC_INT_EOC4               (1 << 4)  /* Bit 4:  End of Conversion 4 */
+#define ADC_INT_EOC5               (1 << 5)  /* Bit 5:  End of Conversion 5 */
+#define ADC_INT_EOC6               (1 << 6)  /* Bit 6:  End of Conversion 6 */
+#define ADC_INT_EOC7               (1 << 7)  /* Bit 0:  End of Conversion 7 */
+#define ADC_INT_OVRE(n)            (1<<((n)+8))
+#define ADC_INT_OVRE0              (1 << 8)  /* Bit 8:  Overrun Error 0 */
+#define ADC_INT_OVRE1              (1 << 9)  /* Bit 9:  Overrun Error 1 */
+#define ADC_INT_OVRE2              (1 << 10) /* Bit 10: Overrun Error 2 */
+#define ADC_INT_OVRE3              (1 << 11) /* Bit 11: Overrun Error 3 */
+#define ADC_INT_OVRE4              (1 << 12) /* Bit 12: Overrun Error 4 */
+#define ADC_INT_OVRE5              (1 << 13) /* Bit 13: Overrun Error 5 */
+#define ADC_INT_OVRE6              (1 << 14) /* Bit 14: Overrun Error 6 */
+#define ADC_INT_OVRE7              (1 << 15) /* Bit 15: Overrun Error 7 */
+#define ADC_INT_DRDY               (1 << 16) /* Bit 16: Data Ready */
+#define ADC_INT_GOVRE              (1 << 17) /* Bit 17: General Overrun Error */
+#define ADC_INT_ENDRX              (1 << 18) /* Bit 18: End of RX Buffer */
+#define ADC_INT_RXBUFF             (1 << 19) /* Bit 19: RX Buffer Full */
+
+/* ADC12B Last Converted Data Register */
+
+#define ADC12B_LCDR_DATA_SHIFT     (0)       /* Bits 0-11: Last Data Converted */
+#define ADC12B_LCDR_DATA_MASK      (0xfff << ADC12B_LCDR_DATA_SHIFT)
+
+/* ADC(10B) Last Converted Data Register */
+
+#define ADC10B_LCDR_DATA_SHIFT     (0)       /* Bits 0-9: Last Data Converted */
+#define ADC10B_LCDR_DATA_MASK      (0x1ff << ADC10B_LCDR_DATA_SHIFT)
+
+/* ADC12B Channel Data Register */
+
+#define ADC12B_CDR_DATA_SHIFT      (0)       /* Bits 0-11: Converted Data */
+#define ADC12B_CDR_DATA_MASK       (0xfff << ADC12B_CDR_DATA_SHIFT)
+
+/* ADC(10B) Channel Data Register */
+
+#define ADC10B_CDR_DATA_SHIFT      (0)       /* Bits 0-9: Converted Data */
+#define ADC10B_CDR_DATA_MASK       (0x1ff << ADC10B_CDR_DATA_SHIFT)
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Data
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Functions
+ ****************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM_CHIP_SAM_ADC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_chipid.h b/nuttx/arch/arm/src/sam34/chip/sam_chipid.h
index 03071d77a..1c1e972b7 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_chipid.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_chipid.h
@@ -1,7 +1,7 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/sam3u_chipid.h
+ * arch/arm/src/sam34/chip/sam_chipid.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_CHIPID_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_CHIPID_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "sam3u_memorymap.h"
+#include "chip/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -51,13 +51,13 @@
 
 /* CHIPID register offsets **************************************************************/
 
-#define SAM3U_CHIPID_CIDR      0x00 /* Chip ID Register */
-#define SAM3U_CHIPID_EXID      0x04 /* Chip ID Extension Register */
+#define SAM_CHIPID_CIDR      0x00 /* Chip ID Register */
+#define SAM_CHIPID_EXID      0x04 /* Chip ID Extension Register */
 
 /* CHIPID register adresses *************************************************************/
 
-#define SAM3U_CHIPID_CIDR      (SAM3U_CHIPID_BASE+SAM3U_CHIPID_CIDR)
-#define SAM3U_CHIPID_EXID      (SAM3U_CHIPID_BASE+SAM3U_CHIPID_EXID)
+#define SAM_CHIPID_CIDR      (SAM_CHIPID_BASE+SAM_CHIPID_CIDR)
+#define SAM_CHIPID_EXID      (SAM_CHIPID_BASE+SAM_CHIPID_EXID)
 
 /* CHIPID register bit definitions ******************************************************/
 
@@ -164,4 +164,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_CHIPID_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_CHIPID_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_dmac.h b/nuttx/arch/arm/src/sam34/chip/sam_dmac.h
index 9edf61df7..388383b1e 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_dmac.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_dmac.h
@@ -1,7 +1,7 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/sam3u_dmac.h
+ * arch/arm/src/sam34/chip/sam_dmac.h
  *
- *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_DMAC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_DMAC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "sam3u_memorymap.h"
+#include "chip/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -53,97 +53,96 @@
 
 /* Global Registers */
 
-#define SAM3U_DMAC_GCFG_OFFSET          0x00 /* DMAC Global Configuration Register */
-#define SAM3U_DMAC_EN_OFFSET            0x04 /* DMAC Enable Register */
-#define SAM3U_DMAC_SREQ_OFFSET          0x08 /* DMAC Software Single Request Register */
-#define SAM3U_DMAC_CREQ_OFFSET          0x0c /* DMAC Software Chunk Transfer Request Register */
-#define SAM3U_DMAC_LAST_OFFSET          0x10 /* DMAC Software Last Transfer Flag Register */
-                                             /* 0x014-0x18: Reserved */
-#define SAM3U_DMAC_EBCIER_OFFSET        0x18 /* DMAC Error Enable */
-#define SAM3U_DMAC_EBCIDR_OFFSET        0x1C /* DMAC Error Disable */
-#define SAM3U_DMAC_EBCIMR_OFFSET        0x20 /* DMAC Error Mask */
-#define SAM3U_DMAC_EBCISR_OFFSET        0x24 /* DMAC Error Status */
-#define SAM3U_DMAC_CHER_OFFSET          0x28 /* DMAC Channel Handler Enable Register */
-#define SAM3U_DMAC_CHDR_OFFSET          0x2c /* DMAC Channel Handler Disable Register */
-#define SAM3U_DMAC_CHSR_OFFSET          0x30 /* DMAC Channel Handler Status Register */
-                                             /* 0x034-0x38: Reserved */
+#define SAM_DMAC_GCFG_OFFSET           0x00 /* DMAC Global Configuration Register */
+#define SAM_DMAC_EN_OFFSET             0x04 /* DMAC Enable Register */
+#define SAM_DMAC_SREQ_OFFSET           0x08 /* DMAC Software Single Request Register */
+#define SAM_DMAC_CREQ_OFFSET           0x0c /* DMAC Software Chunk Transfer Request Register */
+#define SAM_DMAC_LAST_OFFSET           0x10 /* DMAC Software Last Transfer Flag Register */
+                                            /* 0x014-0x18: Reserved */
+#define SAM_DMAC_EBCIER_OFFSET         0x18 /* DMAC Error Enable */
+#define SAM_DMAC_EBCIDR_OFFSET         0x1C /* DMAC Error Disable */
+#define SAM_DMAC_EBCIMR_OFFSET         0x20 /* DMAC Error Mask */
+#define SAM_DMAC_EBCISR_OFFSET         0x24 /* DMAC Error Status */
+#define SAM_DMAC_CHER_OFFSET           0x28 /* DMAC Channel Handler Enable Register */
+#define SAM_DMAC_CHDR_OFFSET           0x2c /* DMAC Channel Handler Disable Register */
+#define SAM_DMAC_CHSR_OFFSET           0x30 /* DMAC Channel Handler Status Register */
+                                            /* 0x034-0x38: Reserved */
 /* DMA channel registers */
 
-#define SAM3U_DMACHAN_OFFSET(n)         (0x3c+((n)*0x28))
-#define SAM3U_DMACHAN0_OFFSET           0x3c /* 0x3c-0x60: Channel 0 */
-#define SAM3U_DMACHAN1_OFFSET           0x64 /* 0x64-0x88: Channel 1 */
-#define SAM3U_DMACHAN2_OFFSET           0x8c /* 0x8c-0xb0: Channel 2 */
-#define SAM3U_DMACHAN3_OFFSET           0xb4 /* 0xb4-0xd8: Channel 3 */
-
-#define SAM3U_DMACHAN_SADDR_OFFSET      0x00 /* DMAC Channel Source Address Register */
-#define SAM3U_DMACHAN_DADDR_OFFSET      0x04 /* DMAC Channel Destination Address Register */
-#define SAM3U_DMACHAN_DSCR_OFFSET       0x08 /* DMAC Channel Descriptor Address Register */
-#define SAM3U_DMACHAN_CTRLA_OFFSET      0x0c /* DMAC Channel Control A Register */
-#define SAM3U_DMACHAN_CTRLB_OFFSET      0x10 /* DMAC Channel Control B Register */
-#define SAM3U_DMACHAN_CFG_OFFSET        0x14 /* DMAC Channel Configuration Register */
-                                             /* 0x18-0x24: Reserved */
-
-                                             /* 0x017c-0x1fc: Reserved */
+#define SAM_DMACHAN_OFFSET(n)          (0x3c+((n)*0x28))
+#define SAM_DMACHAN0_OFFSET            0x3c /* 0x3c-0x60: Channel 0 */
+#define SAM_DMACHAN1_OFFSET            0x64 /* 0x64-0x88: Channel 1 */
+#define SAM_DMACHAN2_OFFSET            0x8c /* 0x8c-0xb0: Channel 2 */
+#define SAM_DMACHAN3_OFFSET            0xb4 /* 0xb4-0xd8: Channel 3 */
+
+#define SAM_DMACHAN_SADDR_OFFSET       0x00 /* DMAC Channel Source Address Register */
+#define SAM_DMACHAN_DADDR_OFFSET       0x04 /* DMAC Channel Destination Address Register */
+#define SAM_DMACHAN_DSCR_OFFSET        0x08 /* DMAC Channel Descriptor Address Register */
+#define SAM_DMACHAN_CTRLA_OFFSET       0x0c /* DMAC Channel Control A Register */
+#define SAM_DMACHAN_CTRLB_OFFSET       0x10 /* DMAC Channel Control B Register */
+#define SAM_DMACHAN_CFG_OFFSET         0x14 /* DMAC Channel Configuration Register */
+                                            /* 0x18-0x24: Reserved */
+                                            /* 0x017c-0x1fc: Reserved */
 
 /* DMAC register adresses ***************************************************************/
 
 /* Global Registers */
 
-#define SAM3U_DMAC_GCFG                (SAM3U_DMAC_BASE+SAM3U_DMAC_GCFG_OFFSET)
-#define SAM3U_DMAC_EN                  (SAM3U_DMAC_BASE+SAM3U_DMAC_EN_OFFSET)
-#define SAM3U_DMAC_SREQ                (SAM3U_DMAC_BASE+SAM3U_DMAC_SREQ_OFFSET)
-#define SAM3U_DMAC_CREQ                (SAM3U_DMAC_BASE+SAM3U_DMAC_CREQ_OFFSET)
-#define SAM3U_DMAC_LAST                (SAM3U_DMAC_BASE+SAM3U_DMAC_LAST_OFFSET)
-#define SAM3U_DMAC_EBCIER              (SAM3U_DMAC_BASE+SAM3U_DMAC_EBCIER_OFFSET)
-#define SAM3U_DMAC_EBCIDR              (SAM3U_DMAC_BASE+SAM3U_DMAC_EBCIDR_OFFSET)
-#define SAM3U_DMAC_EBCIMR              (SAM3U_DMAC_BASE+SAM3U_DMAC_EBCIMR_OFFSET)
-#define SAM3U_DMAC_EBCISR              (SAM3U_DMAC_BASE+SAM3U_DMAC_EBCISR_OFFSET)
-#define SAM3U_DMAC_CHER                (SAM3U_DMAC_BASE+SAM3U_DMAC_CHER_OFFSET)
-#define SAM3U_DMAC_CHDR                (SAM3U_DMAC_BASE+SAM3U_DMAC_CHDR_OFFSET)
-#define SAM3U_DMAC_CHSR                (SAM3U_DMAC_BASE+SAM3U_DMAC_CHSR_OFFSET)
+#define SAM_DMAC_GCFG                  (SAM_DMAC_BASE+SAM_DMAC_GCFG_OFFSET)
+#define SAM_DMAC_EN                    (SAM_DMAC_BASE+SAM_DMAC_EN_OFFSET)
+#define SAM_DMAC_SREQ                  (SAM_DMAC_BASE+SAM_DMAC_SREQ_OFFSET)
+#define SAM_DMAC_CREQ                  (SAM_DMAC_BASE+SAM_DMAC_CREQ_OFFSET)
+#define SAM_DMAC_LAST                  (SAM_DMAC_BASE+SAM_DMAC_LAST_OFFSET)
+#define SAM_DMAC_EBCIER                (SAM_DMAC_BASE+SAM_DMAC_EBCIER_OFFSET)
+#define SAM_DMAC_EBCIDR                (SAM_DMAC_BASE+SAM_DMAC_EBCIDR_OFFSET)
+#define SAM_DMAC_EBCIMR                (SAM_DMAC_BASE+SAM_DMAC_EBCIMR_OFFSET)
+#define SAM_DMAC_EBCISR                (SAM_DMAC_BASE+SAM_DMAC_EBCISR_OFFSET)
+#define SAM_DMAC_CHER                  (SAM_DMAC_BASE+SAM_DMAC_CHER_OFFSET)
+#define SAM_DMAC_CHDR                  (SAM_DMAC_BASE+SAM_DMAC_CHDR_OFFSET)
+#define SAM_DMAC_CHSR                  (SAM_DMAC_BASE+SAM_DMAC_CHSR_OFFSET)
 
 /* DMA channel registers */
 
-#define SAM3U_DMACHAN_BASE(n)          (SAM3U_DMAC_BASE+SAM3U_DMACHAN_OFFSET(n))
-#define SAM3U_DMACHAN0_BASE            (SAM3U_DMAC_BASE+SAM3U_DMACHAN0_OFFSET)
-#define SAM3U_DMACHAN1_BASE            (SAM3U_DMAC_BASE+SAM3U_DMACHAN1_OFFSET)
-#define SAM3U_DMACHAN2_BASE            (SAM3U_DMAC_BASE+SAM3U_DMACHAN2_OFFSET)
-#define SAM3U_DMACHAN3_BASE            (SAM3U_DMAC_BASE+SAM3U_DMACHAN3_OFFSET)
-
-#define SAM3U_DMACHAN_SADDR(n)         (SAM3U_DMACHAN_BASE(n)+SAM3U_DMACHAN_SADDR_OFFSET)
-#define SAM3U_DMACHAN_DADDR(n)         (SAM3U_DMACHAN_BASE(n)+SAM3U_DMACHAN_DADDR_OFFSET)
-#define SAM3U_DMACHAN_DSCR(n)          (SAM3U_DMACHAN_BASE(n)+SAM3U_DMACHAN_DSCR_OFFSET)
-#define SAM3U_DMACHAN_CTRLA(n)         (SAM3U_DMACHAN_BASE(n)+SAM3U_DMACHAN_CTRLA_OFFSET)
-#define SAM3U_DMACHAN_CTRLB(n)         (SAM3U_DMACHAN_BASE(n)+SAM3U_DMACHAN_CTRLB_OFFSET)
-#define SAM3U_DMACHAN_CFG(n)           (SAM3U_DMACHAN_BASE(n)+SAM3U_DMACHAN_CFG_OFFSET)
-
-#define SAM3U_DMACHAN0_SADDR           (SAM3U_DMACHAN0_BASE+SAM3U_DMACHAN_SADDR_OFFSET)
-#define SAM3U_DMACHAN0_DADDR           (SAM3U_DMACHAN0_BASE+SAM3U_DMACHAN_DADDR_OFFSET)
-#define SAM3U_DMACHAN0_DSCR            (SAM3U_DMACHAN0_BASE+SAM3U_DMACHAN_DSCR_OFFSET)
-#define SAM3U_DMACHAN0_CTRLA           (SAM3U_DMACHAN0_BASE+SAM3U_DMACHAN_CTRLA_OFFSET)
-#define SAM3U_DMACHAN0_CTRLB           (SAM3U_DMACHAN0_BASE+SAM3U_DMACHAN_CTRLB_OFFSET)
-#define SAM3U_DMACHAN0_CFG             (SAM3U_DMACHAN0_BASE+SAM3U_DMACHAN_CFG_OFFSET)
-
-#define SAM3U_DMACHAN1_SADDR           (SAM3U_DMACHAN1_BASE+SAM3U_DMACHAN_SADDR_OFFSET)
-#define SAM3U_DMACHAN1_DADDR           (SAM3U_DMACHAN1_BASE+SAM3U_DMACHAN_DADDR_OFFSET)
-#define SAM3U_DMACHAN1_DSCR            (SAM3U_DMACHAN1_BASE+SAM3U_DMACHAN_DSCR_OFFSET)
-#define SAM3U_DMACHAN1_CTRLA           (SAM3U_DMACHAN1_BASE+SAM3U_DMACHAN_CTRLA_OFFSET)
-#define SAM3U_DMACHAN1_CTRLB           (SAM3U_DMACHAN1_BASE+SAM3U_DMACHAN_CTRLB_OFFSET)
-#define SAM3U_DMACHAN1_CFG             (SAM3U_DMACHAN1_BASE+SAM3U_DMACHAN_CFG_OFFSET)
-
-#define SAM3U_DMACHAN2_SADDR           (SAM3U_DMACHAN2_BASE+SAM3U_DMACHAN_SADDR_OFFSET)
-#define SAM3U_DMACHAN2_DADDR           (SAM3U_DMACHAN2_BASE+SAM3U_DMACHAN_DADDR_OFFSET)
-#define SAM3U_DMACHAN2_DSCR            (SAM3U_DMACHAN2_BASE+SAM3U_DMACHAN_DSCR_OFFSET)
-#define SAM3U_DMACHAN2_CTRLA           (SAM3U_DMACHAN2_BASE+SAM3U_DMACHAN_CTRLA_OFFSET)
-#define SAM3U_DMACHAN2_CTRLB           (SAM3U_DMACHAN2_BASE+SAM3U_DMACHAN_CTRLB_OFFSET)
-#define SAM3U_DMACHAN2_CFG             (SAM3U_DMACHAN2_BASE+SAM3U_DMACHAN_CFG_OFFSET)
-
-#define SAM3U_DMACHAN3_SADDR           (SAM3U_DMACHAN3_BASE+SAM3U_DMACHAN_SADDR_OFFSET)
-#define SAM3U_DMACHAN3_DADDR           (SAM3U_DMACHAN3_BASE+SAM3U_DMACHAN_DADDR_OFFSET)
-#define SAM3U_DMACHAN3_DSCR            (SAM3U_DMACHAN3_BASE+SAM3U_DMACHAN_DSCR_OFFSET)
-#define SAM3U_DMACHAN3_CTRLA           (SAM3U_DMACHAN3_BASE+SAM3U_DMACHAN_CTRLA_OFFSET)
-#define SAM3U_DMACHAN3_CTRLB           (SAM3U_DMACHAN3_BASE+SAM3U_DMACHAN_CTRLB_OFFSET)
-#define SAM3U_DMACHAN3_CFG             (SAM3U_DMACHAN3_BASE+SAM3U_DMACHAN_CFG_OFFSET)
+#define SAM_DMACHAN_BASE(n)            (SAM_DMAC_BASE+SAM_DMACHAN_OFFSET(n))
+#define SAM_DMACHAN0_BASE              (SAM_DMAC_BASE+SAM_DMACHAN0_OFFSET)
+#define SAM_DMACHAN1_BASE              (SAM_DMAC_BASE+SAM_DMACHAN1_OFFSET)
+#define SAM_DMACHAN2_BASE              (SAM_DMAC_BASE+SAM_DMACHAN2_OFFSET)
+#define SAM_DMACHAN3_BASE              (SAM_DMAC_BASE+SAM_DMACHAN3_OFFSET)
+
+#define SAM_DMACHAN_SADDR(n)           (SAM_DMACHAN_BASE(n)+SAM_DMACHAN_SADDR_OFFSET)
+#define SAM_DMACHAN_DADDR(n)           (SAM_DMACHAN_BASE(n)+SAM_DMACHAN_DADDR_OFFSET)
+#define SAM_DMACHAN_DSCR(n)            (SAM_DMACHAN_BASE(n)+SAM_DMACHAN_DSCR_OFFSET)
+#define SAM_DMACHAN_CTRLA(n)           (SAM_DMACHAN_BASE(n)+SAM_DMACHAN_CTRLA_OFFSET)
+#define SAM_DMACHAN_CTRLB(n)           (SAM_DMACHAN_BASE(n)+SAM_DMACHAN_CTRLB_OFFSET)
+#define SAM_DMACHAN_CFG(n)             (SAM_DMACHAN_BASE(n)+SAM_DMACHAN_CFG_OFFSET)
+
+#define SAM_DMACHAN0_SADDR             (SAM_DMACHAN0_BASE+SAM_DMACHAN_SADDR_OFFSET)
+#define SAM_DMACHAN0_DADDR             (SAM_DMACHAN0_BASE+SAM_DMACHAN_DADDR_OFFSET)
+#define SAM_DMACHAN0_DSCR              (SAM_DMACHAN0_BASE+SAM_DMACHAN_DSCR_OFFSET)
+#define SAM_DMACHAN0_CTRLA             (SAM_DMACHAN0_BASE+SAM_DMACHAN_CTRLA_OFFSET)
+#define SAM_DMACHAN0_CTRLB             (SAM_DMACHAN0_BASE+SAM_DMACHAN_CTRLB_OFFSET)
+#define SAM_DMACHAN0_CFG               (SAM_DMACHAN0_BASE+SAM_DMACHAN_CFG_OFFSET)
+
+#define SAM_DMACHAN1_SADDR             (SAM_DMACHAN1_BASE+SAM_DMACHAN_SADDR_OFFSET)
+#define SAM_DMACHAN1_DADDR             (SAM_DMACHAN1_BASE+SAM_DMACHAN_DADDR_OFFSET)
+#define SAM_DMACHAN1_DSCR              (SAM_DMACHAN1_BASE+SAM_DMACHAN_DSCR_OFFSET)
+#define SAM_DMACHAN1_CTRLA             (SAM_DMACHAN1_BASE+SAM_DMACHAN_CTRLA_OFFSET)
+#define SAM_DMACHAN1_CTRLB             (SAM_DMACHAN1_BASE+SAM_DMACHAN_CTRLB_OFFSET)
+#define SAM_DMACHAN1_CFG               (SAM_DMACHAN1_BASE+SAM_DMACHAN_CFG_OFFSET)
+
+#define SAM_DMACHAN2_SADDR             (SAM_DMACHAN2_BASE+SAM_DMACHAN_SADDR_OFFSET)
+#define SAM_DMACHAN2_DADDR             (SAM_DMACHAN2_BASE+SAM_DMACHAN_DADDR_OFFSET)
+#define SAM_DMACHAN2_DSCR              (SAM_DMACHAN2_BASE+SAM_DMACHAN_DSCR_OFFSET)
+#define SAM_DMACHAN2_CTRLA             (SAM_DMACHAN2_BASE+SAM_DMACHAN_CTRLA_OFFSET)
+#define SAM_DMACHAN2_CTRLB             (SAM_DMACHAN2_BASE+SAM_DMACHAN_CTRLB_OFFSET)
+#define SAM_DMACHAN2_CFG               (SAM_DMACHAN2_BASE+SAM_DMACHAN_CFG_OFFSET)
+
+#define SAM_DMACHAN3_SADDR             (SAM_DMACHAN3_BASE+SAM_DMACHAN_SADDR_OFFSET)
+#define SAM_DMACHAN3_DADDR             (SAM_DMACHAN3_BASE+SAM_DMACHAN_DADDR_OFFSET)
+#define SAM_DMACHAN3_DSCR              (SAM_DMACHAN3_BASE+SAM_DMACHAN_DSCR_OFFSET)
+#define SAM_DMACHAN3_CTRLA             (SAM_DMACHAN3_BASE+SAM_DMACHAN_CTRLA_OFFSET)
+#define SAM_DMACHAN3_CTRLB             (SAM_DMACHAN3_BASE+SAM_DMACHAN_CTRLB_OFFSET)
+#define SAM_DMACHAN3_CFG               (SAM_DMACHAN3_BASE+SAM_DMACHAN_CFG_OFFSET)
 
 /* DMAC register bit definitions ********************************************************/
 
@@ -198,16 +197,16 @@
 
 #define DMAC_CREQ_SCREQ_SHIFT          (0)      /* Bits 0, 2, 4, 6:   Request a source chunk transfer */
 #  define DMAC_CREQ_SCREQ(n)           (1 << (DMAC_CREQ_SCREQ_SHIFT+DMAC_CREQ_SHIFT(n)))
-#  define DMAC_CREQ_SCREQ0             (1 << (DMAC_CREQ_SCREQ_SHIFT+DMAC_CREQ0_SHIFT)
-#  define DMAC_CREQ_SCREQ1             (1 << (DMAC_CREQ_SCREQ_SHIFT+DMAC_CREQ1_SHIFT)
-#  define DMAC_CREQ_SCREQ2             (1 << (DMAC_CREQ_SCREQ_SHIFT+DMAC_CREQ2_SHIFT)
-#  define DMAC_CREQ_SCREQ3             (1 << (DMAC_CREQ_SCREQ_SHIFT+DMAC_CREQ3_SHIFT)
+#  define DMAC_CREQ_SCREQ0             (1 << (DMAC_CREQ_SCREQ_SHIFT+DMAC_CREQ0_SHIFT))
+#  define DMAC_CREQ_SCREQ1             (1 << (DMAC_CREQ_SCREQ_SHIFT+DMAC_CREQ1_SHIFT))
+#  define DMAC_CREQ_SCREQ2             (1 << (DMAC_CREQ_SCREQ_SHIFT+DMAC_CREQ2_SHIFT))
+#  define DMAC_CREQ_SCREQ3             (1 << (DMAC_CREQ_SCREQ_SHIFT+DMAC_CREQ3_SHIFT))
 #define DMAC_CREQ_DCREQ_SHIFT          (1)      /* Bits 1, 3, 5, 7:   Request a destination chunk transfer */
-#  define DMAC_CREQ_DCREQ(n)           (1 << (DMAC_CREQ_DCREQ_SHIFT+DMAC_CREQ_SHIFT(n))))
-#  define DMAC_CREQ_DCREQ0             (1 << (DMAC_CREQ_DCREQ_SHIFT+DMAC_CREQ0_SHIFT)
-#  define DMAC_CREQ_DCREQ1             (1 << (DMAC_CREQ_DCREQ_SHIFT+DMAC_CREQ1_SHIFT)
-#  define DMAC_CREQ_DCREQ2             (1 << (DMAC_CREQ_DCREQ_SHIFT+DMAC_CREQ2_SHIFT)
-#  define DMAC_CREQ_DCREQ3             (1 << (DMAC_CREQ_DCREQ_SHIFT+DMAC_CREQ3_SHIFT)
+#  define DMAC_CREQ_DCREQ(n)           (1 << (DMAC_CREQ_DCREQ_SHIFT+DMAC_CREQ_SHIFT(n)))
+#  define DMAC_CREQ_DCREQ0             (1 << (DMAC_CREQ_DCREQ_SHIFT+DMAC_CREQ0_SHIFT))
+#  define DMAC_CREQ_DCREQ1             (1 << (DMAC_CREQ_DCREQ_SHIFT+DMAC_CREQ1_SHIFT))
+#  define DMAC_CREQ_DCREQ2             (1 << (DMAC_CREQ_DCREQ_SHIFT+DMAC_CREQ2_SHIFT))
+#  define DMAC_CREQ_DCREQ3             (1 << (DMAC_CREQ_DCREQ_SHIFT+DMAC_CREQ3_SHIFT))
 
 /* DMAC Software Last Transfer Flag Register */
 
@@ -368,46 +367,46 @@
 
 /* DMAC Channel n [n = 0..3] Control B Register */
 
-#define DMACHAN_CTRLB_SRCDSCR         (1 << 16) /* Bit 16: Source buffer descriptor fetch operation disabled */
-#define DMACHAN_CTRLB_DSTDSCR         (1 << 20) /* Bit 20: Dest buffer descriptor fetch operation disabled */
-#define DMACHAN_CTRLB_FC_SHIFT        (21)      /* Bits 21-22:  Flow controller  */
-#define DMACHAN_CTRLB_FC_MASK         (3 << DMACHAN_CTRLB_FC_SHIFT)
-#  define DMACHAN_CTRLB_FC_M2M        (0 << DMACHAN_CTRLB_FC_SHIFT) /* Memory-to-Memory  */
-#  define DMACHAN_CTRLB_FC_M2P        (1 << DMACHAN_CTRLB_FC_SHIFT) /* Memory-to-Peripheral */
-#  define DMACHAN_CTRLB_FC_P2M        (2 << DMACHAN_CTRLB_FC_SHIFT) /* Peripheral-to-Memory  */
-#  define DMACHAN_CTRLB_FC_P2P        (3 << DMACHAN_CTRLB_FC_SHIFT) /* Peripheral-to-Peripheral */
-#define DMACHAN_CTRLB_SRCINCR_SHIFT   (24)      /* Bits 24-25 */
-#define DMACHAN_CTRLB_SRCINCR_MASK    (3 << DMACHAN_CTRLB_SRCINCR_SHIFT)
-#  define DMACHAN_CTRLB_SRCINCR_INCR  (0 << DMACHAN_CTRLB_SRCINCR_SHIFT) /* Incrementing address */
-#  define DMACHAN_CTRLB_SRCINCR_FIXED (2 << DMACHAN_CTRLB_SRCINCR_SHIFT) /* Fixed address */
-#define DMACHAN_CTRLB_DSTINCR_SHIFT   (28)      /* Bits 28-29 */  
-#define DMACHAN_CTRLB_DSTINCR_MASK    (3 << DMACHAN_CTRLB_DSTINCR_SHIFT)
-#  define DMACHAN_CTRLB_DSTINCR_INCR  (0 << DMACHAN_CTRLB_DSTINCR_SHIFT) /* Incrementing address */
-#  define DMACHAN_CTRLB_DSTINCR_FIXED (2 << DMACHAN_CTRLB_DSTINCR_SHIFT) /* Fixed address */
-#define DMACHAN_CTRLB_IEN             (1 << 30)  /* Bit 30:  Clear sets BTC[n] flag in EBCISR */
+#define DMACHAN_CTRLB_SRCDSCR          (1 << 16) /* Bit 16: Source buffer descriptor fetch operation disabled */
+#define DMACHAN_CTRLB_DSTDSCR          (1 << 20) /* Bit 20: Dest buffer descriptor fetch operation disabled */
+#define DMACHAN_CTRLB_FC_SHIFT         (21)      /* Bits 21-22:  Flow controller  */
+#define DMACHAN_CTRLB_FC_MASK          (3 << DMACHAN_CTRLB_FC_SHIFT)
+#  define DMACHAN_CTRLB_FC_M2M         (0 << DMACHAN_CTRLB_FC_SHIFT) /* Memory-to-Memory  */
+#  define DMACHAN_CTRLB_FC_M2P         (1 << DMACHAN_CTRLB_FC_SHIFT) /* Memory-to-Peripheral */
+#  define DMACHAN_CTRLB_FC_P2M         (2 << DMACHAN_CTRLB_FC_SHIFT) /* Peripheral-to-Memory  */
+#  define DMACHAN_CTRLB_FC_P2P         (3 << DMACHAN_CTRLB_FC_SHIFT) /* Peripheral-to-Peripheral */
+#define DMACHAN_CTRLB_SRCINCR_SHIFT    (24)      /* Bits 24-25 */
+#define DMACHAN_CTRLB_SRCINCR_MASK     (3 << DMACHAN_CTRLB_SRCINCR_SHIFT)
+#  define DMACHAN_CTRLB_SRCINCR_INCR   (0 << DMACHAN_CTRLB_SRCINCR_SHIFT) /* Incrementing address */
+#  define DMACHAN_CTRLB_SRCINCR_FIXED  (2 << DMACHAN_CTRLB_SRCINCR_SHIFT) /* Fixed address */
+#define DMACHAN_CTRLB_DSTINCR_SHIFT    (28)      /* Bits 28-29 */  
+#define DMACHAN_CTRLB_DSTINCR_MASK     (3 << DMACHAN_CTRLB_DSTINCR_SHIFT)
+#  define DMACHAN_CTRLB_DSTINCR_INCR   (0 << DMACHAN_CTRLB_DSTINCR_SHIFT) /* Incrementing address */
+#  define DMACHAN_CTRLB_DSTINCR_FIXED  (2 << DMACHAN_CTRLB_DSTINCR_SHIFT) /* Fixed address */
+#define DMACHAN_CTRLB_IEN              (1 << 30)  /* Bit 30:  Clear sets BTC[n] flag in EBCISR */
 
 /* DMAC Channel n [n = 0..3] Configuration Register */
 
-#define DMACHAN_CFG_SRCPER_SHIFT      (0)       /* Bits 0-3:  Channel source associated with peripheral ID */
-#define DMACHAN_CFG_SRCPER_MASK       (15 << DMACHAN_CFG_SRCPER_SHIFT)
-#define DMACHAN_CFG_DSTPER_SHIFT      (4)       /* Bits 4-7:  Channel dest associated with peripheral ID */
-#define DMACHAN_CFG_DSTPER_MASK       (15 << DMACHAN_CFG_DSTPER_SHIFT)
-#define DMACHAN_CFG_SRCH2SEL          (1 << 9)  /* Bit 9:  HW handshake triggers transfer */
-#define DMACHAN_CFG_DSTH2SEL          (1 << 13) /* Bit 13: HW handshake trigger transfer */
-#define DMACHAN_CFG_SOD               (1 << 16) /* Bit 16: Stop on done */
-#define DMACHAN_CFG_LOCKIF            (1 << 20) /* Bit 20: Enable lock interface capability */
-#define DMACHAN_CFG_LOCKB             (1 << 21) /* Bit 21: Enable AHB Bus Locking capability */
-#define DMACHAN_CFG_LOCKIFL           (1 << 22) /* Bit 22: Lock Master Interface Arbiter */
-#define DMACHAN_CFG_AHBPRO_SHIFT      (24)      /* Bits 24-26: Bus access privilege */
-#define DMACHAN_CFG_AHBPRO_MASK       (7 << DMACHAN_CFG_AHBPRO_SHIFT)
-#  define DMACHAN_CFG_AHBPRO_PRIV     (1 << DMACHAN_CFG_AHBPRO_SHIFT)
-#  define DMACHAN_CFG_AHBPRO_BUFF     (2 << DMACHAN_CFG_AHBPRO_SHIFT)
-#  define DMACHAN_CFG_AHBPRO_CACHE    (4 << DMACHAN_CFG_AHBPRO_SHIFT)
-#define DMACHAN_CFG_FIFOCFG_SHIFT     (28)      /* Bits 28-29 */
-#define DMACHAN_CFG_FIFOCFG_MASK      (3 << DMACHAN_CFG_FIFOCFG_SHIFT)
-#  define DMACHAN_CFG_FIFOCFG_LARGEST (0 << DMACHAN_CFG_FIFOCFG_SHIFT) /* Largest length AHB burst */
-#  define DMACHAN_CFG_FIFOCFG_HALF    (1 << DMACHAN_CFG_FIFOCFG_SHIFT) /* Half FIFO size */
-#  define DMACHAN_CFG_FIFOCFG_SINGLE  (2 << DMACHAN_CFG_FIFOCFG_SHIFT) /* Single AHB access */
+#define DMACHAN_CFG_SRCPER_SHIFT       (0)       /* Bits 0-3:  Channel source associated with peripheral ID */
+#define DMACHAN_CFG_SRCPER_MASK        (15 << DMACHAN_CFG_SRCPER_SHIFT)
+#define DMACHAN_CFG_DSTPER_SHIFT       (4)       /* Bits 4-7:  Channel dest associated with peripheral ID */
+#define DMACHAN_CFG_DSTPER_MASK        (15 << DMACHAN_CFG_DSTPER_SHIFT)
+#define DMACHAN_CFG_SRCH2SEL           (1 << 9)  /* Bit 9:  HW handshake triggers transfer */
+#define DMACHAN_CFG_DSTH2SEL           (1 << 13) /* Bit 13: HW handshake trigger transfer */
+#define DMACHAN_CFG_SOD                (1 << 16) /* Bit 16: Stop on done */
+#define DMACHAN_CFG_LOCKIF             (1 << 20) /* Bit 20: Enable lock interface capability */
+#define DMACHAN_CFG_LOCKB              (1 << 21) /* Bit 21: Enable AHB Bus Locking capability */
+#define DMACHAN_CFG_LOCKIFL            (1 << 22) /* Bit 22: Lock Master Interface Arbiter */
+#define DMACHAN_CFG_AHBPRO_SHIFT       (24)      /* Bits 24-26: Bus access privilege */
+#define DMACHAN_CFG_AHBPRO_MASK        (7 << DMACHAN_CFG_AHBPRO_SHIFT)
+#  define DMACHAN_CFG_AHBPRO_PRIV      (1 << DMACHAN_CFG_AHBPRO_SHIFT)
+#  define DMACHAN_CFG_AHBPRO_BUFF      (2 << DMACHAN_CFG_AHBPRO_SHIFT)
+#  define DMACHAN_CFG_AHBPRO_CACHE     (4 << DMACHAN_CFG_AHBPRO_SHIFT)
+#define DMACHAN_CFG_FIFOCFG_SHIFT      (28)      /* Bits 28-29 */
+#define DMACHAN_CFG_FIFOCFG_MASK       (3 << DMACHAN_CFG_FIFOCFG_SHIFT)
+#  define DMACHAN_CFG_FIFOCFG_LARGEST  (0 << DMACHAN_CFG_FIFOCFG_SHIFT) /* Largest length AHB burst */
+#  define DMACHAN_CFG_FIFOCFG_HALF     (1 << DMACHAN_CFG_FIFOCFG_SHIFT) /* Half FIFO size */
+#  define DMACHAN_CFG_FIFOCFG_SINGLE   (2 << DMACHAN_CFG_FIFOCFG_SHIFT) /* Single AHB access */
 
 /* DMA Peripheral IDs *******************************************************************/
 
@@ -438,4 +437,4 @@ struct dma_linklist_s
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_DMAC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_DMAC_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_eefc.h b/nuttx/arch/arm/src/sam34/chip/sam_eefc.h
new file mode 100644
index 000000000..546b6334c
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_eefc.h
@@ -0,0 +1,120 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_eefc.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM34_CHIP_SAM_EEFC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* EEFC register offsets ****************************************************************/
+
+#define SAM_EEFC_FMR_OFFSET          0x00 /* EEFC Flash Mode Register */
+#define SAM_EEFC_FCR_OFFSET          0x04 /* EEFC Flash Command Register */
+#define SAM_EEFC_FSR_OFFSET          0x08 /* EEFC Flash Status Register */
+#define SAM_EEFC_FRR_OFFSET          0x0c /* EEFC Flash Result Register */
+
+/* EEFC register adresses ***************************************************************/
+
+#define SAM_EEFC_FMR(n)              (SAM_EEFCN_BASE(n)+SAM_EEFC_FMR_OFFSET)
+#define SAM_EEFC_FCR(n)              (SAM_EEFCN_BASE(n)+SAM_EEFC_FCR_OFFSET)
+#define SAM_EEFC_FSR(n)              (SAM_EEFCN_BASE(n)+SAM_EEFC_FSR_OFFSET)
+#define SAM_EEFC_FRR(n)              (SAM_EEFCN_BASE(n)+SAM_EEFC_FRR_OFFSET)
+
+#define SAM_EEFC0_FMR                (SAM_EEFC0_BASE+SAM_EEFC_FMR_OFFSET)
+#define SAM_EEFC0_FCR                (SAM_EEFC0_BASE+SAM_EEFC_FCR_OFFSET)
+#define SAM_EEFC0_FSR                (SAM_EEFC0_BASE+SAM_EEFC_FSR_OFFSET)
+#define SAM_EEFC0_FRR                (SAM_EEFC0_BASE+SAM_EEFC_FRR_OFFSET)
+
+#define SAM_EEFC1_FMR                (SAM_EEFC1_BASE+SAM_EEFC_FMR_OFFSET)
+#define SAM_EEFC1_FCR                (SAM_EEFC1_BASE+SAM_EEFC_FCR_OFFSET)
+#define SAM_EEFC1_FSR                (SAM_EEFC1_BASE+SAM_EEFC_FSR_OFFSET)
+#define SAM_EEFC1_FRR                (SAM_EEFC1_BASE+SAM_EEFC_FRR_OFFSET)
+
+/* EEFC register bit definitions ********************************************************/
+
+#define EEFC_FMR_FRDY                (1 << 0)  /* Bit 0:  Ready Interrupt Enable */
+#define EEFC_FMR_FWS_SHIFT           (8)       /* Bits 8-11:  Flash Wait State */
+#define EEFC_FMR_FWS_MASK            (15 << EEFC_FMR_FWS_SHIFT)
+#define EEFC_FMR_FAM                 (1 << 24) /* Bit 24: Flash Access Mode */
+
+#define EEFC_FCR_FCMD_SHIFT          (0)       /* Bits 0-7:  Flash Command */
+#define EEFC_FCR_FCMD_MASK           (0xff << EEFC_FCR_FCMD_SHIFT)
+#  define EEFC_FCR_FCMD_GETD         (0  << EEFC_FCR_FCMD_SHIFT) /* Get Flash Descriptor */
+#  define EEFC_FCR_FCMD_WP           (1  << EEFC_FCR_FCMD_SHIFT) /* Write page */
+#  define EEFC_FCR_FCMD_WPL          (2  << EEFC_FCR_FCMD_SHIFT) /* Write page and lock */
+#  define EEFC_FCR_FCMD_EWP          (3  << EEFC_FCR_FCMD_SHIFT) /* Erase page and write page */
+#  define EEFC_FCR_FCMD_EWPL         (4  << EEFC_FCR_FCMD_SHIFT) /* Erase page and write page then lock */
+#  define EEFC_FCR_FCMD_EA           (5  << EEFC_FCR_FCMD_SHIFT) /* Erase all */
+#  define EEFC_FCR_FCMD_SLB          (8  << EEFC_FCR_FCMD_SHIFT) /* Set Lock Bit */
+#  define EEFC_FCR_FCMD_CLB          (9  << EEFC_FCR_FCMD_SHIFT) /* Clear Lock Bit */
+#  define EEFC_FCR_FCMD_GLB          (10 << EEFC_FCR_FCMD_SHIFT) /* Get Lock Bit */
+#  define EEFC_FCR_FCMD_SGPB         (11 << EEFC_FCR_FCMD_SHIFT) /* Set GPNVM Bit */
+#  define EEFC_FCR_FCMD_CGPB         (12 << EEFC_FCR_FCMD_SHIFT) /* Clear GPNVM Bit */
+#  define EEFC_FCR_FCMD_GGPB         (13 << EEFC_FCR_FCMD_SHIFT) /* Get GPNVM Bit */
+#  define EEFC_FCR_FCMD_STUI         (14 << EEFC_FCR_FCMD_SHIFT) /* Start Read Unique Identifier */
+#  define EEFC_FCR_FCMD_SPUI         (15 << EEFC_FCR_FCMD_SHIFT) /* Stop Read Unique Identifier */
+#define EEFC_FCR_FARG_SHIFT          (8)       /* Bits 8-23:  Flash Command Argument */
+#define EEFC_FCR_FARG_MASK           (0xffff << EEFC_FCR_FARG_SHIFT)
+#define EEFC_FCR_FKEY_SHIFT          (24)      /* Bits 24-31:  Flash Writing Protection Key */
+#define EEFC_FCR_FKEY__MASK          (0xff << EEFC_FCR_FKEY_SHIFT)
+
+#define EEFC_FSR_FRDY                (1 << 0)  /* Bit 0:  Flash Ready Status */
+#define EEFC_FSR_FCMDE               (1 << 1)  /* Bit 1:  Flash Command Error Status */
+#define EEFC_FSR_FLOCKE              (1 << 2)  /* Bit 2:  Flash Lock Error Status */
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Data
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Functions
+ ****************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_EEFC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_gpbr.h b/nuttx/arch/arm/src/sam34/chip/sam_gpbr.h
index 7e9853180..f439be79a 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_gpbr.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_gpbr.h
@@ -1,7 +1,7 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/sam3u_gpbr.h
+ * arch/arm/src/sam34/chip/sam_gpbr.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_GPBR_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_GPBR_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "sam3u_memorymap.h"
+#include "chip/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -51,27 +51,27 @@
 
 /* GPBR register offsets ****************************************************************/
 
-#define SAM3U_GPBR_OFFSET(n)  ((n)<<2) /* General purpose back-up registers */
-#define SAM3U_GPBR0_OFFSET    0x00
-#define SAM3U_GPBR1_OFFSET    0x04
-#define SAM3U_GPBR2_OFFSET    0x08
-#define SAM3U_GPBR3_OFFSET    0x0c
-#define SAM3U_GPBR4_OFFSET    0x10
-#define SAM3U_GPBR5_OFFSET    0x14
-#define SAM3U_GPBR6_OFFSET    0x18
-#define SAM3U_GPBR7_OFFSET    0x1c
+#define SAM_GPBR_OFFSET(n)  ((n)<<2) /* General purpose back-up registers */
+#define SAM_GPBR0_OFFSET    0x00
+#define SAM_GPBR1_OFFSET    0x04
+#define SAM_GPBR2_OFFSET    0x08
+#define SAM_GPBR3_OFFSET    0x0c
+#define SAM_GPBR4_OFFSET    0x10
+#define SAM_GPBR5_OFFSET    0x14
+#define SAM_GPBR6_OFFSET    0x18
+#define SAM_GPBR7_OFFSET    0x1c
 
 /* GPBR register adresses ***************************************************************/
 
-#define SAM3U_GPBR(n))        (SAM3U_GPBR_BASE+SAM3U_GPBR_OFFSET(n))
-#define SAM3U_GPBR0           (SAM3U_GPBR_BASE+SAM3U_GPBR0_OFFSET)
-#define SAM3U_GPBR1           (SAM3U_GPBR_BASE+SAM3U_GPBR1_OFFSET)
-#define SAM3U_GPBR2           (SAM3U_GPBR_BASE+SAM3U_GPBR2_OFFSET)
-#define SAM3U_GPBR3           (SAM3U_GPBR_BASE+SAM3U_GPBR3_OFFSET)
-#define SAM3U_GPBR4           (SAM3U_GPBR_BASE+SAM3U_GPBR4_OFFSET)
-#define SAM3U_GPBR5           (SAM3U_GPBR_BASE+SAM3U_GPBR5_OFFSET)
-#define SAM3U_GPBR6           (SAM3U_GPBR_BASE+SAM3U_GPBR6_OFFSET)
-#define SAM3U_GPBR7           (SAM3U_GPBR_BASE+SAM3U_GPBR7_OFFSET)
+#define SAM_GPBR(n))        (SAM_GPBR_BASE+SAM_GPBR_OFFSET(n))
+#define SAM_GPBR0           (SAM_GPBR_BASE+SAM_GPBR0_OFFSET)
+#define SAM_GPBR1           (SAM_GPBR_BASE+SAM_GPBR1_OFFSET)
+#define SAM_GPBR2           (SAM_GPBR_BASE+SAM_GPBR2_OFFSET)
+#define SAM_GPBR3           (SAM_GPBR_BASE+SAM_GPBR3_OFFSET)
+#define SAM_GPBR4           (SAM_GPBR_BASE+SAM_GPBR4_OFFSET)
+#define SAM_GPBR5           (SAM_GPBR_BASE+SAM_GPBR5_OFFSET)
+#define SAM_GPBR6           (SAM_GPBR_BASE+SAM_GPBR6_OFFSET)
+#define SAM_GPBR7           (SAM_GPBR_BASE+SAM_GPBR7_OFFSET)
 
 /* GPBR register bit definitions ********************************************************/
 
@@ -87,4 +87,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_GPBR_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_GPBR_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_hsmci.h b/nuttx/arch/arm/src/sam34/chip/sam_hsmci.h
new file mode 100644
index 000000000..dfee208c3
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_hsmci.h
@@ -0,0 +1,297 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_hsmci.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM34_CHIP_SAM_HSMCI_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* HSMCI register offsets ***************************************************************/
+
+#define SAM_HSMCI_CR_OFFSET           0x0000 /* Control Register */
+#define SAM_HSMCI_MR_OFFSET           0x0004 /* Mode Register */
+#define SAM_HSMCI_DTOR_OFFSET         0x0008 /* Data Timeout Register */
+#define SAM_HSMCI_SDCR_OFFSET         0x000c /* SD/SDIO Card Register */
+#define SAM_HSMCI_ARGR_OFFSET         0x0010 /* Argument Register */
+#define SAM_HSMCI_CMDR_OFFSET         0x0014 /* Command Register */
+#define SAM_HSMCI_BLKR_OFFSET         0x0018 /* Block Register */
+#define SAM_HSMCI_CSTOR_OFFSET        0x001c /* Completion Signal Timeout Register */
+#define SAM_HSMCI_RSPR0_OFFSET        0x0020 /* Response Register 0 */
+#define SAM_HSMCI_RSPR1_OFFSET        0x0024 /* Response Register 1 */
+#define SAM_HSMCI_RSPR2_OFFSET        0x0028 /* Response Register 2 */
+#define SAM_HSMCI_RSPR3_OFFSET        0x002c /* Response Register 3 */
+#define SAM_HSMCI_RDR_OFFSET          0x0030 /* Receive Data Register */
+#define SAM_HSMCI_TDR_OFFSET          0x0034 /* Transmit Data Register  */
+                                             /* 0x0038-0x003c: Reserved */
+#define SAM_HSMCI_SR_OFFSET           0x0040 /* Status Register */
+#define SAM_HSMCI_IER_OFFSET          0x0044 /* Interrupt Enable Register */
+#define SAM_HSMCI_IDR_OFFSET          0x0048 /* Interrupt Disable Register */
+#define SAM_HSMCI_IMR_OFFSET          0x004c /* Interrupt Mask Register */
+#define SAM_HSMCI_DMA_OFFSET          0x0050 /* DMA Configuration Register */
+#define SAM_HSMCI_CFG_OFFSET          0x0054 /* Configuration Register */
+                                             /* 0x0058-0x00e0: Reserved */
+#define SAM_HSMCI_WPMR_OFFSET         0x00e4 /* Write Protection Mode Register */
+#define SAM_HSMCI_WPSR_OFFSET         0x00e8 /* Write Protection Status Register */
+                                             /* 0x00ec-0x00fc: Reserved */
+                                             /* 0x0100-0x0124: Reserved */
+#define SAM_HSMCI_FIFO_OFFSET         0x0200 /* 0x0200-0x3ffc FIFO Memory Aperture */
+
+/* HSMCI register adresses **************************************************************/
+
+#define SAM_HSMCI_CR                  (SAM_MCI_BASE+SAM_HSMCI_CR_OFFSET)
+#define SAM_HSMCI_MR                  (SAM_MCI_BASE+SAM_HSMCI_MR_OFFSET)
+#define SAM_HSMCI_DTOR                (SAM_MCI_BASE+SAM_HSMCI_DTOR_OFFSET)
+#define SAM_HSMCI_SDCR                (SAM_MCI_BASE+SAM_HSMCI_SDCR_OFFSET)
+#define SAM_HSMCI_ARGR                (SAM_MCI_BASE+SAM_HSMCI_ARGR_OFFSET)
+#define SAM_HSMCI_CMDR                (SAM_MCI_BASE+SAM_HSMCI_CMDR_OFFSET)
+#define SAM_HSMCI_BLKR                (SAM_MCI_BASE+SAM_HSMCI_BLKR_OFFSET)
+#define SAM_HSMCI_CSTOR               (SAM_MCI_BASE+SAM_HSMCI_CSTOR_OFFSET)
+#define SAM_HSMCI_RSPR0               (SAM_MCI_BASE+SAM_HSMCI_RSPR0_OFFSET)
+#define SAM_HSMCI_RSPR1               (SAM_MCI_BASE+SAM_HSMCI_RSPR1_OFFSET)
+#define SAM_HSMCI_RSPR2               (SAM_MCI_BASE+SAM_HSMCI_RSPR2_OFFSET)
+#define SAM_HSMCI_RSPR3               (SAM_MCI_BASE+SAM_HSMCI_RSPR3_OFFSET)
+#define SAM_HSMCI_RDR                 (SAM_MCI_BASE+SAM_HSMCI_RDR_OFFSET)
+#define SAM_HSMCI_TDR                 (SAM_MCI_BASE+SAM_HSMCI_TDR_OFFSET)
+#define SAM_HSMCI_SR                  (SAM_MCI_BASE+SAM_HSMCI_SR_OFFSET)
+#define SAM_HSMCI_IER                 (SAM_MCI_BASE+SAM_HSMCI_IER_OFFSET)
+#define SAM_HSMCI_IDR                 (SAM_MCI_BASE+SAM_HSMCI_IDR_OFFSET)
+#define SAM_HSMCI_IMR                 (SAM_MCI_BASE+SAM_HSMCI_IMR_OFFSET)
+#define SAM_HSMCI_DMA                 (SAM_MCI_BASE+SAM_HSMCI_DMA_OFFSET)
+#define SAM_HSMCI_CFG                 (SAM_MCI_BASE+SAM_HSMCI_CFG_OFFSET)
+#define SAM_HSMCI_WPMR                (SAM_MCI_BASE+SAM_HSMCI_WPMR_OFFSET)
+#define SAM_HSMCI_WPSR                (SAM_MCI_BASE+SAM_HSMCI_WPSR_OFFSET)
+#define SAM_HSMCI_FIFO                (SAM_MCI_BASE+SAM_HSMCI_FIFO_OFFSET)
+
+/* HSMCI register bit definitions *******************************************************/
+
+/* HSMCI Control Register */
+
+#define HSMCI_CR_MCIEN                (1 << 0)  /* Bit 0:  Multi-Media Interface Enable */
+#define HSMCI_CR_MCIDIS               (1 << 1)  /* Bit 1:  Multi-Media Interface Disable */
+#define HSMCI_CR_PWSEN                (1 << 2)  /* Bit 2:  Power Save Mode Enable */
+#define HSMCI_CR_PWSDIS               (1 << 3)  /* Bit 3:  Power Save Mode Disable */
+#define HSMCI_CR_SWRST                (1 << 7)  /* Bit 7:  Software Reset */
+
+/* HSMCI Mode Register */
+
+#define HSMCI_MR_CLKDIV_SHIFT         (0)       /* Bits 0-7: Clock Divider */
+#define HSMCI_MR_CLKDIV_MASK          (0xff << HSMCI_MR_CLKDIV_SHIFT)
+#define HSMCI_MR_PWSDIV_SHIFT         (8)       /* Bits 8-10: Power Saving Divider */
+#define HSMCI_MR_PWSDIV_MASK          (7 << HSMCI_MR_PWSDIV_SHIFT)
+#  define HSMCI_MR_PWSDIV_MAX         (7 << HSMCI_MR_PWSDIV_SHIFT)
+#define HSMCI_MR_RDPROOF              (1 << 11) /* Bit 11: Read Proof Enable */
+#define HSMCI_MR_WRPROOF              (1 << 12) /* Bit 12: Write Proof Enable */
+#define HSMCI_MR_FBYTE                (1 << 13) /* Bit 13: Force Byte Transfer */
+#define HSMCI_MR_PADV                 (1 << 14) /* Bit 14: Padding Value */
+#define HSMCI_MR_BLKLEN_SHIFT         (16)      /* Bits 16-31: Data Block Length */
+#define HSMCI_MR_BLKLEN_MASK          (0xffff << HSMCI_MR_BLKLEN_SHIFT)
+
+/* HSMCI Data Timeout Register */
+
+#define HSMCI_DTOR_DTOCYC_SHIFT       (0)       /* Bits 0-3: Data Timeout Cycle Number */
+#define HSMCI_DTOR_DTOCYC_MASK        (15 << HSMCI_DTOR_DTOCYC_SHIFT)
+#  define HSMCI_DTOR_DTOCYC_MAX       (15 << HSMCI_DTOR_DTOCYC_SHIFT)
+#define HSMCI_DTOR_DTOMUL_SHIFT       (4)       /* Bits 4-6: Data Timeout Multiplier */
+#define HSMCI_DTOR_DTOMUL_MASK        (7 << HSMCI_DTOR_DTOMUL_SHIFT)
+#  define HSMCI_DTOR_DTOMUL_1         (0 << HSMCI_DTOR_DTOMUL_SHIFT)
+#  define HSMCI_DTOR_DTOMUL_16        (1 << HSMCI_DTOR_DTOMUL_SHIFT)
+#  define HSMCI_DTOR_DTOMUL_128       (2 << HSMCI_DTOR_DTOMUL_SHIFT)
+#  define HSMCI_DTOR_DTOMUL_256       (3 << HSMCI_DTOR_DTOMUL_SHIFT)
+#  define HSMCI_DTOR_DTOMUL_1024      (4 << HSMCI_DTOR_DTOMUL_SHIFT)
+#  define HSMCI_DTOR_DTOMUL_4096      (5 << HSMCI_DTOR_DTOMUL_SHIFT)
+#  define HSMCI_DTOR_DTOMUL_65536     (6 << HSMCI_DTOR_DTOMUL_SHIFT)
+#  define HSMCI_DTOR_DTOMUL_1048576   (7 << HSMCI_DTOR_DTOMUL_SHIFT)
+#  define HSMCI_DTOR_DTOMUL_MAX       (7 << HSMCI_DTOR_DTOMUL_SHIFT)
+
+/* HSMCI SDCard/SDIO Register */
+
+#define HSMCI_SDCR_SDCSEL_SHIFT       (0)       /* Bits 0-1: SDCard/SDIO Slot */
+#define HSMCI_SDCR_SDCSEL_MASK        (3 << HSMCI_SDCR_SDCSEL_SHIFT)
+#  define HSMCI_SDCR_SDCSEL_SLOTA     (0 << HSMCI_SDCR_SDCSEL_SHIFT)
+#define HSMCI_SDCR_SDCBUS_SHIFT       (6)       /* Bits 6-7: SDCard/SDIO Bus Width */
+#define HSMCI_SDCR_SDCBUS_MASK        (3 << HSMCI_SDCR_SDCBUS_SHIFT)
+#  define HSMCI_SDCR_SDCBUS_1BIT      (0 << HSMCI_SDCR_SDCBUS_SHIFT)
+#  define HSMCI_SDCR_SDCBUS_4BIT      (2 << HSMCI_SDCR_SDCBUS_SHIFT)
+#  define HSMCI_SDCR_SDCBUS_8BIT      (3 << HSMCI_SDCR_SDCBUS_SHIFT)
+
+/* HSMCI Command Register */
+
+#define HSMCI_CMDR_CMDNB_SHIFT        (0)       /* Bits 0-5: Command Number */
+#define HSMCI_CMDR_CMDNB_MASK         (63 << HSMCI_CMDR_CMDNB_SHIFT)
+#define HSMCI_CMDR_RSPTYP_SHIFT       (6)       /* Bits 6-7: Response Type */
+#define HSMCI_CMDR_RSPTYP_MASK        (3 << HSMCI_CMDR_RSPTYP_SHIFT)
+#  define HSMCI_CMDR_RSPTYP_NONE      (0 << HSMCI_CMDR_RSPTYP_SHIFT) /* No response */
+#  define HSMCI_CMDR_RSPTYP_48BIT     (1 << HSMCI_CMDR_RSPTYP_SHIFT) /* 48-bit response */
+#  define HSMCI_CMDR_RSPTYP_136BIT    (2 << HSMCI_CMDR_RSPTYP_SHIFT) /* 136-bit response */
+#  define HSMCI_CMDR_RSPTYP_R1B       (3 << HSMCI_CMDR_RSPTYP_SHIFT) /* R1b response type */
+#define HSMCI_CMDR_SPCMD_SHIFT        (8)       /* Bits 8-10: Special Command */
+#define HSMCI_CMDR_SPCMD_MASK         (7 << HSMCI_CMDR_SPCMD_SHIFT)
+#  define HSMCI_CMDR_SPCMD_NORMAL     (0 << HSMCI_CMDR_SPCMD_SHIFT) /* Not a special CMD */
+#  define HSMCI_CMDR_SPCMD_INIT       (1 << HSMCI_CMDR_SPCMD_SHIFT) /* Initialization CMD */
+#  define HSMCI_CMDR_SPCMD_SYNC       (2 << HSMCI_CMDR_SPCMD_SHIFT) /* Synchronized CMD */
+#  define HSMCI_CMDR_SPCMD_CEATAC     (3 << HSMCI_CMDR_SPCMD_SHIFT) /* CE-ATA Completion Signal disable CMD */
+#  define HSMCI_CMDR_SPCMD_INTCMD     (4 << HSMCI_CMDR_SPCMD_SHIFT) /* Interrupt command */
+#  define HSMCI_CMDR_SPCMD_INTRESP    (5 << HSMCI_CMDR_SPCMD_SHIFT) /* Interrupt response */
+#  define HSMCI_CMDR_SPCMD_BOOTOP     (6 << HSMCI_CMDR_SPCMD_SHIFT) /* Boot Operation Request */
+#  define HSMCI_CMDR_SPCMD_BOOTEND    (7 << HSMCI_CMDR_SPCMD_SHIFT) /* End Boot Operation */
+#define HSMCI_CMDR_OPDCMD             (1 << 11) /* Bit 11: Open Drain Command */
+#define HSMCI_CMDR_MAXLAT             (1 << 12) /* Bit 12: Max Latency for Command to Response */
+#define HSMCI_CMDR_TRCMD_SHIFT        (16)      /* Bits 16-17: Transfer Command */
+#define HSMCI_CMDR_TRCMD_MASK         (3 << HSMCI_CMDR_TRCMD_SHIFT)
+#  define HSMCI_CMDR_TRCMD_NONE       (0 << HSMCI_CMDR_TRCMD_SHIFT) /* No data transfer */
+#  define HSMCI_CMDR_TRCMD_START      (1 << HSMCI_CMDR_TRCMD_SHIFT) /* Start data transfer */
+#  define HSMCI_CMDR_TRCMD_STOP       (2 << HSMCI_CMDR_TRCMD_SHIFT) /* Stop data transfer */
+#define HSMCI_CMDR_TRDIR              (1 << 18) /* Bit 18: Transfer Direction */
+#  define HSMCI_CMDR_TRDIR_WRITE      (0 << 18)
+#  define HSMCI_CMDR_TRDIR_READ       (1 << 18)
+#define HSMCI_CMDR_TRTYP_SHIFT        (19)      /* Bits 19-21: Transfer Type */
+#define HSMCI_CMDR_TRTYP_MASK         (7 << HSMCI_CMDR_TRTYP_SHIFT)
+#  define HSMCI_CMDR_TRTYP_SINGLE     (0 << HSMCI_CMDR_TRTYP_SHIFT) /* MMC/SDCard Single Block */
+#  define HSMCI_CMDR_TRTYP_MULTI      (1 << HSMCI_CMDR_TRTYP_SHIFT) /* MMC/SDCard Multiple Block */
+#  define HSMCI_CMDR_TRTYP_STREAM     (2 << HSMCI_CMDR_TRTYP_SHIFT) /* MMC Stream */
+#  define HSMCI_CMDR_TRTYP_SDIOBYTE   (4 << HSMCI_CMDR_TRTYP_SHIFT) /* SDIO Byte */
+#  define HSMCI_CMDR_TRTYP_SDIOBLK    (5 << HSMCI_CMDR_TRTYP_SHIFT) /* SDIO Block */
+#define HSMCI_CMDR_IOSPCMD_SHIFT      (24)      /* Bits 24-25: SDIO Special Command */
+#define HSMCI_CMDR_IOSPCMD_MASK       (3 << HSMCI_CMDR_IOSPCMD_SHIFT)
+#  define HSMCI_CMDR_IOSPCMD_NORMAL   (0 << HSMCI_CMDR_IOSPCMD_SHIFT) /* Not an SDIO Special Command */
+#  define HSMCI_CMDR_IOSPCMD_SUSP     (1 << HSMCI_CMDR_IOSPCMD_SHIFT) /* SDIO Suspend Command */
+#  define HSMCI_CMDR_IOSPCMD_RESUME   (2 << HSMCI_CMDR_IOSPCMD_SHIFT) /* SDIO Resume Command */
+#define HSMCI_CMDR_ATACS              (1 << 26) /* Bit 26: ATA with Command Completion Signal */
+#define HSMCI_CMDR_BOOTACK            (1 << 17) /* Bit 27: Boot Operation Acknowledge */
+
+/* HSMCI Block Register */
+
+#define HSMCI_BLKR_BCNT_SHIFT         (0)       /* Bits 0-15: MMC/SDIO Block Count - SDIO Byte Count */
+#define HSMCI_BLKR_BCNT_MASK          (0xffff << HSMCI_BLKR_BCNT_SHIFT)
+#define HSMCI_BLKR_BLKLEN_SHIFT       (16)      /* Bits 16-31: Data Block Length */
+#define HSMCI_BLKR_BLKLEN_MASK        (0xffff << HSMCI_BLKR_BLKLEN_SHIFT)
+
+/* HSMCI Completion Signal Timeout Register */
+
+#define HSMCI_CSTOR_CSTOCYC_SHIFT     (0)       /* Bits 0-3: Completion Signal Timeout Cycle Number */
+#define HSMCI_CSTOR_CSTOCYC_MASK      (15 << HSMCI_CSTOR_CSTOCYC_SHIFT)
+#define HSMCI_CSTOR_CSTOMUL_SHIFT     (4)       /* Bits 4-6: Completion Signal Timeout Multiplier */
+#define HSMCI_CSTOR_CSTOMUL_MASK      (7 << HSMCI_CSTOR_CSTOMUL_SHIFT)
+#  define HSMCI_CSTOR_CSTOMUL_1       (0 << HSMCI_CSTOR_CSTOMUL_SHIFT)
+#  define HSMCI_CSTOR_CSTOMUL_16      (1 << HSMCI_CSTOR_CSTOMUL_SHIFT)
+#  define HSMCI_CSTOR_CSTOMUL_128     (2 << HSMCI_CSTOR_CSTOMUL_SHIFT)
+#  define HSMCI_CSTOR_CSTOMUL_256     (3 << HSMCI_CSTOR_CSTOMUL_SHIFT)
+#  define HSMCI_CSTOR_CSTOMUL_1024    (4 << HSMCI_CSTOR_CSTOMUL_SHIFT)
+#  define HSMCI_CSTOR_CSTOMUL_4096    (5 << HSMCI_CSTOR_CSTOMUL_SHIFT)
+#  define HSMCI_CSTOR_CSTOMUL_65536   (6 << HSMCI_CSTOR_CSTOMUL_SHIFT)
+#  define HSMCI_CSTOR_CSTOMUL_1048576 (7 << HSMCI_CSTOR_CSTOMUL_SHIFT)
+
+/* HSMCI Status Register, HSMCI Interrupt Enable Register, HSMCI Interrupt Disable
+ * Register, and HSMCI Interrupt Mask Register common bit-field definitions
+ */
+
+#define HSMCI_INT_CMDRDY              (1 << 0)  /* Bit 0:  Command Ready */
+#define HSMCI_INT_RXRDY               (1 << 1)  /* Bit 1:  Receiver Ready */
+#define HSMCI_INT_TXRDY               (1 << 2)  /* Bit 2:  Transmit Ready */
+#define HSMCI_INT_BLKE                (1 << 3)  /* Bit 3:  Data Block Ended */
+#define HSMCI_INT_DTIP                (1 << 4)  /* Bit 4:  Data Transfer in Progress */
+#define HSMCI_INT_NOTBUSY             (1 << 5)  /* Bit 6:  HSMCI Not Busy */
+#define HSMCI_INT_SDIOIRQA            (1 << 8)  /* Bit 8:  SDIO Interrupt for Slot A */
+#define HSMCI_INT_SDIOWAIT            (1 << 12) /* Bit 12: SDIO Read Wait Operation Status */
+#define HSMCI_INT_CSRCV               (1 << 13) /* Bit 13: CE-ATA Completion Signal Received */
+#define HSMCI_INT_RINDE               (1 << 16) /* Bit 16: Response Index Error */
+#define HSMCI_INT_RDIRE               (1 << 17) /* Bit 17: Response Direction Error */
+#define HSMCI_INT_RCRCE               (1 << 18) /* Bit 18: Response CRC Error */
+#define HSMCI_INT_RENDE               (1 << 19) /* Bit 19: Response End Bit Error */
+#define HSMCI_INT_RTOE                (1 << 20) /* Bit 20: Response Time-out */
+#define HSMCI_INT_DCRCE               (1 << 21) /* Bit 21: Data CRC Error */
+#define HSMCI_INT_DTOE                (1 << 22) /* Bit 22: Data Time-out Error */
+#define HSMCI_INT_CSTOE               (1 << 23) /* Bit 23: Completion Signal Time-out Error */
+#define HSMCI_INT_BLKOVRE             (1 << 24) /* Bit 24: DMA Block Overrun Error */
+#define HSMCI_INT_DMADONE             (1 << 25) /* Bit 25: DMA Transfer done */
+#define HSMCI_INT_FIFOEMPTY           (1 << 26) /* Bit 26: FIFO empty flag */
+#define HSMCI_INT_XFRDONE             (1 << 27) /* Bit 27: Transfer Done flag */
+#define HSMCI_INT_ACKRCV              (1 << 28) /* Bit 28: Boot Operation Acknowledge Received */
+#define HSMCI_INT_ACKRCVE             (1 << 29) /* Bit 29: Boot Operation Acknowledge Error */
+#define HSMCI_INT_OVRE                (1 << 30) /* Bit 30: Overrun */
+#define HSMCI_INT_UNRE                (1 << 31) /* Bit 31: Underrun */
+
+/* HSMCI DMA Configuration Register */
+
+#define HSMCI_DMA_OFFSET_SHIFT        (0)       /* Bits 0-1: DMA Write Buffer Offset */
+#define HSMCI_DMA_OFFSET_MASK         (3 << HSMCI_DMA_OFFSET_SHIFT)
+#define HSMCI_DMA_CHKSIZE             (1 << 4)  /* Bit 4:  DMA Channel Read and Write Chunk Size */
+#define HSMCI_DMA_DMAEN               (1 << 8)  /* Bit 8:  DMA Hardware Handshaking Enable */
+#define HSMCI_DMA_ROPT                (1 << 12) /* Bit 12: Read Optimization with padding */
+
+/* HSMCI Configuration Register */
+
+#define HSMCI_CFG_FIFOMODE            (1 << 0)  /* Bit 0:  HSMCI Internal FIFO control mode */
+#define HSMCI_CFG_FERRCTRL            (1 << 4)  /* Bit 4:  Flow Error flag reset control mode */
+#define HSMCI_CFG_HSMODE              (1 << 8)  /* Bit 8:  High Speed Mode */
+#define HSMCI_CFG_LSYNC               (1 << 12) /* Bit 12: Synchronize on the last block */
+
+/* HSMCI Write Protect Mode Register */
+
+#define HSMCI_WPMR_WP_EN              (1 << 0)  /* Bit 0:  Write Protection Enable */
+#define HSMCI_WPMR_WP_KEY_SHIFT       (8)       /* Bits 8-31: Write Protection Key password */
+#define HSMCI_WPMR_WP_KEY_MASK        (0x00ffffff << HSMCI_WPMR_WP_KEY_SHIFT)
+
+/* HSMCI Write Protect Status Register */
+
+#define HSMCI_WPSR_WP_VS_SHIFT        (0)       /* Bits 0-3: Write Protection Violation Status */
+#define HSMCI_WPSR_WP_VS_MASK         (15 << HSMCI_WPSR_WP_VS_SHIFT)
+#define HSMCI_WPSR_WP_VSRC_SHIFT      (8)       /* Bits 8-23: Write Protection Violation Source */
+#define HSMCI_WPSR_WP_VSRC_MASK       (0xffff << HSMCI_WPSR_WP_VSRC_SHIFT)
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Data
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Functions
+ ****************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_HSMCI_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_matrix.h b/nuttx/arch/arm/src/sam34/chip/sam_matrix.h
new file mode 100644
index 000000000..6fed14092
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_matrix.h
@@ -0,0 +1,214 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_matric.h
+ *
+ *   Copyright (C) 2009-2010, 2013 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_SAM34_CHIP_SAM_MATRIX_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* MATRIX register offsets **************************************************************/
+
+#define SAM_MATRIX_MCFG_OFFSET(n)        ((n)<<2)
+#define SAM_MATRIX_MCFG0_OFFSET          0x0000 /* Master Configuration Register 0 */
+#define SAM_MATRIX_MCFG1_OFFSET          0x0004 /* Master Configuration Register 1 */
+#define SAM_MATRIX_MCFG2_OFFSET          0x0008 /* Master Configuration Register 2 */
+#define SAM_MATRIX_MCFG3_OFFSET          0x000c /* Master Configuration Register 3 */
+#define SAM_MATRIX_MCFG4_OFFSET          0x0010 /* Master Configuration Register 4 */
+                                                /* 0x0014-0x003c: Reserved */
+#define SAM_MATRIX_SCFG_OFFSET(n)        (0x0040+((n)<<2))
+#define SAM_MATRIX_SCFG0_OFFSET          0x0040 /* Slave Configuration Register 0 */
+#define SAM_MATRIX_SCFG1_OFFSET          0x0044 /* Slave Configuration Register 1 */
+#define SAM_MATRIX_SCFG2_OFFSET          0x0048 /* Slave Configuration Register 2 */
+#define SAM_MATRIX_SCFG3_OFFSET          0x004c /* Slave Configuration Register 3 */
+#define SAM_MATRIX_SCFG4_OFFSET          0x0050 /* Slave Configuration Register 4 */
+#define SAM_MATRIX_SCFG5_OFFSET          0x0054 /* Slave Configuration Register 5 */
+#define SAM_MATRIX_SCFG6_OFFSET          0x0058 /* Slave Configuration Register 6 */
+#define SAM_MATRIX_SCFG7_OFFSET          0x005c /* Slave Configuration Register 7 */
+#define SAM_MATRIX_SCFG8_OFFSET          0x0060 /* Slave Configuration Register 8 */
+#define SAM_MATRIX_SCFG9_OFFSET          0x0064 /* Slave Configuration Register 9 */
+                                                /* 0x0068-0x007c: Reserved */
+#define SAM_MATRIX_PRAS_OFFSET(n)        (0x0080+((n)<<3))
+#define SAM_MATRIX_PRAS0_OFFSET          0x0080 /* Priority Register A for Slave 0 */
+                                                /* 0x0084: Reserved */
+#define SAM_MATRIX_PRAS1_OFFSET          0x0088 /* Priority Register A for Slave 1 */
+                                                /* 0x008c: Reserved */
+#define SAM_MATRIX_PRAS2_OFFSET          0x0090 /* Priority Register A for Slave 2 */
+                                                /* 0x0094: Reserved */
+#define SAM_MATRIX_PRAS3_OFFSET          0x0098 /* Priority Register A for Slave 3 */
+                                                /* 0x009c: Reserved */
+#define SAM_MATRIX_PRAS4_OFFSET          0x00a0 /* Priority Register A for Slave 4 */
+                                                /* 0x00a4: Reserved */
+#define SAM_MATRIX_PRAS5_OFFSET          0x00a8 /* Priority Register A for Slave 5 */
+                                                /* 0x00ac: Reserved */
+#define SAM_MATRIX_PRAS6_OFFSET          0x00b0 /* Priority Register A for Slave 6 */
+                                                /* 0x00b4: Reserved */
+#define SAM_MATRIX_PRAS7_OFFSET          0x00b8 /* Priority Register A for Slave 7 */
+                                                /* 0x00bc: Reserved */
+#define SAM_MATRIX_PRAS8_OFFSET          0x00c0 /* Priority Register A for Slave 8 */
+                                                /* 0x00c4: Reserved */
+#define SAM_MATRIX_PRAS9_OFFSET          0x00c8 /* Priority Register A for Slave 9 */
+                                                /* 0x00cc-0x00fc: Reserved */
+#define SAM_MATRIX_MRCR_OFFSET           0x0100 /* Master Remap Control Register */
+                                                /* 0x0104-0x010c: Reserved */
+#define SAM_MATRIX_WPMR_OFFSET           0x01e4 /* Write Protect Mode Register */
+#define SAM_MATRIX_WPSR_OFFSET           0x01e8 /* Write Protect Status Register */
+                                                /* 0x0110 - 0x01fc: Reserved */
+
+/* MATRIX register adresses *************************************************************/
+
+#define SAM_MATRIX_MCFG(n))              (SAM_MATRIX_BASE+SAM_MATRIX_MCFG_OFFSET(n))
+#define SAM_MATRIX_MCFG0                 (SAM_MATRIX_BASE+SAM_MATRIX_MCFG0_OFFSET)
+#define SAM_MATRIX_MCFG1                 (SAM_MATRIX_BASE+SAM_MATRIX_MCFG1_OFFSET)
+#define SAM_MATRIX_MCFG2                 (SAM_MATRIX_BASE+SAM_MATRIX_MCFG2_OFFSET)
+#define SAM_MATRIX_MCFG3                 (SAM_MATRIX_BASE+SAM_MATRIX_MCFG3_OFFSET)
+#define SAM_MATRIX_MCFG4                 (SAM_MATRIX_BASE+SAM_MATRIX_MCFG4_OFFSET)
+ 
+#define SAM_MATRIX_SCFG(n)               (SAM_MATRIX_BASE+SAM_MATRIX_SCFG_OFFSET(n))
+#define SAM_MATRIX_SCFG0                 (SAM_MATRIX_BASE+SAM_MATRIX_SCFG0_OFFSET)
+#define SAM_MATRIX_SCFG1                 (SAM_MATRIX_BASE+SAM_MATRIX_SCFG1_OFFSET)
+#define SAM_MATRIX_SCFG2                 (SAM_MATRIX_BASE+SAM_MATRIX_SCFG2_OFFSET)
+#define SAM_MATRIX_SCFG3                 (SAM_MATRIX_BASE+SAM_MATRIX_SCFG3_OFFSET)
+#define SAM_MATRIX_SCFG4                 (SAM_MATRIX_BASE+SAM_MATRIX_SCFG4_OFFSET)
+#define SAM_MATRIX_SCFG5                 (SAM_MATRIX_BASE+SAM_MATRIX_SCFG5_OFFSET)
+#define SAM_MATRIX_SCFG6                 (SAM_MATRIX_BASE+SAM_MATRIX_SCFG6_OFFSET)
+#define SAM_MATRIX_SCFG7                 (SAM_MATRIX_BASE+SAM_MATRIX_SCFG7_OFFSET)
+#define SAM_MATRIX_SCFG8                 (SAM_MATRIX_BASE+SAM_MATRIX_SCFG8_OFFSET)
+#define SAM_MATRIX_SCFG9                 (SAM_MATRIX_BASE+SAM_MATRIX_SCFG9_OFFSET)
+
+#define SAM_MATRIX_PRAS(n)               (SAM_MATRIX_BASE+SAM_MATRIX_PRAS_OFFSET(n))
+#define SAM_MATRIX_PRAS0                 (SAM_MATRIX_BASE+SAM_MATRIX_PRAS0_OFFSET)
+#define SAM_MATRIX_PRAS1                 (SAM_MATRIX_BASE+SAM_MATRIX_PRAS1_OFFSET)
+#define SAM_MATRIX_PRAS2                 (SAM_MATRIX_BASE+SAM_MATRIX_PRAS2_OFFSET)
+#define SAM_MATRIX_PRAS3                 (SAM_MATRIX_BASE+SAM_MATRIX_PRAS3_OFFSET)
+#define SAM_MATRIX_PRAS4                 (SAM_MATRIX_BASE+SAM_MATRIX_PRAS4_OFFSET)
+#define SAM_MATRIX_PRAS5                 (SAM_MATRIX_BASE+SAM_MATRIX_PRAS5_OFFSET)
+#define SAM_MATRIX_PRAS6                 (SAM_MATRIX_BASE+SAM_MATRIX_PRAS6_OFFSET)
+#define SAM_MATRIX_PRAS7                 (SAM_MATRIX_BASE+SAM_MATRIX_PRAS7_OFFSET)
+#define SAM_MATRIX_PRAS8                 (SAM_MATRIX_BASE+SAM_MATRIX_PRAS8_OFFSET)
+#define SAM_MATRIX_PRAS9                 (SAM_MATRIX_BASE+SAM_MATRIX_PRAS9_OFFSET)
+
+#define SAM_MATRIX_MRCR                  (SAM_MATRIX_BASE+SAM_MATRIX_MRCR_OFFSET)
+#define SAM_MATRIX_WPMR                  (SAM_MATRIX_BASE+SAM_MATRIX_WPMR_OFFSET)
+#define SAM_MATRIX_WPSR                  (SAM_MATRIX_BASE+SAM_MATRIX_WPSR_OFFSET)
+
+/* MATRIX register bit definitions ******************************************************/
+
+#define MATRIX_MCFG_ULBT_SHIFT           (0)       /* Bits 0-2:  Undefined Length Burst Type */
+#define MATRIX_MCFG_ULBT_MASK            (7 << MATRIX_MCFG_ULBT_SHIFT)
+#  define MATRIX_MCFG_ULBT_INF           (0 << MATRIX_MCFG_ULBT_SHIFT) /* Infinite Length Burst */
+#  define MATRIX_MCFG_ULBT_SINGLE        (1 << MATRIX_MCFG_ULBT_SHIFT) /* Single Access */
+#  define MATRIX_MCFG_ULBT_4BEAT         (2 << MATRIX_MCFG_ULBT_SHIFT) /* Four Beat Burst */
+#  define MATRIX_MCFG_ULBT_8BEAT         (3 << MATRIX_MCFG_ULBT_SHIFT) /* Eight Beat Burst */
+#  define MATRIX_MCFG_ULBT_16BEAT        (4 << MATRIX_MCFG_ULBT_SHIFT) /* Sixteen Beat Burst */
+
+#define MATRIX_SCFG_SLOTCYCLE_SHIFT      (0)       /* Bits 0-7:  Maximum Number of Allowed Cycles for a Burst */
+#define MATRIX_SCFG_SLOTCYCLE_MASK       (0xff << MATRIX_SCFG_SLOTCYCLE_SHIFT)
+#define MATRIX_SCFG_DEFMSTRTYPE_SHIFT    (16)      /* Bits 16-17:  Default Master Type */
+#define MATRIX_SCFG_DEFMSTRTYPE_MASK     (3 << MATRIX_SCFG_DEFMSTRTYPE_SHIFT)
+#  define MATRIX_SCFG_DEFMSTRTYPE_NONE   (0 << MATRIX_SCFG_DEFMSTRTYPE_SHIFT)
+#  define MATRIX_SCFG_DEFMSTRTYPE_LAST   (1 << MATRIX_SCFG_DEFMSTRTYPE_SHIFT)
+#  define MATRIX_SCFG_DEFMSTRTYPE_FIXED  (2 << MATRIX_SCFG_DEFMSTRTYPE_SHIFT)
+#define MATRIX_SCFG_FIXEDDEFMSTR_SHIFT   (18)      /* Bits 18-20:   Fixed Default Master */
+#define MATRIX_SCFG_FIXEDDEFMSTR_MASK    (7 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG0_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG1_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG2_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG3_FIXEDDEFMSTR_ARMC (0 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG4_FIXEDDEFMSTR_ARMC (0 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG5_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG6_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG7_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG8_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG8_FIXEDDEFMSTR_HDMA (4 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG9_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+#  define MATRIX_SCFG9_FIXEDDEFMSTR_HDMA (4 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
+
+#define MATRIX_SCFG_ARBT_SHIFT           (24)      /* Bits 24-25:   Arbitration Type */
+#define MATRIX_SCFG_ARBT_MASK            (3 << MATRIX_SCFG_ARBT_SHIFT)
+#  define MATRIX_SCFG_ARBT_RR            (0 << MATRIX_SCFG_ARBT_SHIFT) /* Round-Robin Arbitration */
+#  define MATRIX_SCFG_ARBT_FIXED         (1 << MATRIX_SCFG_ARBT_SHIFT) /* Fixed Priority Arbitration */
+
+#define MATRIX_PRAS_MPR_SHIFT(x)         ((n)<<2)
+#define MATRIX_PRAS_MPR_MASK(x)          (3 << MATRIX_PRAS_MPR_SHIFT(x))
+#define MATRIX_PRAS_M0PR_SHIFT           (0)       /* Bits 0-1:  Master 0 Priority */
+#define MATRIX_PRAS_M0PR_MASK            (3 << MATRIX_PRAS_M0PR_SHIFT)
+#define MATRIX_PRAS_M1PR_SHIFT           (4)       /* Bits 4-5:   Master 1 Priority */
+#define MATRIX_PRAS_M1PR_MASK            (3 << MATRIX_PRAS_M1PR_SHIFT)
+#define MATRIX_PRAS_M2PR_SHIFT           (8)       /* Bits 8-9:  Master 2 Priority */
+#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-17  Master 4 Priority */
+#define MATRIX_PRAS_M4PR_MASK            (3 << MATRIX_PRAS_M4PR_SHIFT)
+
+#define MATRIX_MRCR_RCB(x)               (1 << (x))
+#define MATRIX_MRCR_RCB0                 (1 << 0)  /* Bit 0:  Remap Command Bit for AHB Master 0 */
+#define MATRIX_MRCR_RCB1                 (1 << 1)  /* Bit 1:  Remap Command Bit for AHB Master 1 */
+#define MATRIX_MRCR_RCB2                 (1 << 2)  /* Bit 2:  Remap Command Bit for AHB Master 2 */
+#define MATRIX_MRCR_RCB3                 (1 << 3)  /* Bit 3:  Remap Command Bit for AHB Master 3 */
+#define MATRIX_MRCR_RCB4                 (1 << 4)  /* Bit 4:  Remap Command Bit for AHB Master 4 */
+
+#define MATRIX_WPMR_WPEN                 (1 << 0)  /* Bit 0:  Write Protect Enable */
+#define MATRIX_WPMR_WPKEY_SHIFT          (8)       /* Bits 8-31:   Write Protect KEY (Write-only) */
+#define MATRIX_WPMR_WPKEY_MASK           (0x00ffffff << MATRIX_WPMR_WPKEY_SHIFT)
+
+#define MATRIX_WPSR_WPVS                 (1 << 0)  /* Bit 0:  Enable Write Protect */
+#define MATRIX_WPSR_WPVSRC_SHIFT         (8)       /* Bits 8-23:  Write Protect Violation Source */
+#define MATRIX_WPSR_WPVSRC_MASK          (0xffff << MATRIX_WPSR_WPVSRC_SHIFT)
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Data
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Functions
+ ****************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_MATRIX_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_memorymap.h b/nuttx/arch/arm/src/sam34/chip/sam_memorymap.h
new file mode 100644
index 000000000..ad4a6018c
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_memorymap.h
@@ -0,0 +1,53 @@
+/************************************************************************************
+ * arch/arm/src/sam34/chip/sam_memorymap.h
+ *
+ *   Copyright (C) 2012 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_SAM34_CHIP_SAM_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include "chip.h"
+
+#if defined(CONFIG_ARCH_CHIP_SAM3U)
+#  include "chip/sam3u_memorymap.h"
+#else
+#  Unrecognized SAM architecture
+#endif
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_MEMORYMAP_H */
+
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_pdc.h b/nuttx/arch/arm/src/sam34/chip/sam_pdc.h
index 106b2cd91..40ae4e91a 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_pdc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_pdc.h
@@ -1,7 +1,7 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/sam3u_pdc.h
+ * arch/arm/src/sam34/chip/sam_pdc.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_PDC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_PDC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "sam3u_memorymap.h"
+#include "chip/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -51,16 +51,16 @@
 
 /* PDC register offsets *****************************************************************/
 
-#define SAM3U_PDC_RPR_OFFSET         0x100 /* Receive Pointer Register */
-#define SAM3U_PDC_RCR_OFFSET         0x104 /* Receive Counter Register */
-#define SAM3U_PDC_TPR_OFFSET         0x108 /* Transmit Pointer Register */
-#define SAM3U_PDC_TCR_OFFSET         0x10c /* Transmit Counter Register */
-#define SAM3U_PDC_RNPR_OFFSET        0x110 /* Receive Next Pointer Register */
-#define SAM3U_PDC_RNCR_OFFSET        0x114 /* Receive Next Counter Register */
-#define SAM3U_PDC_TNPR_OFFSET        0x118 /* Transmit Next Pointer Register */
-#define SAM3U_PDC_TNCR_OFFSET        0x11c /* Transmit Next Counter Register */
-#define SAM3U_PDC_PTCR_OFFSET        0x120 /* Transfer Control Register */
-#define SAM3U_PDC_PTSR_OFFSET        0x124 /* Transfer Status Register */
+#define SAM_PDC_RPR_OFFSET           0x100 /* Receive Pointer Register */
+#define SAM_PDC_RCR_OFFSET           0x104 /* Receive Counter Register */
+#define SAM_PDC_TPR_OFFSET           0x108 /* Transmit Pointer Register */
+#define SAM_PDC_TCR_OFFSET           0x10c /* Transmit Counter Register */
+#define SAM_PDC_RNPR_OFFSET          0x110 /* Receive Next Pointer Register */
+#define SAM_PDC_RNCR_OFFSET          0x114 /* Receive Next Counter Register */
+#define SAM_PDC_TNPR_OFFSET          0x118 /* Transmit Next Pointer Register */
+#define SAM_PDC_TNCR_OFFSET          0x11c /* Transmit Next Counter Register */
+#define SAM_PDC_PTCR_OFFSET          0x120 /* Transfer Control Register */
+#define SAM_PDC_PTSR_OFFSET          0x124 /* Transfer Status Register */
 
 /* PDC register adresses ****************************************************************/
 
@@ -100,4 +100,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_PDC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PDC_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_pinmap.h b/nuttx/arch/arm/src/sam34/chip/sam_pinmap.h
new file mode 100644
index 000000000..2adfac974
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_pinmap.h
@@ -0,0 +1,53 @@
+/************************************************************************************
+ * arch/arm/src/sam34/chip/sam_pinmap.h
+ *
+ *   Copyright (C) 2012 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_SAM34_CHIP_SAM_PINMAP_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include "chip.h"
+
+#if defined(CONFIG_ARCH_CHIP_SAM3U)
+#  include "chip/sam3u_pinmap.h"
+#else
+#  Unrecognized SAM architecture
+#endif
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PINMAP_H */
+
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_pio.h b/nuttx/arch/arm/src/sam34/chip/sam_pio.h
new file mode 100644
index 000000000..f6cef564b
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_pio.h
@@ -0,0 +1,324 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_pio.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM34_CHIP_SAM_PIO_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PIO_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* PIO register offsets *****************************************************************/
+
+#define SAM_PIO_PER_OFFSET         0x0000 /* PIO Enable Register */
+#define SAM_PIO_PDR_OFFSET         0x0004 /* PIO Disable Register */
+#define SAM_PIO_PSR_OFFSET         0x0008 /* PIO Status Register */
+                                          /* 0x000c: Reserved */
+#define SAM_PIO_OER_OFFSET         0x0010 /* Output Enable Register */
+#define SAM_PIO_ODR_OFFSET         0x0014 /* Output Disable Register */
+#define SAM_PIO_OSR_OFFSET         0x0018 /* utput Status Register */
+                                          /* 0x001c: Reserved */
+#define SAM_PIO_IFER_OFFSET        0x0020 /* Glitch Input Filter Enable Register */
+#define SAM_PIO_IFDR_OFFSET        0x0024 /* Glitch Input Filter Disable Register */
+#define SAM_PIO_IFSR_OFFSET        0x0028 /* Glitch Input Filter Status Register */
+                                          /* 0x002c: Reserved */
+#define SAM_PIO_SODR_OFFSET        0x0030 /* Set Output Data Register */
+#define SAM_PIO_CODR_OFFSET        0x0034 /* Clear Output Data Register */
+#define SAM_PIO_ODSR_OFFSET        0x0038 /* Output Data Status Register */
+#define SAM_PIO_PDSR_OFFSET        0x003c /* Pin Data Status Register */
+#define SAM_PIO_IER_OFFSET         0x0040 /* Interrupt Enable Register */
+#define SAM_PIO_IDR_OFFSET         0x0044 /* Interrupt Disable Register */
+#define SAM_PIO_IMR_OFFSET         0x0048 /* Interrupt Mask Register */
+#define SAM_PIO_ISR_OFFSET         0x004c /* Interrupt Status Register */
+#define SAM_PIO_MDER_OFFSET        0x0050 /* Multi-driver Enable Register */
+#define SAM_PIO_MDDR_OFFSET        0x0054 /* Multi-driver Disable Register */
+#define SAM_PIO_MDSR_OFFSET        0x0058 /* Multi-driver Status Register */
+                                          /* 0x005c: Reserved */
+#define SAM_PIO_PUDR_OFFSET        0x0060 /* Pull-up Disable Register */
+#define SAM_PIO_PUER_OFFSET        0x0064 /* Pull-up Enable Register */
+#define SAM_PIO_PUSR_OFFSET        0x0068 /* Pad Pull-up Status Register */
+                                          /* 0x006c: Reserved */
+#define SAM_PIO_ABSR_OFFSET        0x0070 /* Peripheral AB Select Register */
+                                          /* 0x0074-0x007c: Reserved */
+#define SAM_PIO_SCIFSR_OFFSET      0x0080 /* System Clock Glitch Input Filter Select Register */
+#define SAM_PIO_DIFSR_OFFSET       0x0084 /* Debouncing Input Filter Select Register */
+#define SAM_PIO_IFDGSR_OFFSET      0x0088 /* Glitch or Debouncing Input Filter Clock Selection Status Register */
+#define SAM_PIO_SCDR_OFFSET        0x008c /* Slow Clock Divider Debouncing Register */
+                                          /* 0x0090-0x009c: Reserved */
+#define SAM_PIO_OWER_OFFSET        0x00a0 /* Output Write Enable */
+#define SAM_PIO_OWDR_OFFSET        0x00a4 /* Output Write Disable */
+#define SAM_PIO_OWSR_OFFSET        0x00a8 /* Output Write Status Register */
+                                          /* 0x00ac: Reserved */
+#define SAM_PIO_AIMER_OFFSET       0x00b0 /* Additional Interrupt Modes Enable Register */
+#define SAM_PIO_AIMDR_OFFSET       0x00b4 /* Additional Interrupt Modes Disables Register */
+#define SAM_PIO_AIMMR_OFFSET       0x00b8 /* Additional Interrupt Modes Mask Register */
+                                          /* 0x00bc: Reserved */
+#define SAM_PIO_ESR_OFFSET         0x00c0 /* Edge Select Register */
+#define SAM_PIO_LSR_OFFSET         0x00c4 /* Level Select Register */
+#define SAM_PIO_ELSR_OFFSET        0x00c8 /* Edge/Level Status Register */
+                                          /* 0x00cc: Reserved */
+#define SAM_PIO_FELLSR_OFFSET      0x00d0 /* Falling Edge/Low Level Select Register */
+#define SAM_PIO_REHLSR_OFFSET      0x00d4 /* Rising Edge/ High Level Select Register */
+#define SAM_PIO_FRLHSR_OFFSET      0x00d8 /* Fall/Rise - Low/High Status Register */
+                                          /* 0x00dc: Reserved */
+#define SAM_PIO_LOCKSR_OFFSET      0x00e0 /* Lock Status */
+#define SAM_PIO_WPMR_OFFSET        0x00e4 /* Write Protect Mode Register */
+#define SAM_PIO_WPSR_OFFSET        0x00e8 /* Write Protect Status Register */
+                                          /* 0x00ec-0x00f8: Reserved */
+                                          /* 0x0100-0x0144: Reserved */
+
+/* PIO register adresses ****************************************************************/
+
+#define PIOA                       (0)
+#define PIOB                       (1)
+#define PIOC                       (2)
+#define NPIO                       (3)
+
+#define SAM_PIO_PER(n)             (SAM_PIO_BASE(n)+SAM_PIO_PER_OFFSET)
+#define SAM_PIO_PDR(n)             (SAM_PIO_BASE(n)+SAM_PIO_PDR_OFFSET)
+#define SAM_PIO_PSR(n)             (SAM_PIO_BASE(n)+SAM_PIO_PSR_OFFSET)
+#define SAM_PIO_OER(n)             (SAM_PIO_BASE(n)+SAM_PIO_OER_OFFSET)
+#define SAM_PIO_ODR(n)             (SAM_PIO_BASE(n)+SAM_PIO_ODR_OFFSET)
+#define SAM_PIO_OSR(n)             (SAM_PIO_BASE(n)+SAM_PIO_OSR_OFFSET)
+#define SAM_PIO_IFER(n)            (SAM_PIO_BASE(n)+SAM_PIO_IFER_OFFSET)
+#define SAM_PIO_IFDR(n)            (SAM_PIO_BASE(n)+SAM_PIO_IFDR_OFFSET)
+#define SAM_PIO_IFSR(n)            (SAM_PIO_BASE(n)+SAM_PIO_IFSR_OFFSET)
+#define SAM_PIO_SODR(n)            (SAM_PIO_BASE(n)+SAM_PIO_SODR_OFFSET)
+#define SAM_PIO_CODR(n)            (SAM_PIO_BASE(n)+SAM_PIO_CODR_OFFSET)
+#define SAM_PIO_ODSR(n)            (SAM_PIO_BASE(n)+SAM_PIO_ODSR_OFFSET)
+#define SAM_PIO_PDSR(n)            (SAM_PIO_BASE(n)+SAM_PIO_PDSR_OFFSET)
+#define SAM_PIO_IER(n)             (SAM_PIO_BASE(n)+SAM_PIO_IER_OFFSET)
+#define SAM_PIO_IDR(n)             (SAM_PIO_BASE(n)+SAM_PIO_IDR_OFFSET)
+#define SAM_PIO_IMR(n)             (SAM_PIO_BASE(n)+SAM_PIO_IMR_OFFSET)
+#define SAM_PIO_ISR(n)             (SAM_PIO_BASE(n)+SAM_PIO_ISR_OFFSET)
+#define SAM_PIO_MDER(n)            (SAM_PIO_BASE(n)+SAM_PIO_MDER_OFFSET)
+#define SAM_PIO_MDDR(n)            (SAM_PIO_BASE(n)+SAM_PIO_MDDR_OFFSET)
+#define SAM_PIO_MDSR(n)            (SAM_PIO_BASE(n)+SAM_PIO_MDSR_OFFSET)
+#define SAM_PIO_PUDR(n)            (SAM_PIO_BASE(n)+SAM_PIO_PUDR_OFFSET)
+#define SAM_PIO_PUER(n)            (SAM_PIO_BASE(n)+SAM_PIO_PUER_OFFSET)
+#define SAM_PIO_PUSR(n)            (SAM_PIO_BASE(n)+SAM_PIO_PUSR_OFFSET)
+#define SAM_PIO_ABSR(n)            (SAM_PIO_BASE(n)+SAM_PIO_ABSR_OFFSET)
+#define SAM_PIO_SCIFSR(n)          (SAM_PIO_BASE(n)+SAM_PIO_SCIFSR_OFFSET)
+#define SAM_PIO_DIFSR(n)           (SAM_PIO_BASE(n)+SAM_PIO_DIFSR_OFFSET)
+#define SAM_PIO_IFDGSR(n)          (SAM_PIO_BASE(n)+SAM_PIO_IFDGSR_OFFSET)
+#define SAM_PIO_SCDR(n)            (SAM_PIO_BASE(n)+SAM_PIO_SCDR_OFFSET)
+#define SAM_PIO_OWER(n)            (SAM_PIO_BASE(n)+SAM_PIO_OWER_OFFSET)
+#define SAM_PIO_OWDR(n)            (SAM_PIO_BASE(n)+SAM_PIO_OWDR_OFFSET)
+#define SAM_PIO_OWSR(n)            (SAM_PIO_BASE(n)+SAM_PIO_OWSR_OFFSET)
+#define SAM_PIO_AIMER(n)           (SAM_PIO_BASE(n)+SAM_PIO_AIMER_OFFSET)
+#define SAM_PIO_AIMDR(n)           (SAM_PIO_BASE(n)+SAM_PIO_AIMDR_OFFSET)
+#define SAM_PIO_AIMMR(n)           (SAM_PIO_BASE(n)+SAM_PIO_AIMMR_OFFSET)
+#define SAM_PIO_ESR(n)             (SAM_PIO_BASE(n)+SAM_PIO_ESR_OFFSET)
+#define SAM_PIO_LSR(n)             (SAM_PIO_BASE(n)+SAM_PIO_LSR_OFFSET)
+#define SAM_PIO_ELSR(n)            (SAM_PIO_BASE(n)+SAM_PIO_ELSR_OFFSET)
+#define SAM_PIO_FELLSR(n)          (SAM_PIO_BASE(n)+SAM_PIO_FELLSR_OFFSET)
+#define SAM_PIO_REHLSR(n)          (SAM_PIO_BASE(n)+SAM_PIO_REHLSR_OFFSET)
+#define SAM_PIO_FRLHSR(n)          (SAM_PIO_BASE(n)+SAM_PIO_FRLHSR_OFFSET)
+#define SAM_PIO_LOCKSR(n)          (SAM_PIO_BASE(n)+SAM_PIO_LOCKSR_OFFSET)
+#define SAM_PIO_WPMR(n)            (SAM_PIO_BASE(n)+SAM_PIO_WPMR_OFFSET)
+#define SAM_PIO_WPSR(n)            (SAM_PIO_BASE(n)+SAM_PIO_WPSR_OFFSET)
+
+#define SAM_PIOA_PER               (SAM_PIOA_BASE+SAM_PIO_PER_OFFSET)
+#define SAM_PIOA_PDR               (SAM_PIOA_BASE+SAM_PIO_PDR_OFFSET)
+#define SAM_PIOA_PSR               (SAM_PIOA_BASE+SAM_PIO_PSR_OFFSET)
+#define SAM_PIOA_OER               (SAM_PIOA_BASE+SAM_PIO_OER_OFFSET)
+#define SAM_PIOA_ODR               (SAM_PIOA_BASE+SAM_PIO_ODR_OFFSET)
+#define SAM_PIOA_OSR               (SAM_PIOA_BASE+SAM_PIO_OSR_OFFSET)
+#define SAM_PIOA_IFER              (SAM_PIOA_BASE+SAM_PIO_IFER_OFFSET)
+#define SAM_PIOA_IFDR              (SAM_PIOA_BASE+SAM_PIO_IFDR_OFFSET)
+#define SAM_PIOA_IFSR              (SAM_PIOA_BASE+SAM_PIO_IFSR_OFFSET)
+#define SAM_PIOA_SODR              (SAM_PIOA_BASE+SAM_PIO_SODR_OFFSET)
+#define SAM_PIOA_CODR              (SAM_PIOA_BASE+SAM_PIO_CODR_OFFSET)
+#define SAM_PIOA_ODSR              (SAM_PIOA_BASE+SAM_PIO_ODSR_OFFSET)
+#define SAM_PIOA_PDSR              (SAM_PIOA_BASE+SAM_PIO_PDSR_OFFSET)
+#define SAM_PIOA_IER               (SAM_PIOA_BASE+SAM_PIO_IER_OFFSET)
+#define SAM_PIOA_IDR               (SAM_PIOA_BASE+SAM_PIO_IDR_OFFSET)
+#define SAM_PIOA_IMR               (SAM_PIOA_BASE+SAM_PIO_IMR_OFFSET)
+#define SAM_PIOA_ISR               (SAM_PIOA_BASE+SAM_PIO_ISR_OFFSET)
+#define SAM_PIOA_MDER              (SAM_PIOA_BASE+SAM_PIO_MDER_OFFSET)
+#define SAM_PIOA_MDDR              (SAM_PIOA_BASE+SAM_PIO_MDDR_OFFSET)
+#define SAM_PIOA_MDSR              (SAM_PIOA_BASE+SAM_PIO_MDSR_OFFSET)
+#define SAM_PIOA_PUDR              (SAM_PIOA_BASE+SAM_PIO_PUDR_OFFSET)
+#define SAM_PIOA_PUER              (SAM_PIOA_BASE+SAM_PIO_PUER_OFFSET)
+#define SAM_PIOA_PUSR              (SAM_PIOA_BASE+SAM_PIO_PUSR_OFFSET)
+#define SAM_PIOA_ABSR              (SAM_PIOA_BASE+SAM_PIO_ABSR_OFFSET)
+#define SAM_PIOA_SCIFSR            (SAM_PIOA_BASE+SAM_PIO_SCIFSR_OFFSET)
+#define SAM_PIOA_DIFSR             (SAM_PIOA_BASE+SAM_PIO_DIFSR_OFFSET)
+#define SAM_PIOA_IFDGSR            (SAM_PIOA_BASE+SAM_PIO_IFDGSR_OFFSET)
+#define SAM_PIOA_SCDR              (SAM_PIOA_BASE+SAM_PIO_SCDR_OFFSET)
+#define SAM_PIOA_OWER              (SAM_PIOA_BASE+SAM_PIO_OWER_OFFSET)
+#define SAM_PIOA_OWDR              (SAM_PIOA_BASE+SAM_PIO_OWDR_OFFSET)
+#define SAM_PIOA_OWSR              (SAM_PIOA_BASE+SAM_PIO_OWSR_OFFSET)
+#define SAM_PIOA_AIMER             (SAM_PIOA_BASE+SAM_PIO_AIMER_OFFSET)
+#define SAM_PIOA_AIMDR             (SAM_PIOA_BASE+SAM_PIO_AIMDR_OFFSET)
+#define SAM_PIOA_AIMMR             (SAM_PIOA_BASE+SAM_PIO_AIMMR_OFFSET)
+#define SAM_PIOA_ESR               (SAM_PIOA_BASE+SAM_PIO_ESR_OFFSET)
+#define SAM_PIOA_LSR               (SAM_PIOA_BASE+SAM_PIO_LSR_OFFSET)
+#define SAM_PIOA_ELSR              (SAM_PIOA_BASE+SAM_PIO_ELSR_OFFSET)
+#define SAM_PIOA_FELLSR            (SAM_PIOA_BASE+SAM_PIO_FELLSR_OFFSET)
+#define SAM_PIOA_REHLSR            (SAM_PIOA_BASE+SAM_PIO_REHLSR_OFFSET)
+#define SAM_PIOA_FRLHSR            (SAM_PIOA_BASE+SAM_PIO_FRLHSR_OFFSET)
+#define SAM_PIOA_LOCKSR            (SAM_PIOA_BASE+SAM_PIO_LOCKSR_OFFSET)
+#define SAM_PIOA_WPMR              (SAM_PIOA_BASE+SAM_PIO_WPMR_OFFSET)
+#define SAM_PIOA_WPSR              (SAM_PIOA_BASE+SAM_PIO_WPSR_OFFSET)
+
+#define SAM_PIOB_PER               (SAM_PIOB_BASE+SAM_PIO_PER_OFFSET)
+#define SAM_PIOB_PDR_              (SAM_PIOB_BASE+SAM_PIO_PDR_OFFSET)
+#define SAM_PIOB_PSR               (SAM_PIOB_BASE+SAM_PIO_PSR_OFFSET)
+#define SAM_PIOB_OER               (SAM_PIOB_BASE+SAM_PIO_OER_OFFSET)
+#define SAM_PIOB_ODR               (SAM_PIOB_BASE+SAM_PIO_ODR_OFFSET)
+#define SAM_PIOB_OSR               (SAM_PIOB_BASE+SAM_PIO_OSR_OFFSET)
+#define SAM_PIOB_IFER              (SAM_PIOB_BASE+SAM_PIO_IFER_OFFSET)
+#define SAM_PIOB_IFDR              (SAM_PIOB_BASE+SAM_PIO_IFDR_OFFSET)
+#define SAM_PIOB_IFSR              (SAM_PIOB_BASE+SAM_PIO_IFSR_OFFSET)
+#define SAM_PIOB_SODR              (SAM_PIOB_BASE+SAM_PIO_SODR_OFFSET)
+#define SAM_PIOB_CODR              (SAM_PIOB_BASE+SAM_PIO_CODR_OFFSET)
+#define SAM_PIOB_ODSR              (SAM_PIOB_BASE+SAM_PIO_ODSR_OFFSET)
+#define SAM_PIOB_PDSR              (SAM_PIOB_BASE+SAM_PIO_PDSR_OFFSET)
+#define SAM_PIOB_IER               (SAM_PIOB_BASE+SAM_PIO_IER_OFFSET)
+#define SAM_PIOB_IDR               (SAM_PIOB_BASE+SAM_PIO_IDR_OFFSET)
+#define SAM_PIOB_IMR               (SAM_PIOB_BASE+SAM_PIO_IMR_OFFSET)
+#define SAM_PIOB_ISR               (SAM_PIOB_BASE+SAM_PIO_ISR_OFFSET)
+#define SAM_PIOB_MDER              (SAM_PIOB_BASE+SAM_PIO_MDER_OFFSET)
+#define SAM_PIOB_MDDR              (SAM_PIOB_BASE+SAM_PIO_MDDR_OFFSET)
+#define SAM_PIOB_MDSR              (SAM_PIOB_BASE+SAM_PIO_MDSR_OFFSET)
+#define SAM_PIOB_PUDR              (SAM_PIOB_BASE+SAM_PIO_PUDR_OFFSET)
+#define SAM_PIOB_PUER              (SAM_PIOB_BASE+SAM_PIO_PUER_OFFSET)
+#define SAM_PIOB_PUSR              (SAM_PIOB_BASE+SAM_PIO_PUSR_OFFSET)
+#define SAM_PIOB_ABSR              (SAM_PIOB_BASE+SAM_PIO_ABSR_OFFSET)
+#define SAM_PIOB_SCIFSR            (SAM_PIOB_BASE+SAM_PIO_SCIFSR_OFFSET)
+#define SAM_PIOB_DIFSR             (SAM_PIOB_BASE+SAM_PIO_DIFSR_OFFSET)
+#define SAM_PIOB_IFDGSR            (SAM_PIOB_BASE+SAM_PIO_IFDGSR_OFFSET)
+#define SAM_PIOB_SCDR              (SAM_PIOB_BASE+SAM_PIO_SCDR_OFFSET)
+#define SAM_PIOB_OWER              (SAM_PIOB_BASE+SAM_PIO_OWER_OFFSET)
+#define SAM_PIOB_OWDR              (SAM_PIOB_BASE+SAM_PIO_OWDR_OFFSET)
+#define SAM_PIOB_OWSR              (SAM_PIOB_BASE+SAM_PIO_OWSR_OFFSET)
+#define SAM_PIOB_AIMER             (SAM_PIOB_BASE+SAM_PIO_AIMER_OFFSET)
+#define SAM_PIOB_AIMDR             (SAM_PIOB_BASE+SAM_PIO_AIMDR_OFFSET)
+#define SAM_PIOB_AIMMR             (SAM_PIOB_BASE+SAM_PIO_AIMMR_OFFSET)
+#define SAM_PIOB_ESR               (SAM_PIOB_BASE+SAM_PIO_ESR_OFFSET)
+#define SAM_PIOB_LSR               (SAM_PIOB_BASE+SAM_PIO_LSR_OFFSET)
+#define SAM_PIOB_ELSR              (SAM_PIOB_BASE+SAM_PIO_ELSR_OFFSET)
+#define SAM_PIOB_FELLSR            (SAM_PIOB_BASE+SAM_PIO_FELLSR_OFFSET)
+#define SAM_PIOB_REHLSR            (SAM_PIOB_BASE+SAM_PIO_REHLSR_OFFSET)
+#define SAM_PIOB_FRLHSR            (SAM_PIOB_BASE+SAM_PIO_FRLHSR_OFFSET)
+#define SAM_PIOB_LOCKSR            (SAM_PIOB_BASE+SAM_PIO_LOCKSR_OFFSET)
+#define SAM_PIOB_WPMR              (SAM_PIOB_BASE+SAM_PIO_WPMR_OFFSET)
+#define SAM_PIOB_WPSR              (SAM_PIOB_BASE+SAM_PIO_WPSR_OFFSET)
+
+#define SAM_PIOC_PER               (SAM_PIOC_BASE+SAM_PIO_PER_OFFSET)
+#define SAM_PIOC_PDR_              (SAM_PIOC_BASE+SAM_PIO_PDR_OFFSET)
+#define SAM_PIOC_PSR               (SAM_PIOC_BASE+SAM_PIO_PSR_OFFSET)
+#define SAM_PIOC_OER               (SAM_PIOC_BASE+SAM_PIO_OER_OFFSET)
+#define SAM_PIOC_ODR               (SAM_PIOC_BASE+SAM_PIO_ODR_OFFSET)
+#define SAM_PIOC_OSR               (SAM_PIOC_BASE+SAM_PIO_OSR_OFFSET)
+#define SAM_PIOC_IFER              (SAM_PIOC_BASE+SAM_PIO_IFER_OFFSET)
+#define SAM_PIOC_IFDR              (SAM_PIOC_BASE+SAM_PIO_IFDR_OFFSET)
+#define SAM_PIOC_IFSR              (SAM_PIOC_BASE+SAM_PIO_IFSR_OFFSET)
+#define SAM_PIOC_SODR              (SAM_PIOC_BASE+SAM_PIO_SODR_OFFSET)
+#define SAM_PIOC_CODR              (SAM_PIOC_BASE+SAM_PIO_CODR_OFFSET)
+#define SAM_PIOC_ODSR              (SAM_PIOC_BASE+SAM_PIO_ODSR_OFFSET)
+#define SAM_PIOC_PDSR              (SAM_PIOC_BASE+SAM_PIO_PDSR_OFFSET)
+#define SAM_PIOC_IER               (SAM_PIOC_BASE+SAM_PIO_IER_OFFSET)
+#define SAM_PIOC_IDR               (SAM_PIOC_BASE+SAM_PIO_IDR_OFFSET)
+#define SAM_PIOC_IMR               (SAM_PIOC_BASE+SAM_PIO_IMR_OFFSET)
+#define SAM_PIOC_ISR               (SAM_PIOC_BASE+SAM_PIO_ISR_OFFSET)
+#define SAM_PIOC_MDER              (SAM_PIOC_BASE+SAM_PIO_MDER_OFFSET)
+#define SAM_PIOC_MDDR              (SAM_PIOC_BASE+SAM_PIO_MDDR_OFFSET)
+#define SAM_PIOC_MDSR              (SAM_PIOC_BASE+SAM_PIO_MDSR_OFFSET)
+#define SAM_PIOC_PUDR              (SAM_PIOC_BASE+SAM_PIO_PUDR_OFFSET)
+#define SAM_PIOC_PUER              (SAM_PIOC_BASE+SAM_PIO_PUER_OFFSET)
+#define SAM_PIOC_PUSR              (SAM_PIOC_BASE+SAM_PIO_PUSR_OFFSET)
+#define SAM_PIOC_ABSR              (SAM_PIOC_BASE+SAM_PIO_ABSR_OFFSET)
+#define SAM_PIOC_SCIFSR            (SAM_PIOC_BASE+SAM_PIO_SCIFSR_OFFSET)
+#define SAM_PIOC_DIFSR             (SAM_PIOC_BASE+SAM_PIO_DIFSR_OFFSET)
+#define SAM_PIOC_IFDGSR            (SAM_PIOC_BASE+SAM_PIO_IFDGSR_OFFSET)
+#define SAM_PIOC_SCDR              (SAM_PIOC_BASE+SAM_PIO_SCDR_OFFSET)
+#define SAM_PIOC_OWER              (SAM_PIOC_BASE+SAM_PIO_OWER_OFFSET)
+#define SAM_PIOC_OWDR              (SAM_PIOC_BASE+SAM_PIO_OWDR_OFFSET)
+#define SAM_PIOC_OWSR              (SAM_PIOC_BASE+SAM_PIO_OWSR_OFFSET)
+#define SAM_PIOC_AIMER             (SAM_PIOC_BASE+SAM_PIO_AIMER_OFFSET)
+#define SAM_PIOC_AIMDR             (SAM_PIOC_BASE+SAM_PIO_AIMDR_OFFSET)
+#define SAM_PIOC_AIMMR             (SAM_PIOC_BASE+SAM_PIO_AIMMR_OFFSET)
+#define SAM_PIOC_ESR               (SAM_PIOC_BASE+SAM_PIO_ESR_OFFSET)
+#define SAM_PIOC_LSR               (SAM_PIOC_BASE+SAM_PIO_LSR_OFFSET)
+#define SAM_PIOC_ELSR              (SAM_PIOC_BASE+SAM_PIO_ELSR_OFFSET)
+#define SAM_PIOC_FELLSR            (SAM_PIOC_BASE+SAM_PIO_FELLSR_OFFSET)
+#define SAM_PIOC_REHLSR            (SAM_PIOC_BASE+SAM_PIO_REHLSR_OFFSET)
+#define SAM_PIOC_FRLHSR            (SAM_PIOC_BASE+SAM_PIO_FRLHSR_OFFSET)
+#define SAM_PIOC_LOCKSR            (SAM_PIOC_BASE+SAM_PIO_LOCKSR_OFFSET)
+#define SAM_PIOC_WPMR              (SAM_PIOC_BASE+SAM_PIO_WPMR_OFFSET)
+#define SAM_PIOC_WPSR              (SAM_PIOC_BASE+SAM_PIO_WPSR_OFFSET)
+
+/* PIO register bit definitions *********************************************************/
+
+/* Common bit definitions for ALMOST all IO registers (exceptions follow) */
+
+#define PIO(n)                     (1<<(n)) /* Bit n: PIO n */
+
+/* PIO Write Protect Mode Register */
+
+#define PIO_WPMR_WPEN              1 << 0)  /* Bit 0:  Write Protect Enable */
+#define PIO_WPMR_WPKEY_SHIFT       8)       /* Bits 8-31: Write Protect KEY */
+#define PIO_WPMR_WPKEY_MASK        0xffffff << PIO_WPMR_WPKEY_SHIFT)
+
+/* PIO Write Protect Status Register */
+
+#define PIO_WPSR_WPVS              1 << 0)  /* Bit 0:  Write Protect Violation Status */
+#define PIO_WPSR_WPVSRC_SHIFT      8)       /* Bits 8-23: Write Protect Violation Source */
+#define PIO_WPSR_WPVSRC_MASK       0xffff << PIO_WPSR_WPVSRC_SHIFT)
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Data
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Functions
+ ****************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PIO_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_pmc.h b/nuttx/arch/arm/src/sam34/chip/sam_pmc.h
new file mode 100644
index 000000000..f6a98e3ee
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_pmc.h
@@ -0,0 +1,315 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_pmc.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM34_CHIP_SAM_PMC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* PMC register offsets *****************************************************************/
+
+#define SAM_PMC_SCER_OFFSET         0x0000 /* System Clock Enable Register */
+#define SAM_PMC_SCDR_OFFSET         0x0004 /* System Clock Disable Register */
+#define SAM_PMC_SCSR_OFFSET         0x0008 /* System Clock Status Register */
+                                           /* 0x000c: Reserved */
+#define SAM_PMC_PCER_OFFSET         0x0010 /* Peripheral Clock Enable Register */
+#define SAM_PMC_PCDR_OFFSET         0x0014 /* Peripheral Clock Disable Register */
+#define SAM_PMC_PCSR_OFFSET         0x0018 /* Peripheral Clock Status Register */
+#define SAM_CKGR_UCKR_OFFSET        0x001c /* UTMI Clock Register */
+#define SAM_CKGR_MOR_OFFSET         0x0020 /* Main Oscillator Register */
+#define SAM_CKGR_MCFR_OFFSET        0x0024 /* Main Clock Frequency Register */
+#define SAM_CKGR_PLLAR_OFFSET       0x0028 /* PLLA Register */
+                                           /* 0x002c: Reserved */
+#define SAM_PMC_MCKR_OFFSET         0x0030 /* Master Clock Register */
+                                           /* 0x0034-0x003C Reserved */
+#define SAM_PMC_PCK_OFFSET(n)       (0x0040+((n)<<2))
+#define SAM_PMC_PCK0_OFFSET         0x0040 /* Programmable Clock 0 Register */
+#define SAM_PMC_PCK1_OFFSET         0x0044 /* Programmable Clock 1 Register */
+#define SAM_PMC_PCK2_OFFSET         0x0048 /* Programmable Clock 2 Register */
+                                           /* 0x004c-0x005c: Reserved */
+#define SAM_PMC_IER_OFFSET          0x0060 /* Interrupt Enable Register */
+#define SAM_PMC_IDR_OFFSET          0x0064 /* Interrupt Disable Register */
+#define SAM_PMC_SR_OFFSET           0x0068 /* Status Register */
+#define SAM_PMC_IMR_OFFSET          0x006c /* Interrupt Mask Register */
+#define SAM_PMC_FSMR_OFFSET         0x0070 /* Fast Startup Mode Register */
+#define SAM_PMC_FSPR_OFFSET         0x0074 /* Fast Startup Polarity Register */
+#define SAM_PMC_FOCR_OFFSET         0x0078 /* Fault Output Clear Register */
+                                           /* 0x007c-0x00fc: Reserved */
+#define SAM_PMC_WPMR_OFFSET         0x00e4 /* Write Protect Mode Register */
+#define SAM_PMC_WPSR_OFFSET         0x00e8 /* Write Protect Status Register */
+
+/* PMC register adresses ****************************************************************/
+
+#define SAM_PMC_SCER                (SAM_PMC_BASE+SAM_PMC_SCER_OFFSET)
+#define SAM_PMC_SCDR                (SAM_PMC_BASE+SAM_PMC_SCDR_OFFSET)
+#define SAM_PMC_SCSR                (SAM_PMC_BASE+SAM_PMC_SCSR_OFFSET)
+#define SAM_PMC_PCER                (SAM_PMC_BASE+SAM_PMC_PCER_OFFSET)
+#define SAM_PMC_PCDR                (SAM_PMC_BASE+SAM_PMC_PCDR_OFFSET)
+#define SAM_PMC_PCSR                (SAM_PMC_BASE+SAM_PMC_PCSR_OFFSET)
+#define SAM_CKGR_UCKR               (SAM_PMC_BASE+SAM_CKGR_UCKR_OFFSET)
+#define SAM_CKGR_MOR                (SAM_PMC_BASE+SAM_CKGR_MOR_OFFSET)
+#define SAM_CKGR_MCFR               (SAM_PMC_BASE+SAM_CKGR_MCFR_OFFSET)
+#define SAM_CKGR_PLLAR              (SAM_PMC_BASE+SAM_CKGR_PLLAR_OFFSET)
+#define SAM_PMC_MCKR                (SAM_PMC_BASE+SAM_PMC_MCKR_OFFSET)
+#define SAM_PMC_PCK(n)              (SAM_PMC_BASE+SAM_PMC_PCK_OFFSET(n))
+#define SAM_PMC_PCK0                (SAM_PMC_BASE+SAM_PMC_PCK0_OFFSET)
+#define SAM_PMC_PCK1                (SAM_PMC_BASE+SAM_PMC_PCK1_OFFSET)
+#define SAM_PMC_PCK2                (SAM_PMC_BASE+SAM_PMC_PCK2_OFFSET)
+#define SAM_PMC_IER                 (SAM_PMC_BASE+SAM_PMC_IER_OFFSET)
+#define SAM_PMC_IDR                 (SAM_PMC_BASE+SAM_PMC_IDR_OFFSET)
+#define SAM_PMC_SR                  (SAM_PMC_BASE+SAM_PMC_SR_OFFSET)
+#define SAM_PMC_IMR                 (SAM_PMC_BASE+SAM_PMC_IMR_OFFSET)
+#define SAM_PMC_FSMR                (SAM_PMC_BASE+SAM_PMC_FSMR_OFFSET)
+#define SAM_PMC_FSPR                (SAM_PMC_BASE+SAM_PMC_FSPR_OFFSET)
+#define SAM_PMC_FOCR                (SAM_PMC_BASE+SAM_PMC_FOCR_OFFSET)
+#define SAM_PMC_WPMR                (SAM_PMC_BASE+SAM_PMC_WPMR_OFFSET)
+#define SAM_PMC_WPSR                (SAM_PMC_BASE+SAM_PMC_WPSR_OFFSET)
+
+/* PMC register bit definitions *********************************************************/
+
+/* PMC System Clock Enable Register, PMC System Clock Disable Register, and PMC System
+ * Clock Status Register common bit-field definitions
+ */
+
+#define PMC_PCK(n)                  (1 <<((n)+8)
+#define PMC_PCK0                    (1 << 8)  /* Bit 8:  Programmable Clock 0 Output Enable */
+#define PMC_PCK1                    (1 << 9)  /* Bit 9:  Programmable Clock 1 Output Enable */
+#define PMC_PCK2                    (1 << 10) /* Bit 10: Programmable Clock 2 Output Enable */
+
+/* PMC Peripheral Clock Enable Register, PMC Peripheral Clock Disable Register, and PMC
+ * Peripheral Clock Status Register common bit-field definitions.
+ */
+
+#define PMC_PID(n)                  (1<<(n))
+#define PMC_PID2                    (1 << 2)  /* Bit 2:  Peripheral Clock 2  Enable */
+#define PMC_PID3                    (1 << 3)  /* Bit 3:  Peripheral Clock 3  Enable */
+#define PMC_PID4                    (1 << 4)  /* Bit 4:  Peripheral Clock 4  Enable */
+#define PMC_PID5                    (1 << 5)  /* Bit 5:  Peripheral Clock 5  Enable */
+#define PMC_PID6                    (1 << 6)  /* Bit 6:  Peripheral Clock 6  Enable */
+#define PMC_PID7                    (1 << 7)  /* Bit 7:  Peripheral Clock 7  Enable */
+#define PMC_PID8                    (1 << 8)  /* Bit 8:  Peripheral Clock 8  Enable */
+#define PMC_PID9                    (1 << 9)  /* Bit 9:  Peripheral Clock 9  Enable */
+#define PMC_PID10                   (1 << 10) /* Bit 10: Peripheral Clock 10 Enable */
+#define PMC_PID11                   (1 << 11) /* Bit 11: Peripheral Clock 11 Enable */
+#define PMC_PID12                   (1 << 12) /* Bit 12: Peripheral Clock 12 Enable */
+#define PMC_PID13                   (1 << 13) /* Bit 13: Peripheral Clock 13 Enable */
+#define PMC_PID14                   (1 << 14) /* Bit 14: Peripheral Clock 14 Enable */
+#define PMC_PID15                   (1 << 15) /* Bit 15: Peripheral Clock 15 Enable */
+#define PMC_PID16                   (1 << 16) /* Bit 16: Peripheral Clock 16 Enable */
+#define PMC_PID17                   (1 << 17) /* Bit 17: Peripheral Clock 17 Enable */
+#define PMC_PID18                   (1 << 18) /* Bit 18: Peripheral Clock 18 Enable */
+#define PMC_PID19                   (1 << 19) /* Bit 19: Peripheral Clock 19 Enable */
+#define PMC_PID20                   (1 << 20) /* Bit 20: Peripheral Clock 20 Enable */
+#define PMC_PID21                   (1 << 21) /* Bit 21: Peripheral Clock 21 Enable */
+#define PMC_PID22                   (1 << 22) /* Bit 22: Peripheral Clock 22 Enable */
+#define PMC_PID23                   (1 << 23) /* Bit 23: Peripheral Clock 23 Enable */
+#define PMC_PID24                   (1 << 24) /* Bit 24: Peripheral Clock 24 Enable */
+#define PMC_PID25                   (1 << 25) /* Bit 25: Peripheral Clock 25 Enable */
+#define PMC_PID26                   (1 << 26) /* Bit 26: Peripheral Clock 26 Enable */
+#define PMC_PID27                   (1 << 27) /* Bit 27: Peripheral Clock 27 Enable */
+#define PMC_PID28                   (1 << 28) /* Bit 28: Peripheral Clock 28 Enable */
+#define PMC_PID29                   (1 << 29) /* Bit 29: Peripheral Clock 29 Enable */
+#define PMC_PID30                   (1 << 30) /* Bit 30: Peripheral Clock 30 Enable */
+#define PMC_PID31                   (1 << 31) /* Bit 31: Peripheral Clock 31 Enable */
+
+/* PMC UTMI Clock Configuration Register */
+
+#define CKGR_UCKR_UPLLEN            (1 << 16) /* Bit 16: UTMI PLL Enable */
+#define CKGR_UCKR_UPLLCOUNT_SHIFT   (20)      /* Bits 20-23: UTMI PLL Start-up Time */
+#define CKGR_UCKR_UPLLCOUNT_MASK    (15 << CKGR_UCKR_UPLLCOUNT_SHIFT)
+
+/* PMC Clock Generator Main Oscillator Register */
+
+#define CKGR_MOR_MOSCXTEN           (1 << 0)  /* Bit 0:  Main Crystal Oscillator Enable */
+#define CKGR_MOR_MOSCXTBY           (1 << 1)  /* Bit 1:  Main Crystal Oscillator Bypass */
+#define CKGR_MOR_WAITMODE           (1 << 2)  /* Bit 2:  Wait Mode Command */
+#define CKGR_MOR_MOSCRCEN           (1 << 3)  /* Bit 3:  Main On-Chip RC Oscillator Enable */
+#define CKGR_MOR_MOSCRCF_SHIFT      (4)       /* Bits 4-6: Main On-Chip RC Oscillator Frequency Selection */
+#define CKGR_MOR_MOSCRCF_MASK       (7 << CKGR_MOR_MOSCRCF_SHIFT)
+#define CKGR_MOR_MOSCXTST_SHIFT     (8)       /* Bits 8-16: Main Crystal Oscillator Start-up Time */
+#define CKGR_MOR_MOSCXTST_MASK      (0x1ff << CKGR_MOR_MOSCXTST_SHIFT)
+#define CKGR_MOR_KEY_SHIFT          (16)      /* Bits 16-23: Password */
+#define CKGR_MOR_KEY_MASK           (0xff << CKGR_MOR_KEY_SHIFT)
+#define CKGR_MOR_MOSCSEL            (1 << 24) /* Bit 24: Main Oscillator Selection */
+#define CKGR_MOR_CFDEN              (1 << 25) /* Bit 25: Clock Failure Detector Enable */
+
+/* PMC Clock Generator Main Clock Frequency Register */
+
+#define CKGR_MCFR_MAINF_SHIFT       (0)       /* Bits 0-15: Main Clock Frequency */
+#define CKGR_MCFR_MAINF_MASK        (0xffff << CKGR_MCFR_MAINF_SHIFT)
+#define CKGR_MCFR_MAINFRDY          (1 << 16) /* Bit 16: Main Clock Ready */
+
+/* PMC Clock Generator PLLA Register */
+
+#define CKGR_PLLAR_DIVA_SHIFT       (0)       /* Bits 0-7: Divider */
+#define CKGR_PLLAR_DIVA_MASK        (0xff << CKGR_PLLAR_DIVA_SHIFT)
+#  define CKGR_PLLAR_DIVA_ZERO      (0 << CKGR_PLLAR_DIVA_SHIFT)   /* Divider output is 0 */
+#  define CKGR_PLLAR_DIVA_BYPASS    (1 << CKGR_PLLAR_DIVA_SHIFT)   /* Divider is bypassed (DIVA=1) */
+#  define CKGR_PLLAR_DIVA(n)        ((n) << CKGR_PLLAR_DIVA_SHIFT) /* Divider output is DIVA=n, n=2..255 */
+#define CKGR_PLLAR_PLLACOUNT_SHIFT  (8)       /* Bits 8-13: PLLA Counter */
+#define CKGR_PLLAR_PLLACOUNT_MASK   (63 << CKGR_PLLAR_PLLACOUNT_SHIFT)
+#define CKGR_PLLAR_STMODE_SHIFT     (14)      /* Bits 14-15: Start Mode */
+#define CKGR_PLLAR_STMODE_MASK      (3 << CKGR_PLLAR_STMODE_SHIFT)
+#  define CKGR_PLLAR_STMODE_FAST    (0 << CKGR_PLLAR_STMODE_SHIFT) /* Fast Startup */
+#  define CKGR_PLLAR_STMODE_NORMAL  (2 << CKGR_PLLAR_STMODE_SHIFT) /* Normal Startup */
+#define CKGR_PLLAR_MULA_SHIFT       (16)      /* Bits 16-26: PLLA Multiplier */
+#define CKGR_PLLAR_MULA_MASK        (0x7ff << CKGR_PLLAR_MULA_SHIFT)
+#define CKGR_PLLAR_ONE              (1 << 29) /* Bit 29: Always one */
+
+/* PMC Master Clock Register */
+
+#define PMC_MCKR_CSS_SHIFT          (0)       /* Bits 0-1: Master Clock Source Selection */
+#define PMC_MCKR_CSS_MASK           (3 << PMC_MCKR_CSS_SHIFT)
+#  define PMC_MCKR_CSS_SLOW         (0 << PMC_MCKR_CSS_SHIFT) /* Slow Clock */
+#  define PMC_MCKR_CSS_MAIN         (1 << PMC_MCKR_CSS_SHIFT) /* Main Clock */
+#  define PMC_MCKR_CSS_PLLA         (2 << PMC_MCKR_CSS_SHIFT) /* PLLA Clock */
+#  define PMC_MCKR_CSS_UPLL         (3 << PMC_MCKR_CSS_SHIFT) /* UPLL Clock */
+#define PMC_MCKR_PRES_SHIFT         (4)       /* Bits 4-6: Processor Clock Prescaler */
+#define PMC_MCKR_PRES_MASK          (7 << PMC_MCKR_PRES_SHIFT)
+#  define PMC_MCKR_PRES_DIV1        (0 << PMC_MCKR_PRES_SHIFT) /* Selected clock */
+#  define PMC_MCKR_PRES_DIV2        (1 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 2 */
+#  define PMC_MCKR_PRES_DIV4        (2 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 4 */
+#  define PMC_MCKR_PRES_DIV8        (3 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 8 */
+#  define PMC_MCKR_PRES_DIV16       (4 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 16 */
+#  define PMC_MCKR_PRES_DIV32K      (5 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 32 */
+#  define PMC_MCKR_PRES_DIV64       (6 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 64 */
+#  define PMC_MCKR_PRES_DIV3        (7 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 3 */
+#define PMC_MCKR_UPLLDIV            (1 << 13) /* Bit 13: UPLL Divider */
+
+/* PMC Programmable Clock Register (0,1,2) */
+
+#define PMC_PCK_CSS_SHIFT           (0)       /* Bits 0-2: Master Clock Source Selection */
+#define PMC_PCK_CSS_MASK            (7 << PMC_PCK_CSS_MASK)
+#  define PMC_PCK_CSS_SLOW          (0 << PMC_PCK_CSS_MASK) /* Slow Clock */
+#  define PMC_PCK_CSS_MAIN          (1 << PMC_PCK_CSS_MASK) /* Main Clock */
+#  define PMC_PCK_CSS_PLLA          (2 << PMC_PCK_CSS_MASK) /* PLLA Clock */
+#  define PMC_PCK_CSS_UPLL          (3 << PMC_PCK_CSS_MASK) /* UPLL Clock */
+#  define PMC_PCK_CSS_MASTER        (4 << PMC_PCK_CSS_MASK) /* Master Clock */
+#define PMC_PCK_PRES_SHIFT          (4)       /* Bits 4-6: Programmable Clock Prescaler */
+#define PMC_PCK_PRES_MASK           (7 << PMC_PCK_PRES_SHIFT)
+#  define PMC_PCK_PRES_DIV1         (0 << PMC_PCK_PRES_SHIFT) /* Selected clock */
+#  define PMC_PCK_PRES_DIV2         (1 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 2 */
+#  define PMC_PCK_PRES_DIV4         (2 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 4 */
+#  define PMC_PCK_PRES_DIV8         (3 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 8 */
+#  define PMC_PCK_PRES_DIV16        (4 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 16 */
+#  define PMC_PCK_PRES_DIV32K       (5 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 32 */
+#  define PMC_PCK_PRES_DIV64        (6 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 64 */
+
+/* PMC Interrupt Enable Register, PMC Interrupt Disable Register, PMC Status Register,
+ * and PMC Interrupt Mask Register common bit-field definitions
+ */
+
+#define PMC_INT_MOSCXTS             (1 << 0)  /* Bit 0:  Main Crystal Oscillator Status Interrupt */
+#define PMC_INT_LOCKA               (1 << 1)  /* Bit 1:  PLL A Lock Interrupt */
+#define PMC_INT_MCKRDY              (1 << 3)  /* Bit 3:  Master Clock Ready Interrupt */
+#define PMC_INT_LOCKU               (1 << 6)  /* Bit 6:  UTMI PLL Lock Interrupt */
+#define PMC_SR_OSCSELS              (1 << 7)  /* Bit 7: Slow Clock Oscillator Selection (SR only) */
+#define PMC_INT_PCKRDY(n)           (1 << ((n)+8)
+#define PMC_INT_PCKRDY0             (1 << 8)  /* Bit 8:  Programmable Clock Ready 0 Interrupt */
+#define PMC_INT_PCKRDY1             (1 << 9)  /* Bit 9:  Programmable Clock Ready 1 Interrupt */
+#define PMC_INT_PCKRDY2             (1 << 10) /* Bit 10: Programmable Clock Ready 2 Interrupt */
+#define PMC_INT_MOSCSELS            (1 << 16) /* Bit 16: Main Oscillator Selection Status Interrupt */
+#define PMC_INT_MOSCRCS             (1 << 17) /* Bit 17: Main On-Chip RC Status Interrupt */
+#define PMC_INT_CFDEV               (1 << 18) /* Bit 18: Clock Failure Detector Event Interrupt */
+#define PMC_SR_CFDS                 (1 << 19) /* Bit 19: Clock Failure Detector Status (SR only) */
+#define PMC_SR_FOS                  (1 << 20) /* Bit 20: Clock Failure Detector Fault Output Status (SR only) */
+
+/* PMC Fast Startup Mode Register and PMC Fast Startup Polarity Register common bit-field
+ * definitions
+ */
+
+#define PMC_FSTI(n)                 (1 << (n))
+#define PMC_FSTI0                   (1 << 0)  /* Bit 0:  Fast Startup Input 0 */
+#define PMC_FSTI1                   (1 << 1)  /* Bit 1:  Fast Startup Input 1 */
+#define PMC_FSTI2                   (1 << 2)  /* Bit 2:  Fast Startup Input 2 */
+#define PMC_FSTI3                   (1 << 3)  /* Bit 3:  Fast Startup Input 3 */
+#define PMC_FSTI4                   (1 << 4)  /* Bit 4:  Fast Startup Input 4 */
+#define PMC_FSTI5                   (1 << 5)  /* Bit 5:  Fast Startup Input 5 */
+#define PMC_FSTI6                   (1 << 6)  /* Bit 6:  Fast Startup Input 6 */
+#define PMC_FSTI7                   (1 << 7)  /* Bit 7:  Fast Startup Input 7 */
+#define PMC_FSTI8                   (1 << 8)  /* Bit 8:  Fast Startup Input 8 */
+#define PMC_FSTI9                   (1 << 9)  /* Bit 9:  Fast Startup Input 9 */
+#define PMC_FSTI10                  (1 << 10) /* Bit 10: Fast Startup Input 10 */
+#define PMC_FSTI11                  (1 << 11) /* Bit 11: Fast Startup Input 11 */
+#define PMC_FSTI12                  (1 << 12) /* Bit 12: Fast Startup Input 12 */
+#define PMC_FSTI13                  (1 << 13) /* Bit 13: Fast Startup Input 13 */
+#define PMC_FSTI14                  (1 << 14) /* Bit 14: Fast Startup Input 14 */
+#define PMC_FSTI15                  (1 << 15) /* Bit 15: Fast Startup Input 15 */
+
+#define PMC_FSMR_RTTAL              (1 << 16) /* Bit 16: RTT Alarm Enable (MR only) */
+#define PMC_FSMR_RTCAL              (1 << 17) /* Bit 17: RTC Alarm Enable (MR only) */
+#define PMC_FSMR_USBAL              (1 << 18) /* Bit 18: USB Alarm Enable (MR only) */
+#define PMC_FSMR_LPM                (1 << 20) /* Bit 20: Low Power Mode (MR only) */
+
+/* PMC Fault Output Clear Register */
+
+#define PMC_FOCLR                   (1 << 0)  /* Bit 0:  Fault Output Clear */
+
+/* PMC Write Protect Mode Register */
+
+#define PMC_WPMR_WPEN               (1 << 0)  /* Bit 0:  Write Protect Enable */
+#define PMC_WPMR_WPKEY_SHIFT        (8)       /* Bits 8-31: Write Protect KEY */
+#define PMC_WPMR_WPKEY_MASK         (0x00ffffff << PMC_WPMR_WPKEY_SHIFT)
+
+/* PMC Write Protect Status Register */
+
+#define PMC_WPSR_WPVS               (1 << 0)  /* Bit 0:  Write Protect Violation Status */
+#define PMC_WPSR_WPVSRC_SHIFT       (8)       /* Bits 8-23: Write Protect Violation Source */
+#define PMC_WPSR_WPVSRC_MASK        (0xffff << PMC_WPSR_WPVSRC_SHIFT)
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Data
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Functions
+ ****************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PMC_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_pwm.h b/nuttx/arch/arm/src/sam34/chip/sam_pwm.h
new file mode 100644
index 000000000..fe3bf04a1
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_pwm.h
@@ -0,0 +1,633 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_pwm.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM34_CHIP_SAM_PWM_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* PWM register offsets *****************************************************************/
+
+#define SAM_PWM_CLK_OFFSET           0x000 /* PWM Clock Register */
+#define SAM_PWM_ENA_OFFSET           0x004 /* PWM Enable Register */
+#define SAM_PWM_DIS_OFFSET           0x008 /* PWM Disable Register */
+#define SAM_PWM_SR_OFFSET            0x00c /* PWM Status Register */
+#define SAM_PWM_IER1_OFFSET          0x010 /* PWM Interrupt Enable Register 1 */
+#define SAM_PWM_IDR1_OFFSET          0x014 /* PWM Interrupt Disable Register 1 */
+#define SAM_PWM_IMR1_OFFSET          0x018 /* PWM Interrupt Mask Register 1 */
+#define SAM_PWM_ISR1_OFFSET          0x01c /* PWM Interrupt Status Register 1 */
+#define SAM_PWM_SCM_OFFSET           0x020 /* PWM Sync Channels Mode Register */
+                                           /* 0x024: Reserved */
+#define SAM_PWM_SCUC_OFFSET          0x028 /* PWM Sync Channels Update Control Register */
+#define SAM_PWM_SCUP_OFFSET          0x02c /* PWM Sync Channels Update Period Register */
+#define SAM_PWM_SCUPUPD_OFFSET       0x030 /* PWM Sync Channels Update Period Update Register */
+#define SAM_PWM_IER2_OFFSET          0x034 /* PWM Interrupt Enable Register 2 */
+#define SAM_PWM_IDR2_OFFSET          0x038 /* PWM Interrupt Disable Register 2 */
+#define SAM_PWM_IMR2_OFFSET          0x03c /* PWM Interrupt Mask Register 2 */
+#define SAM_PWM_ISR2_OFFSET          0x040 /* PWM Interrupt Status Register 2 */
+#define SAM_PWM_OOV_OFFSET           0x044 /* PWM Output Override Value Register */
+#define SAM_PWM_OS_OFFSET            0x048 /* PWM Output Selection Register */
+#define SAM_PWM_OSS_OFFSET           0x04c /* PWM Output Selection Set Register */
+#define SAM_PWM_OSC_OFFSET           0x050 /* PWM Output Selection Clear Register */
+#define SAM_PWM_OSSUPD_OFFSET        0x054 /* PWM Output Selection Set Update Register */
+#define SAM_PWM_OSCUPD_OFFSET        0x058 /* PWM Output Selection Clear Update Register */
+#define SAM_PWM_FMR_OFFSET           0x05c /* PWM Fault Mode Register */
+#define SAM_PWM_FSR_OFFSET           0x060 /* PWM Fault Status Register */
+#define SAM_PWM_FCR_OFFSET           0x064 /* PWM Fault Clear Register */
+#define SAM_PWM_FPV_OFFSET           0x068 /* PWM Fault Protection Value Register */
+#define SAM_PWM_FPE_OFFSET           0x06c /* PWM Fault Protection Enable Register */
+                                           /* 0x070-0x078: Reserved */
+#define SAM_PWM_EL0MR_OFFSET         0x07c /* PWM Event Line 0 Mode Register */
+#define SAM_PWM_EL1MR_OFFSET         0x080 /* PWM Event Line 1 Mode Register */
+                                           /* 0x084-0x0ac: Reserved */
+                                           /* 0x0b4-0x0e0: Reserved */
+#define SAM_PWM_WPCR_OFFSET          0x0e4 /* PWM Write Protect Control Register */
+#define SAM_PWM_WPSR_OFFSET          0x0e8 /* PWM Write Protect Status Register */
+                                           /* 0x100-0x128: Reserved for PDC registers */
+                                           /* 0x12c: Reserved */
+/* PWM Comparison Registers */
+
+#define SAM_PWMCMP_OFFSET(n)         (0x130+((n)<<4))
+#define SAM_PWMCMP_V_OFFSET          0x00  /* PWM Comparison Value Register */
+#define SAM_PWMCMP_VUPD_OFFSET       0x04  /* PWM Comparison Value Update Register */
+#define SAM_PWMCMP_M_OFFSET          0x08  /* PWM Comparison Mode Register */
+#define SAM_PWMCMP_MUPD_OFFSET       0x0c  /* PWM Comparison Mode Update Register */
+
+#define SAM_PWMCMP0_V_OFFSET         0x130 /* PWM Comparison 0 Value Register */
+#define SAM_PWMCMP0_VUPD_OFFSET      0x134 /* PWM Comparison 0 Value Update Register */
+#define SAM_PWMCMP0_M_OFFSET         0x138 /* PWM Comparison 0 Mode Register */
+#define SAM_PWMCMP0_MUPD_OFFSET      0x13c /* PWM Comparison 0 Mode Update Register */
+
+#define SAM_PWMCMP1_V_OFFSET         0x140 /* PWM Comparison 1 Value Register */
+#define SAM_PWMCMP1_VUPD_OFFSET      0x144 /* PWM Comparison 1 Value Update Register */
+#define SAM_PWMCMP1_M_OFFSET         0x148 /* PWM Comparison 1 Mode Register */
+#define SAM_PWMCMP1_MUPD_OFFSET      0x14c /* PWM Comparison 1 Mode Update Register */
+
+#define SAM_PWMCMP2_V_OFFSET         0x150 /* PWM Comparison 2 Value Register */
+#define SAM_PWMCMP2_VUPD_OFFSET      0x154 /* PWM Comparison 2 Value Update Register */
+#define SAM_PWMCMP2_M_OFFSET         0x158 /* PWM Comparison 2 Mode Register */
+#define SAM_PWMCMP2_MUPD_OFFSET      0x15c /* PWM Comparison 2 Mode Update Register */
+
+#define SAM_PWMCMP3_V_OFFSET         0x160 /* PWM Comparison 3 Value Register */
+#define SAM_PWMCMP3_VUPD_OFFSET      0x164 /* PWM Comparison 3 Value Update Register */
+#define SAM_PWMCMP3_M_OFFSET         0x168 /* PWM Comparison 3 Mode Register */
+#define SAM_PWMCMP3_MUPD_OFFSET      0x16c /* PWM Comparison 3 Mode Update Register */
+
+#define SAM_PWMCMP4_V_OFFSET         0x170 /* PWM Comparison 4 Value Register */
+#define SAM_PWMCMP4_VUPD_OFFSET      0x174 /* PWM Comparison 4 Value Update Register */
+#define SAM_PWMCMP4_M_OFFSET         0x178 /* PWM Comparison 4 Mode Register */
+#define SAM_PWMCMP4_MUPD_OFFSET      0x17c /* PWM Comparison 4 Mode Update Register */
+
+#define SAM_PWMCMP5_V_OFFSET         0x180 /* PWM Comparison 5 Value Register */
+#define SAM_PWMCMP5_VUPD_OFFSET      0x184 /* PWM Comparison 5 Value Update Register */
+#define SAM_PWMCMP5_M_OFFSET         0x188 /* PWM Comparison 5 Mode Register */
+#define SAM_PWMCMP5_MUPD_OFFSET      0x18c /* PWM Comparison 5 Mode Update Register */
+
+#define SAM_PWMCMP6_V_OFFSET         0x190 /* PWM Comparison 6 Value Register */
+#define SAM_PWMCMP6_VUPD_OFFSET      0x194 /* PWM Comparison 6 Value Update Register */
+#define SAM_PWMCMP6_M_OFFSET         0x198 /* PWM Comparison 6 Mode Register */
+#define SAM_PWMCMP6_MUPD_OFFSET      0x19c /* PWM Comparison 6 Mode Update Register */
+
+#define SAM_PWMCMP7_V_OFFSET         0x1a0 /* PWM Comparison 7 Value Register */
+#define SAM_PWMCMP7_VUPD_OFFSET      0x1a4 /* PWM Comparison 7 Value Update Register */
+#define SAM_PWMCMP7_M_OFFSET         0x1a8 /* PWM Comparison 7 Mode Register */
+#define SAM_PWMCMP7_MUPD_OFFSET      0x1ac /* PWM Comparison 7 Mode Update Register */
+                                             /* 0x1b0-0x1fc: Reserved */
+/* PWM Channel Registers */
+
+#define SAM_PWMCH_OFFSET(n)          (0x200+((n)<< 5))
+#define SAM_PWMCH_MR_OFFSET          0x00  /* PWM Channel Mode Register */
+#define SAM_PWMCH_DTY_OFFSET         0x04  /* PWM Channel Duty Cycle Register */
+#define SAM_PWMCH_DTYUPD_OFFSET      0x08  /* PWM Channel Duty Cycle Update Register */
+#define SAM_PWMCH_PRD_OFFSET         0x0c  /* PWM Channel Period Register */
+#define SAM_PWMCH_PRDUPD_OFFSET      0x10  /* PWM Channel Period Update Register */
+#define SAM_PWMCH_CCNT_OFFSET        0x14  /* PWM Channel Counter Register */
+#define SAM_PWMCH_DT_OFFSET          0x18  /* PWM Channel Dead Time Register */
+#define SAM_PWMCH_DTUPD_OFFSET       0x1c  /* PWM Channel Dead Time Update Register */
+
+#define SAM_PWMCH0_MR_OFFSET         0x200 /* PWM Channel 0 Mode Register */
+#define SAM_PWMCH0_DTY_OFFSET        0x204 /* PWM Channel 0 Duty Cycle Register */
+#define SAM_PWMCH0_DTYUPD_OFFSET     0x208 /* PWM Channel 0 Duty Cycle Update Register */
+#define SAM_PWMCH0_PRD_OFFSET        0x20c /* PWM Channel 0 Period Register */
+#define SAM_PWMCH0_PRDUPD_OFFSET     0x210 /* PWM Channel 0 Period Update Register */
+#define SAM_PWMCH0_CCNT_OFFSET       0x214 /* PWM Channel 0 Counter Register */
+#define SAM_PWMCH0_DT_OFFSET         0x218 /* PWM Channel 0 Dead Time Register */
+#define SAM_PWMCH0_DTUPD_OFFSET      0x21c /* PWM Channel 0 Dead Time Update Register */
+
+#define SAM_PWMCH1_MR_OFFSET         0x220 /* PWM Channel 1 Mode Register */
+#define SAM_PWMCH1_DTY_OFFSET        0x224 /* PWM Channel 1 Duty Cycle Register */
+#define SAM_PWMCH1_DTYUPD_OFFSET     0x228 /* PWM Channel 1 Duty Cycle Update Register */
+#define SAM_PWMCH1_PRD_OFFSET        0x22c /* PWM Channel 1 Period Register */
+#define SAM_PWMCH1_PRDUPD_OFFSET     0x230 /* PWM Channel 1 Period Update Register */
+#define SAM_PWMCH1_CCNT_OFFSET       0x234 /* PWM Channel 1 Counter Register */
+#define SAM_PWMCH1_DT_OFFSET         0x238 /* PWM Channel 1 Dead Time Register */
+#define SAM_PWMCH1_DTUPD_OFFSET      0x23c /* PWM Channel 1 Dead Time Update Register */
+
+#define SAM_PWMCH2_MR_OFFSET         0x240 /* PWM Channel 2 Mode Register */
+#define SAM_PWMCH2_DTY_OFFSET        0x244 /* PWM Channel 2 Duty Cycle Register */
+#define SAM_PWMCH2_DTYUPD_OFFSET     0x248 /* PWM Channel 2 Duty Cycle Update Register */
+#define SAM_PWMCH2_PRD_OFFSET        0x24c /* PWM Channel 2 Period Register */
+#define SAM_PWMCH2_PRDUPD_OFFSET     0x250 /* PWM Channel 2 Period Update Register */
+#define SAM_PWMCH2_CCNT_OFFSET       0x254 /* PWM Channel 2 Counter Register */
+#define SAM_PWMCH2_DT_OFFSET         0x258 /* PWM Channel 2 Dead Time Register */
+#define SAM_PWMCH2_DTUPD_OFFSET      0x25c /* PWM Channel 2 Dead Time Update Register */
+
+#define SAM_PWMCH3_MR_OFFSET         0x260 /* PWM Channel 3 Mode Register */
+#define SAM_PWMCH3_DTY_OFFSET        0x264 /* PWM Channel 3 Duty Cycle Register */
+#define SAM_PWMCH3_DTYUPD_OFFSET     0x268 /* PWM Channel 3 Duty Cycle Update Register */
+#define SAM_PWMCH3_PRD_OFFSET        0x26c /* PWM Channel 3 Period Register */
+#define SAM_PWMCH3_PRDUPD_OFFSET     0x270 /* PWM Channel 3 Period Update Register */
+#define SAM_PWMCH3_CCNT_OFFSET       0x274 /* PWM Channel 3 Counter Register */
+#define SAM_PWMCH3_DT_OFFSET         0x278 /* PWM Channel 3 Dead Time Register */
+#define SAM_PWMCH3_DTUPD_OFFSET      0x27c /* PWM Channel 3 Dead Time Update Register */
+
+/* PWM register adresses ****************************************************************/
+
+#define SAM_PWM_CLK                  (SAM_PWM_BASE+SAM_PWM_CLK_OFFSET)
+#define SAM_PWM_ENA                  (SAM_PWM_BASE+SAM_PWM_ENA_OFFSET)
+#define SAM_PWM_DIS                  (SAM_PWM_BASE+SAM_PWM_DIS_OFFSET)
+#define SAM_PWM_SR                   (SAM_PWM_BASE+SAM_PWM_SR_OFFSET)
+#define SAM_PWM_IER1                 (SAM_PWM_BASE+SAM_PWM_IER1_OFFSET)
+#define SAM_PWM_IDR1                 (SAM_PWM_BASE+SAM_PWM_IDR1_OFFSET)
+#define SAM_PWM_IMR1                 (SAM_PWM_BASE+SAM_PWM_IMR1_OFFSET)
+#define SAM_PWM_ISR1                 (SAM_PWM_BASE+SAM_PWM_ISR1_OFFSET)
+#define SAM_PWM_SCM                  (SAM_PWM_BASE+SAM_PWM_SCM_OFFSET)
+#define SAM_PWM_SCUC                 (SAM_PWM_BASE+SAM_PWM_SCUC_OFFSET)
+#define SAM_PWM_SCUP                 (SAM_PWM_BASE+SAM_PWM_SCUP_OFFSET)
+#define SAM_PWM_SCUPUPD              (SAM_PWM_BASE+SAM_PWM_SCUPUPD_OFFSET)
+#define SAM_PWM_IER2                 (SAM_PWM_BASE+SAM_PWM_IER2_OFFSET)
+#define SAM_PWM_IDR2                 (SAM_PWM_BASE+SAM_PWM_IDR2_OFFSET)
+#define SAM_PWM_IMR2                 (SAM_PWM_BASE+SAM_PWM_IMR2_OFFSET)
+#define SAM_PWM_ISR2                 (SAM_PWM_BASE+SAM_PWM_ISR2_OFFSET)
+#define SAM_PWM_OOV                  (SAM_PWM_BASE+SAM_PWM_OOV_OFFSET)
+#define SAM_PWM_OS                   (SAM_PWM_BASE+SAM_PWM_OS_OFFSET)
+#define SAM_PWM_OSS                  (SAM_PWM_BASE+SAM_PWM_OSS_OFFSET)
+#define SAM_PWM_OSC                  (SAM_PWM_BASE+SAM_PWM_OSC_OFFSET)
+#define SAM_PWM_OSSUPD               (SAM_PWM_BASE+SAM_PWM_OSSUPD_OFFSET)
+#define SAM_PWM_OSCUPD               (SAM_PWM_BASE+SAM_PWM_OSCUPD_OFFSET)
+#define SAM_PWM_FMR                  (SAM_PWM_BASE+SAM_PWM_FMR_OFFSET)
+#define SAM_PWM_FSR                  (SAM_PWM_BASE+SAM_PWM_FSR_OFFSET)
+#define SAM_PWM_FCR                  (SAM_PWM_BASE+SAM_PWM_FCR_OFFSET)
+#define SAM_PWM_FPV                  (SAM_PWM_BASE+SAM_PWM_FPV_OFFSET)
+#define SAM_PWM_FPE                  (SAM_PWM_BASE+SAM_PWM_FPE_OFFSET)
+#define SAM_PWM_EL0MR                (SAM_PWM_BASE+SAM_PWM_EL0MR_OFFSET)
+#define SAM_PWM_EL1MR                (SAM_PWM_BASE+SAM_PWM_EL1MR_OFFSET)
+#define SAM_PWM_WPCR                 (SAM_PWM_BASE+SAM_PWM_WPCR_OFFSET)
+#define SAM_PWM_WPSR                 (SAM_PWM_BASE+SAM_PWM_WPSR_OFFSET)
+
+/* PWM Comparison Registers */
+
+#define SAM_PWCMP_BASE(n)            (SAM_PWM_BASE+SAM_PWCMP_OFFSET(n))
+#define SAM_PWMCMP0_BASE             (SAM_PWM_BASE+0x0130)
+#define SAM_PWMCMP1_BASE             (SAM_PWM_BASE+0x0140)
+#define SAM_PWMCMP2_BASE             (SAM_PWM_BASE+0x0150)
+#define SAM_PWMCMP3_BASE             (SAM_PWM_BASE+0x0160)
+#define SAM_PWMCMP4_BASE             (SAM_PWM_BASE+0x0170)
+#define SAM_PWMCMP5_BASE             (SAM_PWM_BASE+0x0180)
+#define SAM_PWMCMP6_BASE             (SAM_PWM_BASE+0x0190)
+#define SAM_PWMCMP7_BASE             (SAM_PWM_BASE+0x01a0)
+
+#define SAM_PWMCMP0_V                (SAM_PWMCMP0_BASE+SAM_PWMCMP_V_OFFSET)
+#define SAM_PWMCMP0_VUPD             (SAM_PWMCMP0_BASE+SAM_PWMCMP_VUPD_OFFSET)
+#define SAM_PWMCMP0_M                (SAM_PWMCMP0_BASE+SAM_PWMCMP_M_OFFSET)
+#define SAM_PWMCMP0_MUPD             (SAM_PWMCMP0_BASE+SAM_PWMCMP_MUPD_OFFSET)
+
+#define SAM_PWMCMP1_V                (SAM_PWMCMP1_BASE+SAM_PWMCMP_V_OFFSET)
+#define SAM_PWMCMP1_VUPD             (SAM_PWMCMP1_BASE+SAM_PWMCMP_VUPD_OFFSET)
+#define SAM_PWMCMP1_M                (SAM_PWMCMP1_BASE+SAM_PWMCMP_M_OFFSET)
+#define SAM_PWMCMP1_MUPD             (SAM_PWMCMP1_BASE+SAM_PWMCMP_MUPD_OFFSET)
+
+#define SAM_PWMCMP2_V                (SAM_PWMCMP2_BASE+SAM_PWMCMP_V_OFFSET)
+#define SAM_PWMCMP2_VUPD             (SAM_PWMCMP2_BASE+SAM_PWMCMP_VUPD_OFFSET)
+#define SAM_PWMCMP2_M                (SAM_PWMCMP2_BASE+SAM_PWMCMP_M_OFFSET)
+#define SAM_PWMCMP2_MUPD             (SAM_PWMCMP2_BASE+SAM_PWMCMP_MUPD_OFFSET)
+
+#define SAM_PWMCMP3_V                (SAM_PWMCMP3_BASE+SAM_PWMCMP_V_OFFSET)
+#define SAM_PWMCMP3_VUPD             (SAM_PWMCMP3_BASE+SAM_PWMCMP_VUPD_OFFSET)
+#define SAM_PWMCMP3_M                (SAM_PWMCMP3_BASE+SAM_PWMCMP_M_OFFSET)
+#define SAM_PWMCMP3_MUPD             (SAM_PWMCMP3_BASE+SAM_PWMCMP_MUPD_OFFSET)
+
+#define SAM_PWMCMP4_V                (SAM_PWMCMP4_BASE+SAM_PWMCMP_V_OFFSET)
+#define SAM_PWMCMP4_VUPD             (SAM_PWMCMP4_BASE+SAM_PWMCMP_VUPD_OFFSET)
+#define SAM_PWMCMP4_M                (SAM_PWMCMP4_BASE+SAM_PWMCMP_M_OFFSET)
+#define SAM_PWMCMP4_MUPD             (SAM_PWMCMP4_BASE+SAM_PWMCMP_MUPD_OFFSET)
+
+#define SAM_PWMCMP5_V                (SAM_PWMCMP5_BASE+SAM_PWMCMP_V_OFFSET)
+#define SAM_PWMCMP5_VUPD             (SAM_PWMCMP5_BASE+SAM_PWMCMP_VUPD_OFFSET)
+#define SAM_PWMCMP5_M                (SAM_PWMCMP5_BASE+SAM_PWMCMP_M_OFFSET)
+#define SAM_PWMCMP5_MUPD             (SAM_PWMCMP5_BASE+SAM_PWMCMP_MUPD_OFFSET)
+
+#define SAM_PWMCMP6_V                (SAM_PWMCMP6_BASE+SAM_PWMCMP_V_OFFSET)
+#define SAM_PWMCMP6_VUPD             (SAM_PWMCMP6_BASE+SAM_PWMCMP_VUPD_OFFSET)
+#define SAM_PWMCMP6_M                (SAM_PWMCMP6_BASE+SAM_PWMCMP_M_OFFSET)
+#define SAM_PWMCMP6_MUPD             (SAM_PWMCMP6_BASE+SAM_PWMCMP_MUPD_OFFSET)
+
+#define SAM_PWMCMP7_V                (SAM_PWMCMP7_BASE+SAM_PWMCMP_V_OFFSET)
+#define SAM_PWMCMP7_VUPD             (SAM_PWMCMP7_BASE+SAM_PWMCMP_VUPD_OFFSET)
+#define SAM_PWMCMP7_M                (SAM_PWMCMP7_BASE+SAM_PWMCMP_M_OFFSET)
+#define SAM_PWMCMP7_MUPD             (SAM_PWMCMP7_BASE+SAM_PWMCMP_MUPD_OFFSET)
+
+/* PWM Channel Registers */
+
+#define SAM_PWCH_BASE(n)             (SAM_PWM_BASE+SAM_PWCH_OFFSET(n))
+#define SAM_PWMCH0_BASE              (SAM_PWM_BASE+0x0200)
+#define SAM_PWMCH1_BASE              (SAM_PWM_BASE+0x0220)
+#define SAM_PWMCH2_BASE              (SAM_PWM_BASE+0x0240)
+#define SAM_PWMCH3_BASE              (SAM_PWM_BASE+0x0260)
+
+#define SAM_PWMCH0_MR                (SAM_PWMCH0_BASE+SAM_PWMCH_MR_OFFSET)
+#define SAM_PWMCH0_DTY               (SAM_PWMCH0_BASE+SAM_PWMCH_DTY_OFFSET)
+#define SAM_PWMCH0_DTYUPD            (SAM_PWMCH0_BASE+SAM_PWMCH_DTYUPD_OFFSET)
+#define SAM_PWMCH0_PRD               (SAM_PWMCH0_BASE+SAM_PWMCH_PRD_OFFSET)
+#define SAM_PWMCH0_PRDUPD            (SAM_PWMCH0_BASE+SAM_PWMCH_PRDUPD_OFFSET)
+#define SAM_PWMCH0_CCNT              (SAM_PWMCH0_BASE+SAM_PWMCH_CCNT_OFFSET)
+#define SAM_PWMCH0_DT                (SAM_PWMCH0_BASE+SAM_PWMCH_DT_OFFSET)
+#define SAM_PWMCH0_DTUPD             (SAM_PWMCH0_BASE+SAM_PWMCH_DTUPD_OFFSET)
+
+#define SAM_PWMCH1_MR                (SAM_PWMCH1_BASE+SAM_PWMCH_MR_OFFSET)
+#define SAM_PWMCH1_DTY               (SAM_PWMCH1_BASE+SAM_PWMCH_DTY_OFFSET)
+#define SAM_PWMCH1_DTYUPD            (SAM_PWMCH1_BASE+SAM_PWMCH_DTYUPD_OFFSET)
+#define SAM_PWMCH1_PRD               (SAM_PWMCH1_BASE+SAM_PWMCH_PRD_OFFSET)
+#define SAM_PWMCH1_PRDUPD            (SAM_PWMCH1_BASE+SAM_PWMCH_PRDUPD_OFFSET)
+#define SAM_PWMCH1_CCNT              (SAM_PWMCH1_BASE+SAM_PWMCH_CCNT_OFFSET)
+#define SAM_PWMCH1_DT                (SAM_PWMCH1_BASE+SAM_PWMCH_DT_OFFSET)
+#define SAM_PWMCH1_DTUPD             (SAM_PWMCH1_BASE+SAM_PWMCH_DTUPD_OFFSET)
+
+#define SAM_PWMCH2_MR                (SAM_PWMCH2_BASE+SAM_PWMCH_MR_OFFSET)
+#define SAM_PWMCH2_DTY               (SAM_PWMCH2_BASE+SAM_PWMCH_DTY_OFFSET)
+#define SAM_PWMCH2_DTYUPD            (SAM_PWMCH2_BASE+SAM_PWMCH_DTYUPD_OFFSET)
+#define SAM_PWMCH2_PRD               (SAM_PWMCH2_BASE+SAM_PWMCH_PRD_OFFSET)
+#define SAM_PWMCH2_PRDUPD            (SAM_PWMCH2_BASE+SAM_PWMCH_PRDUPD_OFFSET)
+#define SAM_PWMCH2_CCNT              (SAM_PWMCH2_BASE+SAM_PWMCH_CCNT_OFFSET)
+#define SAM_PWMCH2_DT                (SAM_PWMCH2_BASE+SAM_PWMCH_DT_OFFSET)
+#define SAM_PWMCH2_DTUPD             (SAM_PWMCH2_BASE+SAM_PWMCH_DTUPD_OFFSET)
+
+#define SAM_PWMCH3_MR                (SAM_PWMCH3_BASE+SAM_PWMCH_MR_OFFSET)
+#define SAM_PWMCH3_DTY               (SAM_PWMCH3_BASE+SAM_PWMCH_DTY_OFFSET)
+#define SAM_PWMCH3_DTYUPD            (SAM_PWMCH3_BASE+SAM_PWMCH_DTYUPD_OFFSET)
+#define SAM_PWMCH3_PRD               (SAM_PWMCH3_BASE+SAM_PWMCH_PRD_OFFSET)
+#define SAM_PWMCH3_PRDUPD            (SAM_PWMCH3_BASE+SAM_PWMCH_PRDUPD_OFFSET)
+#define SAM_PWMCH3_CCNT              (SAM_PWMCH3_BASE+SAM_PWMCH_CCNT_OFFSET)
+#define SAM_PWMCH3_DT                (SAM_PWMCH3_BASE+SAM_PWMCH_DT_OFFSET)
+#define SAM_PWMCH3_DTUPD             (SAM_PWMCH3_BASE+SAM_PWMCH_DTUPD_OFFSET)
+
+/* PWM register bit definitions *********************************************************/
+
+/* PWM Clock Register */
+
+#define PWM_CLK_DIVA_SHIFT           (0)       /* Bits 0-7: CLKA Divide Factor */
+#define PWM_CLK_DIVA_MASK            (0xff << PWM_CLK_DIVA_SHIFT)
+#define PWM_CLK_PREA_SHIFT           (8)       /* Bits 8-11: CLKA Source Clock Selection */
+#define PWM_CLK_PREA_MASK            (15 << PWM_CLK_PREA_SHIFT)
+#  define PWM_CLK_PREA_MCK           (0  << PWM_CLK_PREA_SHIFT) /* MCK */
+#  define PWM_CLK_PREA_MCKDIV2       (1  << PWM_CLK_PREA_SHIFT) /* MCK/2 */
+#  define PWM_CLK_PREA_MCKDIV4       (2  << PWM_CLK_PREA_SHIFT) /* MCK/4 */
+#  define PWM_CLK_PREA_MCKDIV8       (3  << PWM_CLK_PREA_SHIFT) /* MCK/8 */
+#  define PWM_CLK_PREA_MCKDIV16      (4  << PWM_CLK_PREA_SHIFT) /* MCK/16 */
+#  define PWM_CLK_PREA_MCKDIV32      (5  << PWM_CLK_PREA_SHIFT) /* MCK/32 */
+#  define PWM_CLK_PREA_MCKDIV64      (6  << PWM_CLK_PREA_SHIFT) /* MCK/64 */
+#  define PWM_CLK_PREA_MCKDIV128     (7  << PWM_CLK_PREA_SHIFT) /* MCK/128 */
+#  define PWM_CLK_PREA_MCKDIV256     (8  << PWM_CLK_PREA_SHIFT) /* MCK/256 */
+#  define PWM_CLK_PREA_MCKDIV512     (9  << PWM_CLK_PREA_SHIFT) /* MCK/512 */
+#  define PWM_CLK_PREA_MCKDIV1024    (10 << PWM_CLK_PREA_SHIFT) /* MCK/1024 */
+#define PWM_CLK_DIVB_SHIFT           (16)      /* Bits 16-23: CLKB Divide Factor */
+#define PWM_CLK_DIVB_MASK            (0xff << PWM_CLK_DIVB_SHIFT)
+#define PWM_CLK_PREB_SHIFT           (24)      /* Bit 24-27: CLKB Source Clock Selection */
+#define PWM_CLK_PREB_MASK            (15 << PWM_CLK_PREB_SHIFT)
+#  define PWM_CLK_PREB_MCK           (0  << PWM_CLK_PREB_SHIFT) /* MCK */
+#  define PWM_CLK_PREB_MCKDIV2       (1  << PWM_CLK_PREB_SHIFT) /* MCK/2 */
+#  define PWM_CLK_PREB_MCKDIV4       (2  << PWM_CLK_PREB_SHIFT) /* MCK/4 */
+#  define PWM_CLK_PREB_MCKDIV8       (3  << PWM_CLK_PREB_SHIFT) /* MCK/8 */
+#  define PWM_CLK_PREB_MCKDIV16      (4  << PWM_CLK_PREB_SHIFT) /* MCK/16 */
+#  define PWM_CLK_PREB_MCKDIV32      (5  << PWM_CLK_PREB_SHIFT) /* MCK/32 */
+#  define PWM_CLK_PREB_MCKDIV64      (6  << PWM_CLK_PREB_SHIFT) /* MCK/64 */
+#  define PWM_CLK_PREB_MCKDIV128     (7  << PWM_CLK_PREB_SHIFT) /* MCK/128 */
+#  define PWM_CLK_PREB_MCKDIV256     (8  << PWM_CLK_PREB_SHIFT) /* MCK/256 */
+#  define PWM_CLK_PREB_MCKDIV512     (9  << PWM_CLK_PREB_SHIFT) /* MCK/512 */
+#  define PWM_CLK_PREB_MCKDIV1024    (10 << PWM_CLK_PREB_SHIFT) /* MCK/1024 */
+
+/* PWM Enable Register, PWM Disable Register, and PWM Status Register common bit-field definitions */
+
+#define SAM_ENAB_CHID(n)             (1 << ((n))
+#define SAM_ENAB_CHID0               (1 << 0)  /* Bit 0:  Counter Event Channel 0 Interrupt */
+#define SAM_ENAB_CHID1               (1 << 1)  /* Bit 1:  Counter Event Channel 1 Interrupt */
+#define SAM_ENAB_CHID2               (1 << 2)  /* Bit 2:  Counter Event Channel 2 Interrupt */
+#define SAM_ENAB_CHID3               (1 << 3)  /* Bit 3:  Counter Event Channel 3 Interrupt */
+
+/* PWM Interrupt Enable Register 1, PWM Interrupt Disable Register 1, PWM Interrupt
+ * Mask Register 1, and PWM Interrupt Status Register 1 common bit definitions
+ */
+
+#define SAM_INT_CHID(n)              (1 << (n))
+#define SAM_INT_CHID0                (1 << 0)  /* Bit 0:  Counter Event Channel 0 Interrupt */
+#define SAM_INT_CHID1                (1 << 1)  /* Bit 1:  Counter Event Channel 1 Interrupt */
+#define SAM_INT_CHID2                (1 << 2)  /* Bit 2:  Counter Event Channel 2 Interrupt */
+#define SAM_INT_CHID3                (1 << 3)  /* Bit 3:  Counter Event Channel 3 Interrupt */
+#define SAM_INT_FCHID(n)             (1 << ((n)+16))
+#define SAM_INT_FCHID0               (1 << 16) /* Bit 16: Fault Protection Trigger Channel 0 Interrupt */
+#define SAM_INT_FCHID1               (1 << 17) /* Bit 17: Fault Protection Trigger Channel 1 Interrupt */
+#define SAM_INT_FCHID2               (1 << 18) /* Bit 18: Fault Protection Trigger Channel 2 Interrupt */
+#define SAM_INT_FCHID3               (1 << 19) /* Bit 19: Fault Protection Trigger Channel 3 Interrupt */
+
+/* PWM Sync Channels Mode Register */
+
+#define PWM_SCM_SYNC(n)              (1 << (n))
+#define PWM_SCM_SYNC0                (1 << 0)  /* Bit 0:  Synchronous Channel 0 */
+#define PWM_SCM_SYNC1                (1 << 1)  /* Bit 1:  Synchronous Channel 1 */
+#define PWM_SCM_SYNC2                (1 << 2)  /* Bit 2:  Synchronous Channel 2 */
+#define PWM_SCM_SYNC3                (1 << 3)  /* Bit 3:  Synchronous Channel 3 */
+#define PWM_SCM_UPDM_SHIFT           (16)      /* Bits 16-17: Synchronous Channels Update Mode */
+#define PWM_SCM_UPDM_MASK            (3 << PWM_SCM_UPDM_SHIFT)
+#  define PWM_SCM_UPDM_MANMAN        (0 << PWM_SCM_UPDM_SHIFT) /* Manual write/manual update */
+#  define PWM_SCM_UPDM_MANAUTO       (1 << PWM_SCM_UPDM_SHIFT) /* Manual write/automatic update */
+#  define PWM_SCM_UPDM_AUTOAUTO      (2 << PWM_SCM_UPDM_SHIFT) /* Auto write/automatic update */
+#define PWM_SCM_PTRM                 (1 << 20) /* Bit 20: PDC Transfer Request Mode */
+#define PWM_SCM_PTRCS_SHIFT          (21)      /* Bits 21-23: PDC Transfer Request Comparison Selection */
+#define PWM_SCM_PTRCS_MASK           (7 << PWM_SCM_PTRCS_SHIFT)
+
+/* PWM Sync Channels Update Control Register */
+
+#define PWM_SCUC_UPDULOCK            (1 << 0)  /* Bit 0:  Synchronous Channels Update Unlock */
+
+/* PWM Sync Channels Update Period Register */
+
+#define PWM_SCUP_UPR_SHIFT           (0)       /* Bits 0-3:  Update Period */
+#define PWM_SCUP_UPR_MASK            (15 << PWM_SCUP_UPR_MASK)
+#define PWM_SCUP_UPRCNT_SHIFT        (4)       /* Bits 4-7:  Update Period Counter */
+#define PWM_SCUP_UPRCNT_MASK         (15 << PWM_SCUP_UPRCNT_SHIFT)
+
+/* PWM Sync Channels Update Period Update Register */
+
+#define PWM_SCUPUPD_SHIFT            (0)       /* Bits 0-3: Update Period Update */
+#define PWM_SCUPUPD_MASK             (15 << PWM_SCUPUPD_SHIFT)
+
+/* PWM Interrupt Enable Register 2, PWM Interrupt Disable Register 2, PWM Interrupt Mask Register 2, and PWM Interrupt Status Register 2 common bit-field definitions */
+
+#define SAM_INT_WRDY                 (1 << 0)  /* Bit 0:  Write Ready Update Interrupt */
+#define SAM_INT_ENDTX                (1 << 1)  /* Bit 1:  PDC End of TX Buffer Interrupt */
+#define SAM_INT_TXBUFE               (1 << 2)  /* Bit 2:  PDC TX Buffer Empty Interrupt */
+#define SAM_INT_UNRE                 (1 << 3)  /* Bit 3:  Synch Update Underrun Error Interrupt */
+#define SAM_INT_CMPM(n)              (1 << ((n)+8))
+#define SAM_INT_CMPM0                (1 << 8)  /* Bit 8:  Comparison 0 Match Interrupt */
+#define SAM_INT_CMPM1                (1 << 9)  /* Bit 9:  Comparison 1 Match Interrupt */
+#define SAM_INT_CMPM2                (1 << 10) /* Bit 10: Comparison 2 Match Interrupt */
+#define SAM_INT_CMPM3                (1 << 11) /* Bit 11: Comparison 3 Match Interrupt */
+#define SAM_INT_CMPM4                (1 << 12) /* Bit 12: Comparison 4 Match Interrupt */
+#define SAM_INT_CMPM5                (1 << 13) /* Bit 13: Comparison 5 Match Interrupt */
+#define SAM_INT_CMPM6                (1 << 14) /* Bit 14: Comparison 6 Match Interrupt */
+#define SAM_INT_CMPM7                (1 << 15) /* Bit 15: Comparison 7 Match Interrupt */
+#define SAM_INT_CMPU(n)              (1 << ((n)+16))
+#define SAM_INT_CMPU0                (1 << 16) /* Bit 16: Comparison o Update Interrupt */
+#define SAM_INT_CMPU1                (1 << 17) /* Bit 17: Comparison 1 Update Interrupt */
+#define SAM_INT_CMPU2                (1 << 18) /* Bit 18: Comparison 2 Update Interrupt */
+#define SAM_INT_CMPU3                (1 << 19) /* Bit 19: Comparison 3 Update Interrupt */
+#define SAM_INT_CMPU4                (1 << 20) /* Bit 20: Comparison 4 Update Interrupt */
+#define SAM_INT_CMPU5                (1 << 21) /* Bit 21: Comparison 5 Update Interrupt */
+#define SAM_INT_CMPU6                (1 << 22) /* Bit 22: Comparison 6 Update Interrupt */
+#define SAM_INT_CMPU7                (1 << 23) /* Bit 23: Comparison 7 Update Interrupt */
+
+/* PWM Output Override Value Register, PWM Output Selection Register, PWM Output
+ * Selection Set Register, PWM Output Selection Clear Register, PWM Output Selection
+ * Set Update Register,  and PWM Output Selection Clear Update Register common bit-field
+ * definitions
+ */
+
+#define PWM_OUT_OH(n)                (1 << (n))
+#define PWM_OUT_OH0                  (1 << 0)  /* Bit 0:  Value for PWMH output of the channel 0 */
+#define PWM_OUT_OH1                  (1 << 1)  /* Bit 1:  Value for PWMH output of the channel 1 */
+#define PWM_OUT_OH2                  (1 << 2)  /* Bit 2:  Value for PWMH output of the channel 2 */
+#define PWM_OUT_OH3                  (1 << 3)  /* Bit 3:  Value for PWMH output of the channel 3 */
+#define PWM_OUT_OL(n)                (1 << ((n)+16))
+#define PWM_OUT_OL0                  (1 << 16) /* Bit 16: Value for PWML output of the channel 0 */
+#define PWM_OUT_OL1                  (1 << 17) /* Bit 17: Value for PWML output of the channel 1 */
+#define PWM_OUT_OL2                  (1 << 18) /* Bit 18: Value for PWML output of the channel 2 */
+#define PWM_OUT_OL3                  (1 << 19) /* Bit 19: Value for PWML output of the channel 3 */
+
+/* PWM Fault Mode Register */
+
+#define PWM_FMR_FPOL(n)              (1 << (n))
+#define PWM_FMR_FPOL0                (1 << 0)  /* Bit 0:  Fault 0 Polarity */
+#define PWM_FMR_FPOL1                (1 << 1)  /* Bit 1:  Fault 1 Polarity */
+#define PWM_FMR_FPOL2                (1 << 2)  /* Bit 2:  Fault 2 Polarity */
+#define PWM_FMR_FPOL3                (1 << 3)  /* Bit 3:  Fault 3 Polarity */
+#define PWM_FMR_FMOD(n)              (1 << ((n)+8))
+#define PWM_FMR_FMOD0                (1 << 8)  /* Bit 8:  Fault 0 Activation Mode */
+#define PWM_FMR_FMOD1                (1 << 9)  /* Bit 9:  Fault 1 Activation Mode */
+#define PWM_FMR_FMOD2                (1 << 10) /* Bit 10: Fault 2 Activation Mode */
+#define PWM_FMR_FMOD3                (1 << 11) /* Bit 11: Fault 3 Activation Mode */
+#define PWM_FMR_FFIL(n)              (1 << ((n)+16))
+#define PWM_FMR_FFIL0                (1 << 16) /* Bit 16: Fault 0 Filter */
+#define PWM_FMR_FFIL1                (1 << 17) /* Bit 17: Fault 1 Filter */
+#define PWM_FMR_FFIL2                (1 << 18) /* Bit 18: Fault 2 Filter */
+#define PWM_FMR_FFIL3                (1 << 19) /* Bit 19: Fault 3 Filter */
+
+/* PWM Fault Status Register */
+
+#define PWM_FSR_FIV(n)               (1 << (n))
+#define PWM_FSR_FIV0                 (1 << 0)  /* Bit 0:  Fault Input 0 Value */
+#define PWM_FSR_FIV1                 (1 << 1)  /* Bit 1:  Fault Input 1 Value */
+#define PWM_FSR_FIV2                 (1 << 2)  /* Bit 2:  Fault Input 2 Value */
+#define PWM_FSR_FIV3                 (1 << 3)  /* Bit 3:  Fault Input 3 Value */
+#define PWM_FSR_FS(n)                (1 << ((n)+8))
+#define PWM_FSR_FS0                  (1 << 8)  /* Bit 8:  Fault 0 Status */
+#define PWM_FSR_FS1                  (1 << 9)  /* Bit 9:  Fault 1 Status */
+#define PWM_FSR_FS2                  (1 << 10) /* Bit 10: Fault 2 Status */
+#define PWM_FSR_FS3                  (1 << 11) /* Bit 11: Fault 3 Status */
+
+/* PWM Fault Clear Register */
+
+#define PWM_FCR_FCLR(n)              (1 << (n))
+#define PWM_FCR_FCLR0                (1 << 0)  /* Bit 0:  Fault 0 Clear */
+#define PWM_FCR_FCLR1                (1 << 1)  /* Bit 1:  Fault 1 Clear */
+#define PWM_FCR_FCLR2                (1 << 2)  /* Bit 2:  Fault 2 Clear */
+#define PWM_FCR_FCLR3                (1 << 3)  /* Bit 3:  Fault 3 Clear */
+
+/* PWM Fault Protection Value Register */
+
+#define PWM_FPV_FPVH(n)              (1 << (n))
+#define PWM_FPV_FPVH0                (1 << 0)  /* Bit 0:  Fault Protection Value PWMH output channel 0 */
+#define PWM_FPV_FPVH1                (1 << 1)  /* Bit 1:  Fault Protection Value PWMH output channel 1 */
+#define PWM_FPV_FPVH2                (1 << 2)  /* Bit 2:  Fault Protection Value PWMH output channel 2 */
+#define PWM_FPV_FPVH3                (1 << 3)  /* Bit 3:  Fault Protection Value PWMH output channel 3 */
+#define PWM_FPV_FPVL(n)              (1 << ((n)+16))
+#define PWM_FPV_FPVL0                (1 << 16) /* Bit 16: Fault Protection Value PWML output channel 0 */
+#define PWM_FPV_FPVL1                (1 << 17) /* Bit 17: Fault Protection Value PWML output channel 1 */
+#define PWM_FPV_FPVL2                (1 << 18) /* Bit 18: Fault Protection Value PWML output channel 2 */
+#define PWM_FPV_FPVL3                (1 << 19) /* Bit 19: Fault Protection Value PWML output channel 3 */
+
+/* PWM Fault Protection Enable Register */
+
+#define PWM_FPE_FPEN(n,y)            (1 << (((n)<<8)+y))
+#define PWM_FPE_FPE0(y)              (1 << (y))      /* Bits 0-7:   Fault Protection Enable Fault=y chan=0 */
+#define PWM_FPE_FPE1(y)              (1 << ((y)+8))  /* Bits 8-15:  Fault Protection Enable Fault=y chan=1 */
+#define PWM_FPE_FPE2(y)              (1 << ((y)+16)) /* Bits 16-23: Fault Protection Enable Fault=y chan=2 */
+#define PWM_FPE_FPE3(y)              (1 << ((y)+24)  /* Bits 24-31: Fault Protection Enable Fault=y chan=3 */
+
+/* PWM Event Line 1/2 Register */
+
+#define PWM_ELMR_CSEL(n)             (1 << (n))
+#define PWM_ELMR_CSEL0               (1 << 0)  /* Bit 0:  Comparison 0 Selection */
+#define PWM_ELMR_CSEL1               (1 << 1)  /* Bit 1:  Comparison 1 Selection */
+#define PWM_ELMR_CSEL2               (1 << 2)  /* Bit 2:  Comparison 2 Selection */
+#define PWM_ELMR_CSEL3               (1 << 3)  /* Bit 3:  Comparison 3 Selection */
+#define PWM_ELMR_CSEL4               (1 << 4)  /* Bit 4:  Comparison 4 Selection */
+#define PWM_ELMR_CSEL5               (1 << 5)  /* Bit 5:  Comparison 5 Selection */
+#define PWM_ELMR_CSEL6               (1 << 6)  /* Bit 6:  Comparison 6 Selection */
+#define PWM_ELMR_CSEL7               (1 << 7)  /* Bit 7:  Comparison 7 Selection */
+
+/* PWM Write Protect Control Register */
+
+#define PWM_WPCR_WPCMD_SHIFT         (0)       /* Bits 0-1: Write Protect Command */
+#define PWM_WPCR_WPCMD_MASK          (3 << PWM_WPCR_WPCMD_SHIFT)
+#define PWM_WPCR_WPRG(n)             (1 << ((n)+2))
+#define PWM_WPCR_WPRG0               (1 << 2)  /* Bit 2:  Write Protect Register Group 0 */
+#define PWM_WPCR_WPRG1               (1 << 3)  /* Bit 3:  Write Protect Register Group 1 */
+#define PWM_WPCR_WPRG2               (1 << 4)  /* Bit 4:  Write Protect Register Group 2 */
+#define PWM_WPCR_WPRG3               (1 << 5)  /* Bit 5:  Write Protect Register Group 3 */
+#define PWM_WPCR_WPRG4               (1 << 6)  /* Bit 6:  Write Protect Register Group 4 */
+#define PWM_WPCR_WPRG5               (1 << 7)  /* Bit 7:  Write Protect Register Group 5 */
+#define PWM_WPCR_WPKEY_SHIFT         (8)       /* Bits 8-31:  Write Protect Key */
+#define PWM_WPCR_WPKEY_MASK          (0x00ffffff << PWM_WPCR_WPKEY_SHIFT)
+
+/* PWM Write Protect Status Register */
+
+#define PWM_WPSR_WPSWS(n)            (1 << (n))
+#define PWM_WPSR_WPSWS0              (1 << 0)  /* Bit 0:  Write Protect SW Status */
+#define PWM_WPSR_WPSWS1              (1 << 1)  /* Bit 1:  Write Protect SW Status */
+#define PWM_WPSR_WPSWS2              (1 << 2)  /* Bit 2:  Write Protect SW Status */
+#define PWM_WPSR_WPSWS3              (1 << 3)  /* Bit 3:  Write Protect SW Status */
+#define PWM_WPSR_WPSWS4              (1 << 4)  /* Bit 4:  Write Protect SW Status */
+#define PWM_WPSR_WPSWS5              (1 << 5)  /* Bit 5:  Write Protect SW Status */
+#define PWM_WPSR_WPVS                (1 << 7)  /* Bit 7:  Write Protect Violation Status */
+#define PWM_WPSR_WPHWS(n)            (1 << ((n)+8))
+#define PWM_WPSR_WPHWS0              (1 << 8)  /* Bit 8:  Write Protect HW Status */
+#define PWM_WPSR_WPHWS1              (1 << 9)  /* Bit 9:  Write Protect HW Status */
+#define PWM_WPSR_WPHWS2              (1 << 10) /* Bit 10: Write Protect HW Status */
+#define PWM_WPSR_WPHWS3              (1 << 11) /* Bit 11: Write Protect HW Status */
+#define PWM_WPSR_WPHWS4              (1 << 12) /* Bit 12: Write Protect HW Status */
+#define PWM_WPSR_WPHWS5              (1 << 13) /* Bit 13: Write Protect HW Status */
+#define PWM_WPSR_WPVSRC_SHIFT        (16)      /* Bits 16-31: Write Protect Violation Source */
+#define PWM_WPSR_WPVSRC_MASK         (0xffff << PWM_WPSR_WPVSRC_SHIFT)
+
+/* PWM Comparison x Value Register and PWM Comparison x Value Update Register */
+
+#define PWMCMP_CV_SHIFT              (0)       /* Bits 0-23: Comparison x Value */
+#define PWMCMP_CV_MASK               (0x00ffffff << PWMCMP_CV_SHIFT)
+#define PWMCMP_CVM                   (1 << 24) /* Bit 24: Comparison x Value Mode */
+
+/* PWM Comparison x Mode Register  and PWM Comparison x Mode Update Register */
+
+#define PWMCMP_CEN                   (1 << 0)  /* Bit 0:  Comparison x Enable */
+#define PWMCMP_CTR_SHIFT             (4)       /* Bits 4-7: Comparison x Trigger */
+#define PWMCMP_CTR_MASK              (15 << PWMCMP_CTR_SHIFT)
+#define PWMCMP_CPR_SHIFT             (8)       /* Bits 8-11: Comparison x Period */
+#define PWMCMP_CPR_MASK              (15 << PWMCMP_CPR_SHIFT)
+#define PWMCMP_M_CPRCNT_SHIFT        (12)      /* Bits 12-15: Comparison x Period Count (M only) */
+#define PWMCMP_M_CPRCNT_MASK         (15 << PWMCMP_M_CPRCNT_SHIFT)
+#define PWMCMP_CUPR_SHIFT            (16)      /* Bits 16-19: Comparison x Update Period */
+#define PWMCMP_CUPR_MASK             (15 << PWMCMP_CUPR_SHIFT)
+#define PWMCMP_M_CUPRCNT_SHIFT       (20)      /* Bits 20-23: Comparison x Update Period Counter (M only) */
+#define PWMCMP_M_CUPRCNT_MASK        (15 << PWMCMP_M_CUPRCNT_SHIFT)
+
+/* PWM Channel Mode Register */
+
+#define PWMCH_MR_CPRE_SHIFT          (0)       /* Bits 0-3: Channel Pre-scaler */
+#define PWMCH_MR_CPRE_MASK           (15 << PWMCH_MR_CPRE_SHIFT)
+#  define PWMCH_MR_CPRE_MCK          (0  << PWMCH_MR_CPRE_SHIFT) /* MCK */
+#  define PWMCH_MR_CPRE_MCKDIV2      (1  << PWMCH_MR_CPRE_SHIFT) /* MCK/2 */
+#  define PWMCH_MR_CPRE_MCKDIV4      (2  << PWMCH_MR_CPRE_SHIFT) /* MCK/4 */
+#  define PWMCH_MR_CPRE_MCKDIV8      (3  << PWMCH_MR_CPRE_SHIFT) /* MCK/8 */
+#  define PWMCH_MR_CPRE_MCKDIV16     (4  << PWMCH_MR_CPRE_SHIFT) /* MCK/16 */
+#  define PWMCH_MR_CPRE_MCKDIV32     (5  << PWMCH_MR_CPRE_SHIFT) /* MCK/32 */
+#  define PWMCH_MR_CPRE_MCKDIV64     (6  << PWMCH_MR_CPRE_SHIFT) /* MCK/64 */
+#  define PWMCH_MR_CPRE_MCKDIV128    (7  << PWMCH_MR_CPRE_SHIFT) /* MCK/128 */
+#  define PWMCH_MR_CPRE_MCKDIV256    (8  << PWMCH_MR_CPRE_SHIFT) /* MCK/256 */
+#  define PWMCH_MR_CPRE_MCKDIV512    (9  << PWMCH_MR_CPRE_SHIFT) /* MCK/512 */
+#  define PWMCH_MR_CPRE_MCKDIV1024   (10 << PWMCH_MR_CPRE_SHIFT) /* MCK/1024 */
+#  define PWMCH_MR_CPRE_CLKA         (11 << PWMCH_MR_CPRE_SHIFT) /*CLKA */
+#  define PWMCH_MR_CPRE_CLKB         (12 << PWMCH_MR_CPRE_SHIFT) /* CLKB */
+#define PWMCH_MR_CALG                (1 << 8)  /* Bit 8:  Channel Alignment */
+#define PWMCH_MR_CPOL                (1 << 9)  /* Bit 9:  Channel Polarity */
+#define PWMCH_MR_CES                 (1 << 10) /* Bit 10:  Counter Event Selection */
+#define PWMCH_MR_DTE                 (1 << 16) /* Bit 16: Dead-Time Generator Enable */
+#define PWMCH_MR_DTHI                (1 << 17) /* Bit 17: Dead-Time PWMHx Output Inverted */
+#define PWMCH_MR_DTLI                (1 << 18) /* Bit 18: Dead-Time PWMLx Output Inverted */
+
+/* PWM Channel Duty Cycle Register and PWM Channel Duty Cycle Update Register common bit-field definitions */
+
+#define PWMCH_DTY_SHIFT              (0)       /* Bits 0-23: Channel Duty-Cycle */
+#define PWMCH_DTY_MASK               (0x00ffffff << PWMCH_DTY_SHIFT)
+
+/* PWM Channel Period Register and PWM Channel Period Update Register common bit-field definitions */
+
+#define PWMCH_PRD_SHIFT              (0)       /* Bits 0-23: Channel Period */
+#define PWMCH_PRD_MASK               (0x00ffffff << PWMCH_PRD_SHIFT)
+
+/* PWM Channel Counter Register */
+
+#define PWMCH_CCNT_SHIFT             (0)       /* Bits 0-23: Channel Counter Register */
+#define PWMCH_CCNT_MASK              (0x00ffffff << PWMCH_CCNT_SHIFT)
+
+/* PWM Channel Dead Time Register and PWM Channel Dead Time Update Register common bit-field definitions */
+
+#define PWMCH_DTH_SHIFT              (0)       /* Bits 0-15: Dead-Time Value for PWMHx Output */
+#define PWMCH_DTH_MASK               (0xffff << PWMCH_DTH_SHIFT)
+#define PWMCH_DTL_SHIFT              (16)      /* Bits 16-31: Dead-Time Value for PWMLx Output */
+#define PWMCH_DTL_MASK               (0xffff << PWMCH_DTL_SHIFT)
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Data
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Functions
+ ****************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_PWM_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_rstc.h b/nuttx/arch/arm/src/sam34/chip/sam_rstc.h
index 688631fb6..3a620d7ef 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_rstc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_rstc.h
@@ -1,7 +1,7 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/sam3u_rstc.h
+ * arch/arm/src/sam34/chip/sam_rstc.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_RSTC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_RSTC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "sam3u_memorymap.h"
+#include "chip/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -51,15 +51,15 @@
 
 /* RSTC register offsets ****************************************************************/
 
-#define SAM3U_RSTC_CR_OFFSET    0x00 /* Control Register */
-#define SAM3U_RSTC_SR_OFFSET    0x04 /* Status Register */
-#define SAM3U_RSTC_MR_OFFSET    0x08 /* Mode Register  */
+#define SAM_RSTC_CR_OFFSET      0x00 /* Control Register */
+#define SAM_RSTC_SR_OFFSET      0x04 /* Status Register */
+#define SAM_RSTC_MR_OFFSET      0x08 /* Mode Register  */
 
 /* RSTC register adresses ***************************************************************/
 
-#define SAM3U_RSTC_CR           (SAM3U_RSTC_BASE+SAM3U_RSTC_CR_OFFSET)
-#define SAM3U_RSTC_SR           (SAM3U_RSTC_BASE+SAM3U_RSTC_SR_OFFSET)
-#define SAM3U_RSTC_MR           (SAM3U_RSTC_BASE+SAM3U_RSTC_MR_OFFSET)
+#define SAM_RSTC_CR             (SAM_RSTC_BASE+SAM_RSTC_CR_OFFSET)
+#define SAM_RSTC_SR             (SAM_RSTC_BASE+SAM_RSTC_SR_OFFSET)
+#define SAM_RSTC_MR             (SAM_RSTC_BASE+SAM_RSTC_MR_OFFSET)
 
 /* RSTC register bit definitions ********************************************************/
 
@@ -99,4 +99,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_RSTC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RSTC_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_rtc.h b/nuttx/arch/arm/src/sam34/chip/sam_rtc.h
new file mode 100644
index 000000000..5c0a2e15e
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_rtc.h
@@ -0,0 +1,184 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_rtc.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM34_CHIP_SAM_RTC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* RTC register offsets *****************************************************************/
+
+#define SAM_RTC_CR_OFFSET            0x00 /* Control Register */
+#define SAM_RTC_MR_OFFSET            0x04 /* Mode Register */
+#define SAM_RTC_TIMR_OFFSET          0x08 /* Time Register */
+#define SAM_RTC_CALR_OFFSET          0x0c /* Calendar Register */
+#define SAM_RTC_TIMALR_OFFSET        0x10 /* Time Alarm Register */
+#define SAM_RTC_CALALR_OFFSET        0x14 /* Calendar Alarm Register */
+#define SAM_RTC_SR_OFFSET            0x18 /* Status Register */
+#define SAM_RTC_SCCR_OFFSET          0x1c /* Status Clear Command Register */
+#define SAM_RTC_IER_OFFSET           0x20 /* Interrupt Enable Register */
+#define SAM_RTC_IDR_OFFSET           0x24 /* Interrupt Disable Register */
+#define SAM_RTC_IMR_OFFSET           0x28 /* Interrupt Mask Register */
+#define SAM_RTC_VER_OFFSET           0x2c /* Valid Entry Register */
+
+/* RTC register adresses ****************************************************************/
+
+#define SAM_RTC_CR                   (SAM_RTC_BASE+SAM_RTC_CR_OFFSET)
+#define SAM_RTC_MR                   (SAM_RTC_BASE+SAM_RTC_MR_OFFSET)
+#define SAM_RTC_TIMR                 (SAM_RTC_BASE+SAM_RTC_TIMR_OFFSET)
+#define SAM_RTC_CALR                 (SAM_RTC_BASE+SAM_RTC_CALR_OFFSET)
+#define SAM_RTC_TIMALR               (SAM_RTC_BASE+SAM_RTC_TIMALR_OFFSET)
+#define SAM_RTC_CALALR               (SAM_RTC_BASE+SAM_RTC_CALALR_OFFSET)
+#define SAM_RTC_SR                   (SAM_RTC_BASE+SAM_RTC_SR_OFFSET)
+#define SAM_RTC_SCCR                 (SAM_RTC_BASE+SAM_RTC_SCCR_OFFSET)
+#define SAM_RTC_IER                  (SAM_RTC_BASE+SAM_RTC_IER_OFFSET)
+#define SAM_RTC_IDR                  (SAM_RTC_BASE+SAM_RTC_IDR_OFFSET)
+#define SAM_RTC_IMR                  (SAM_RTC_BASE+SAM_RTC_IMR_OFFSET)
+#define SAM_RTC_VER                  (SAM_RTC_BASE+SAM_RTC_VER_OFFSET)
+
+/* RTC register bit definitions *********************************************************/
+
+#define RTC_CR_UPDTIM                (1 << 0)  /* Bit 0:  Update Request Time Register */
+#define RTC_CR_UPDCAL                (1 << 1)  /* Bit 1:  Update Request Calendar Register */
+#define RTC_CR_TIMEVSEL_SHIFT        (8)       /* Bits 8-9:  Time Event Selection */
+#define RTC_CR_TIMEVSEL_MASK         (3 << RTC_CR_TIMEVSEL_SHIFT)
+#  define RTC_CR_TIMEVSEL_MIN        (0 << RTC_CR_TIMEVSEL_SHIFT)
+#  define RTC_CR_TIMEVSEL_HOUR       (1 << RTC_CR_TIMEVSEL_SHIFT)
+#  define RTC_CR_TIMEVSEL_MIDNIGHT   (2 << RTC_CR_TIMEVSEL_SHIFT)
+#  define RTC_CR_TIMEVSEL_NOON       (3 << RTC_CR_TIMEVSEL_SHIFT)
+#define RTC_CR_CALEVSEL_SHIFT        (16)      /* Bits 16-17:  Calendar Event Selection */
+#define RTC_CR_CALEVSEL_MASK         (3 << RTC_CR_CALEVSEL_SHIFT)
+#  define RTC_CR_CALEVSEL_WEEK       (0 << RTC_CR_CALEVSEL_SHIFT)
+#  define RTC_CR_CALEVSEL_MONTH      (1 << RTC_CR_CALEVSEL_SHIFT)
+#  define RTC_CR_CALEVSEL_YEAR       (2 << RTC_CR_CALEVSEL_SHIFT)
+
+#define RTC_MR_HRMOD                 (1 << 0)  /* Bit 0:  12-/24-hour Mode */
+
+#define RTC_TIMR_SEC_SHIFT           (0)       /* Bits 0-6:  Current Second */
+#define RTC_TIMR_SEC_MASK            (0x7f << RTC_TIMR_SEC_SHIFT)
+#define RTC_TIMR_MIN_SHIFT           (8)       /* Bits 8-14:  Current Minute */
+#define RTC_TIMR_MIN_MASK            (0x7f <<  RTC_TIMR_MIN_SHIFT)
+#define RTC_TIMR_HOUR_SHIFT          (16)      /* Bits 16-21: Current Hour */
+#define RTC_TIMR_HOUR_MASK           (0x3f << RTC_TIMR_HOUR_SHIFT)
+#define RTC_TIMR_AMPM                (1 << 22) /* Bit 22: Ante Meridiem Post Meridiem Indicator */
+
+#define RTC_CALR_CENT_SHIFT          (0)       /* Bits 0-6:  Current Century */
+#define RTC_CALR_CENT_MASK           (0x7f << RTC_TIMR_HOUR_SHIFT)
+#define RTC_CALR_YEAR_SHIFT          (8)       /* Bits 8-15:  Current Year */
+#define RTC_CALR_YEAR_MASK           (0xff << RTC_CALR_YEAR_SHIFT)
+#define RTC_CALR_MONTH_SHIFT         (16)      /* Bits 16-20: Current Month */
+#define RTC_CALR_MONTH_MASK          (0x1f << RTC_CALR_MONTH_SHIFT)
+#define RTC_CALR_DAY_SHIFT           (21)      /* Bits 21-23: Current Day in Current Week */
+#define RTC_CALR_DAY_MASK            (7 << RTC_CALR_DAY_SHIFT)
+#define RTC_CALR_DATE_SHIFT          (24)      /* Bits 24-29: Current Day in Current Month */
+#define RTC_CALR_DATE_MASK           (0x3f << RTC_CALR_DATE_SHIFT)
+
+#define RTC_TIMALR_SEC_SHIFT         (0)       /* Bits 0-6:  Second Alarm */
+#define RTC_TIMALR_SEC_MASK          (0x7f << RTC_TIMALR_SEC_SHIFT)
+#define RTC_TIMALR_SECEN             (1 << 7)  /* Bit 7:  Second Alarm Enable */
+#define RTC_TIMALR_MIN_SHIFT         (8)       /* Bits 8-14:  Minute Alarm */
+#define RTC_TIMALR_MIN_MASK          (0x7f << RTC_TIMALR_MIN_SHIFT)
+#define RTC_TIMALR_MINEN             (1 << 15) /* Bit 15: Minute Alarm Enable */
+#define RTC_TIMALR_HOUR_SHIFT        (16)      /* Bits 16-21:  Hour Alarm */
+#define RTC_TIMALR_HOUR_MASK         (0x3f << RTC_TIMALR_HOUR_SHIFT)
+#define RTC_TIMALR_AMPM              (1 << 22) /* Bit 22: AM/PM Indicator */
+#define RTC_TIMALR_HOUREN            (1 << 23) /* Bit 23: Hour Alarm Enable */
+
+#define RTC_CALALR_MONTH_SHIFT       (16)      /* Bits 16-20:  Month Alarm */
+#define RTC_CALALR_MONTH_MASK        (0x1f << RTC_CALALR_MONTH_SHIFT)
+#define RTC_CALALR_MTHEN             (1 << 23) /* Bit 23: Month Alarm Enable */
+#define RTC_CALALR_DATE_SHIFT        (24)      /* Bits 24-29:  Date Alarm */
+#define RTC_CALALR_DATE_MASK         (0x3c << RTC_CALALR_DATE_SHIFT)
+#define RTC_CALALR_DATEEN            (1 << 31) /* Bit 31: Date Alarm Enable */
+
+#define RTC_SR_ACKUPD                (1 << 0)  /* Bit 0:  Acknowledge for Update */
+#define RTC_SR_ALARM                 (1 << 1)  /* Bit 1:  Alarm Flag */
+#define RTC_SR_SEC                   (1 << 2)  /* Bit 2:  Second Event */
+#define RTC_SR_TIMEV                 (1 << 3)  /* Bit 3:  Time Event */
+#define RTC_SR_CALEV                 (1 << 4)  /* Bit 4:  Calendar Event */
+
+#define RTC_SCCR_ACKCLR              (1 << 0)  /* Bit 0:  Acknowledge Clear */
+#define RTC_SCCR_ALRCLR              (1 << 1)  /* Bit 1:  Alarm Clear */
+#define RTC_SCCR_SECCLR              (1 << 2)  /* Bit 2:  Second Clear */
+#define RTC_SCCR_TIMCLR              (1 << 3)  /* Bit 3:  Time Clear */
+#define RTC_SCCR_CALCLR              (1 << 4)  /* Bit 4:  Calendar Clear */
+
+#define RTC_IER_ACKEN                (1 << 0)  /* Bit 0:  Acknowledge Update Interrupt Enable */
+#define RTC_IER_ALREN                (1 << 1)  /* Bit 1:  Alarm Interrupt Enable */
+#define RTC_IER_SECEN                (1 << 2)  /* Bit 2:  Second Event Interrupt Enable */
+#define RTC_IER_TIMEN                (1 << 3)  /* Bit 3:  Time Event Interrupt Enable */
+#define RTC_IER_CALEN                (1 << 4)  /* Bit 4:  Calendar Event Interrupt Enable */
+
+#define RTC_IDR_ACKDIS               (1 << 0)  /* Bit 0:  Acknowledge Update Interrupt Disable */
+#define RTC_IDR_ALRDIS               (1 << 1)  /* Bit 1:  Alarm Interrupt Disable */
+#define RTC_IDR_SECDIS               (1 << 2)  /* Bit 2:  Second Event Interrupt Disable */
+#define RTC_IDR_TIMDIS               (1 << 3)  /* Bit 3:  Time Event Interrupt Disable */
+#define RTC_IDR_CALDIS               (1 << 4)  /* Bit 4:  Calendar Event Interrupt Disable */
+
+#define RTC_IMR_ACK                  (1 << 0)  /* Bit 0:  Acknowledge Update Interrupt Mask */
+#define RTC_IMR_ALR                  (1 << 1)  /* Bit 1:  Alarm Interrupt Mask */
+#define RTC_IMR_SEC                  (1 << 2)  /* Bit 2:  Second Event Interrupt Mask */
+#define RTC_IMR_TIM                  (1 << 3)  /* Bit 3:  Time Event Interrupt Mask */
+#define RTC_IMR_CAL                  (1 << 4)  /* Bit 4:  Calendar Event Interrupt Mask */
+
+#define RTC_VER_NVTIM                (1 << 0)  /* Bit 0:  Non-valid Time */
+#define RTC_VER_NVCAL                (1 << 1)  /* Bit 1:  Non-valid Calendar */
+#define RTC_VER_NVTIMALR             (1 << 2)  /* Bit 2:  Non-valid Time Alarm */
+#define RTC_VER_NVCALALR             (1 << 3)  /* Bit 3:  Non-valid Calendar Alarm */
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Data
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Functions
+ ****************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_rtt.h b/nuttx/arch/arm/src/sam34/chip/sam_rtt.h
index 9cbb69b0a..75b0d361e 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_rtt.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_rtt.h
@@ -1,7 +1,7 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/sam3u_rtt.h
+ * arch/arm/src/sam34/chip/sam_rtt.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_RTT_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_RTT_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "sam3u_memorymap.h"
+#include "chip/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -51,17 +51,17 @@
 
 /* RTT register offsets *****************************************************************/
 
-#define SAM3U_RTT_MR_OFFSET    0x00 /* Mode Register */
-#define SAM3U_RTT_AR_OFFSET    0x04 /* Alarm Register */
-#define SAM3U_RTT_VR_OFFSET    0x08 /* Value Register */
-#define SAM3U_RTT_SR_OFFSET    0x0c /* Status Register */
+#define SAM_RTT_MR_OFFSET      0x00 /* Mode Register */
+#define SAM_RTT_AR_OFFSET      0x04 /* Alarm Register */
+#define SAM_RTT_VR_OFFSET      0x08 /* Value Register */
+#define SAM_RTT_SR_OFFSET      0x0c /* Status Register */
 
 /* RTT register adresses ***************************************************************/
 
-#define SAM3U_RTT_MR           (SAM3U_RTT_BASE+SAM3U_RTT_MR_OFFSET)
-#define SAM3U_RTT_AR           (SAM3U_RTT_BASE+SAM3U_RTT_AR_OFFSET)
-#define SAM3U_RTT_VR           (SAM3U_RTT_BASE+SAM3U_RTT_VR_OFFSET)
-#define SAM3U_RTT_SR           (SAM3U_RTT_BASE+SAM3U_RTT_SR_OFFSET)
+#define SAM_RTT_MR             (SAM_RTT_BASE+SAM_RTT_MR_OFFSET)
+#define SAM_RTT_AR             (SAM_RTT_BASE+SAM_RTT_AR_OFFSET)
+#define SAM_RTT_VR             (SAM_RTT_BASE+SAM_RTT_VR_OFFSET)
+#define SAM_RTT_SR             (SAM_RTT_BASE+SAM_RTT_SR_OFFSET)
 
 /* RTT register bit definitions ********************************************************/
 
@@ -86,4 +86,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_RTT_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_RTT_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_smc.h b/nuttx/arch/arm/src/sam34/chip/sam_smc.h
index c831a91cd..ba67d6608 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_smc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_smc.h
@@ -1,7 +1,7 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/sam3u_smc.h
+ * arch/arm/src/sam34/chip/sam_smc.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_SMC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_SMC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "sam3u_memorymap.h"
+#include "chip/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -51,95 +51,95 @@
 
 /* SMC register offsets *****************************************************************/
 
-#define SAM3U_SMC_CFG_OFFSET         0x000 /* SMC NFC Configuration Register */
-#define SAM3U_SMC_CTRL_OFFSET        0x004 /* SMC NFC Control Register */
-#define SAM3U_SMC_SR_OFFSET          0x008 /* SMC NFC Status Register */
-#define SAM3U_SMC_IER_OFFSET         0x00c /* SMC NFC Interrupt Enable Register */
-#define SAM3U_SMC_IDR_OFFSET         0x010 /* SMC NFC Interrupt Disable Register */
-#define SAM3U_SMC_IMR_OFFSET         0x014 /* SMC NFC Interrupt Mask Register */
-#define SAM3U_SMC_ADDR_OFFSET        0x018 /* SMC NFC Address Cycle Zero Register */
-#define SAM3U_SMC_BANK_OFFSET        0x01c /* SMC Bank Address Register */
-#define SAM3U_SMC_ECCCTRL_OFFSET     0x020 /* SMC ECC Control Register */
-#define SAM3U_SMC_ECCMD_OFFSET       0x024 /* SMC ECC Mode Register */
-#define SAM3U_SMC_ECCSR1_OFFSET      0x028 /* SMC ECC Status 1 Register */
-#define SAM3U_SMC_ECCPR0_OFFSET      0x02c /* SMC ECC parity 0 Register */
-#define SAM3U_SMC_ECCPR1_OFFSET      0x030 /* SMC ECC parity 1 Register */
-#define SAM3U_SMC_ECCSR2_OFFSET      0x034 /* SMC ECC status 2 Register */
-#define SAM3U_SMC_ECCPR2_OFFSET      0x038 /* SMC ECC parity 2 Register */
-#define SAM3U_SMC_ECCPR3_OFFSET      0x03c /* SMC ECC parity 3 Register */
-#define SAM3U_SMC_ECCPR4_OFFSET      0x040 /* SMC ECC parity 4 Register */
-#define SAM3U_SMC_ECCPR5_OFFSET      0x044 /* SMC ECC parity 5 Register */
-#define SAM3U_SMC_ECCPR6_OFFSET      0x048 /* SMC ECC parity 6 Register */
-#define SAM3U_SMC_ECCPR7_OFFSET      0x04c /* SMC ECC parity 7 Register */
-#define SAM3U_SMC_ECCPR8_OFFSET      0x050 /* SMC ECC parity 8 Register */
-#define SAM3U_SMC_ECCPR9_OFFSET      0x054 /* SMC ECC parity 9 Register */
-#define SAM3U_SMC_ECCPR10_OFFSET     0x058 /* SMC ECC parity 10 Register */
-#define SAM3U_SMC_ECCPR11_OFFSET     0x05c /* SMC ECC parity 11 Register */
-#define SAM3U_SMC_ECCPR12_OFFSET     0x060 /* SMC ECC parity 12 Register */
-#define SAM3U_SMC_ECCPR13_OFFSET     0x064 /* SMC ECC parity 13 Register */
-#define SAM3U_SMC_ECCPR14_OFFSET     0x068 /* SMC ECC parity 14 Register */
-#define SAM3U_SMC_ECCPR15_OFFSET     0x06c /* SMC ECC parity 15 Register */
-
-#define SAM3U_SMCCS_OFFSET(n)        (0x070+((n)*0x014))
-#define SAM3U_SMCCS_SETUP_OFFSET     0x000 /* SMC SETUP Register */
-#define SAM3U_SMCCS_PULSE_OFFSET     0x004 /* SMC PULSE Register */
-#define SAM3U_SMCCS_CYCLE_OFFSET     0x008 /* SMC CYCLE Register */
-#define SAM3U_SMCCS_TIMINGS_OFFSET   0x00c /* SMC TIMINGS Register */
-#define SAM3U_SMCCS_MODE_OFFSET      0x010 /* SMC MODE Register */
-
-#define SAM3U_SMC_OCMS_OFFSET        0x110 /* SMC OCMS MODE Register */
-#define SAM3U_SMC_KEY1_OFFSET        0x114 /* SMC KEY1 Register */
-#define SAM3U_SMC_KEY2_OFFSET        0x118 /* SMC KEY2 Register */
-#define SAM3U_SMC_WPCR_OFFSET        0x1e4 /* Write Protection Control Register */
-#define SAM3U_SMC_WPSR_OFFSET        0x1e8 /* Write Protection Status Register */
+#define SAM_SMC_CFG_OFFSET           0x000 /* SMC NFC Configuration Register */
+#define SAM_SMC_CTRL_OFFSET          0x004 /* SMC NFC Control Register */
+#define SAM_SMC_SR_OFFSET            0x008 /* SMC NFC Status Register */
+#define SAM_SMC_IER_OFFSET           0x00c /* SMC NFC Interrupt Enable Register */
+#define SAM_SMC_IDR_OFFSET           0x010 /* SMC NFC Interrupt Disable Register */
+#define SAM_SMC_IMR_OFFSET           0x014 /* SMC NFC Interrupt Mask Register */
+#define SAM_SMC_ADDR_OFFSET          0x018 /* SMC NFC Address Cycle Zero Register */
+#define SAM_SMC_BANK_OFFSET          0x01c /* SMC Bank Address Register */
+#define SAM_SMC_ECCCTRL_OFFSET       0x020 /* SMC ECC Control Register */
+#define SAM_SMC_ECCMD_OFFSET         0x024 /* SMC ECC Mode Register */
+#define SAM_SMC_ECCSR1_OFFSET        0x028 /* SMC ECC Status 1 Register */
+#define SAM_SMC_ECCPR0_OFFSET        0x02c /* SMC ECC parity 0 Register */
+#define SAM_SMC_ECCPR1_OFFSET        0x030 /* SMC ECC parity 1 Register */
+#define SAM_SMC_ECCSR2_OFFSET        0x034 /* SMC ECC status 2 Register */
+#define SAM_SMC_ECCPR2_OFFSET        0x038 /* SMC ECC parity 2 Register */
+#define SAM_SMC_ECCPR3_OFFSET        0x03c /* SMC ECC parity 3 Register */
+#define SAM_SMC_ECCPR4_OFFSET        0x040 /* SMC ECC parity 4 Register */
+#define SAM_SMC_ECCPR5_OFFSET        0x044 /* SMC ECC parity 5 Register */
+#define SAM_SMC_ECCPR6_OFFSET        0x048 /* SMC ECC parity 6 Register */
+#define SAM_SMC_ECCPR7_OFFSET        0x04c /* SMC ECC parity 7 Register */
+#define SAM_SMC_ECCPR8_OFFSET        0x050 /* SMC ECC parity 8 Register */
+#define SAM_SMC_ECCPR9_OFFSET        0x054 /* SMC ECC parity 9 Register */
+#define SAM_SMC_ECCPR10_OFFSET       0x058 /* SMC ECC parity 10 Register */
+#define SAM_SMC_ECCPR11_OFFSET       0x05c /* SMC ECC parity 11 Register */
+#define SAM_SMC_ECCPR12_OFFSET       0x060 /* SMC ECC parity 12 Register */
+#define SAM_SMC_ECCPR13_OFFSET       0x064 /* SMC ECC parity 13 Register */
+#define SAM_SMC_ECCPR14_OFFSET       0x068 /* SMC ECC parity 14 Register */
+#define SAM_SMC_ECCPR15_OFFSET       0x06c /* SMC ECC parity 15 Register */
+
+#define SAM_SMCCS_OFFSET(n)          (0x070+((n)*0x014))
+#define SAM_SMCCS_SETUP_OFFSET       0x000 /* SMC SETUP Register */
+#define SAM_SMCCS_PULSE_OFFSET       0x004 /* SMC PULSE Register */
+#define SAM_SMCCS_CYCLE_OFFSET       0x008 /* SMC CYCLE Register */
+#define SAM_SMCCS_TIMINGS_OFFSET     0x00c /* SMC TIMINGS Register */
+#define SAM_SMCCS_MODE_OFFSET        0x010 /* SMC MODE Register */
+
+#define SAM_SMC_OCMS_OFFSET          0x110 /* SMC OCMS MODE Register */
+#define SAM_SMC_KEY1_OFFSET          0x114 /* SMC KEY1 Register */
+#define SAM_SMC_KEY2_OFFSET          0x118 /* SMC KEY2 Register */
+#define SAM_SMC_WPCR_OFFSET          0x1e4 /* Write Protection Control Register */
+#define SAM_SMC_WPSR_OFFSET          0x1e8 /* Write Protection Status Register */
 
 /* SMC register adresses ****************************************************************/
 
-#define SAM3U_SMC_CFG                (SAM3U_SMC_BASE+SAM3U_SMC_CFG_OFFSET)
-#define SAM3U_SMC_CTRL               (SAM3U_SMC_BASE+SAM3U_SMC_CTRL_OFFSET)
-#define SAM3U_SMC_SR                 (SAM3U_SMC_BASE+SAM3U_SMC_SR_OFFSET)
-#define SAM3U_SMC_IER                (SAM3U_SMC_BASE+SAM3U_SMC_IER_OFFSET)
-#define SAM3U_SMC_IDR                (SAM3U_SMC_BASE+SAM3U_SMC_IDR_OFFSET)
-#define SAM3U_SMC_IMR                (SAM3U_SMC_BASE+SAM3U_SMC_IMR_OFFSET)
-#define SAM3U_SMC_ADDR               (SAM3U_SMC_BASE+SAM3U_SMC_ADDR_OFFSET)
-#define SAM3U_SMC_BANK               (SAM3U_SMC_BASE+SAM3U_SMC_BANK_OFFSET)
-#define SAM3U_SMC_ECCCTRL            (SAM3U_SMC_BASE+SAM3U_SMC_ECCCTRL_OFFSET)
-#define SAM3U_SMC_ECCMD              (SAM3U_SMC_BASE+SAM3U_SMC_ECCMD_OFFSET)
-#define SAM3U_SMC_ECCSR1             (SAM3U_SMC_BASE+SAM3U_SMC_ECCSR1_OFFSET)
-#define SAM3U_SMC_ECCPR0             (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR0_OFFSET)
-#define SAM3U_SMC_ECCPR1             (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR1_OFFSET)
-#define SAM3U_SMC_ECCSR2             (SAM3U_SMC_BASE+SAM3U_SMC_ECCSR2_OFFSET)
-#define SAM3U_SMC_ECCPR2             (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR2_OFFSET)
-#define SAM3U_SMC_ECCPR3             (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR3_OFFSET)
-#define SAM3U_SMC_ECCPR4             (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR4_OFFSET)
-#define SAM3U_SMC_ECCPR5             (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR5_OFFSET)
-#define SAM3U_SMC_ECCPR6             (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR6_OFFSET)
-#define SAM3U_SMC_ECCPR7             (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR7_OFFSET)
-#define SAM3U_SMC_ECCPR8             (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR8_OFFSET)
-#define SAM3U_SMC_ECCPR9             (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR9_OFFSET)
-#define SAM3U_SMC_ECCPR10            (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR10_OFFSET)
-#define SAM3U_SMC_ECCPR11            (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR11_OFFSET)
-#define SAM3U_SMC_ECCPR12            (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR12_OFFSET)
-#define SAM3U_SMC_ECCPR13            (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR13_OFFSET)
-#define SAM3U_SMC_ECCPR14            (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR14_OFFSET)
-#define SAM3U_SMC_ECCPR15            (SAM3U_SMC_BASE+SAM3U_SMC_ECCPR15_OFFSET)
-
-#define SAM3U_SMCCS_BASE(n)          (SAM3U_SMC_BASE+SAM3U_SMCCS_OFFSET(n))
-#  define SAM3U_SMC_CS0_BASE         (SAM3U_SMC_BASE+SAM3U_SMCCS_OFFSET(0))
-#  define SAM3U_SMC_CS1_BASE         (SAM3U_SMC_BASE+SAM3U_SMCCS_OFFSET(1))
-#  define SAM3U_SMC_CS2_BASE         (SAM3U_SMC_BASE+SAM3U_SMCCS_OFFSET(2))
-#  define SAM3U_SMC_CS3_BASE         (SAM3U_SMC_BASE+SAM3U_SMCCS_OFFSET(3))
-#define SAM3U_SMCCS_SETUP(n)         (SAM3U_SMCCS_BASE(n)+SAM3U_SMCCS_SETUP_OFFSET)
-#define SAM3U_SMCCS_PULSE(n)         (SAM3U_SMCCS_BASE(n)+SAM3U_SMCCS_PULSE_OFFSET)
-#define SAM3U_SMCCS_CYCLE(n)         (SAM3U_SMCCS_BASE(n)+SAM3U_SMCCS_CYCLE_OFFSET)
-#define SAM3U_SMCCS_TIMINGS(n)       (SAM3U_SMCCS_BASE(n)+SAM3U_SMCCS_TIMINGS_OFFSET)
-#define SAM3U_SMCCS_MODE(n)          (SAM3U_SMCCS_BASE(n)+SAM3U_SMCCS_MODE_OFFSET)
-
-#define SAM3U_SMC_OCMS               (SAM3U_SMC_BASE+SAM3U_SMC_OCMS_OFFSET)
-#define SAM3U_SMC_KEY1               (SAM3U_SMC_BASE+SAM3U_SMC_KEY1_OFFSET)
-#define SAM3U_SMC_KEY2               (SAM3U_SMC_BASE+SAM3U_SMC_KEY2_OFFSET)
-#define SAM3U_SMC_WPCR               (SAM3U_SMC_BASE+SAM3U_SMC_WPCR_OFFSET)
-#define SAM3U_SMC_WPSR               (SAM3U_SMC_BASE+SAM3U_SMC_WPSR_OFFSET)
+#define SAM_SMC_CFG                  (SAM_SMC_BASE+SAM_SMC_CFG_OFFSET)
+#define SAM_SMC_CTRL                 (SAM_SMC_BASE+SAM_SMC_CTRL_OFFSET)
+#define SAM_SMC_SR                   (SAM_SMC_BASE+SAM_SMC_SR_OFFSET)
+#define SAM_SMC_IER                  (SAM_SMC_BASE+SAM_SMC_IER_OFFSET)
+#define SAM_SMC_IDR                  (SAM_SMC_BASE+SAM_SMC_IDR_OFFSET)
+#define SAM_SMC_IMR                  (SAM_SMC_BASE+SAM_SMC_IMR_OFFSET)
+#define SAM_SMC_ADDR                 (SAM_SMC_BASE+SAM_SMC_ADDR_OFFSET)
+#define SAM_SMC_BANK                 (SAM_SMC_BASE+SAM_SMC_BANK_OFFSET)
+#define SAM_SMC_ECCCTRL              (SAM_SMC_BASE+SAM_SMC_ECCCTRL_OFFSET)
+#define SAM_SMC_ECCMD                (SAM_SMC_BASE+SAM_SMC_ECCMD_OFFSET)
+#define SAM_SMC_ECCSR1               (SAM_SMC_BASE+SAM_SMC_ECCSR1_OFFSET)
+#define SAM_SMC_ECCPR0               (SAM_SMC_BASE+SAM_SMC_ECCPR0_OFFSET)
+#define SAM_SMC_ECCPR1               (SAM_SMC_BASE+SAM_SMC_ECCPR1_OFFSET)
+#define SAM_SMC_ECCSR2               (SAM_SMC_BASE+SAM_SMC_ECCSR2_OFFSET)
+#define SAM_SMC_ECCPR2               (SAM_SMC_BASE+SAM_SMC_ECCPR2_OFFSET)
+#define SAM_SMC_ECCPR3               (SAM_SMC_BASE+SAM_SMC_ECCPR3_OFFSET)
+#define SAM_SMC_ECCPR4               (SAM_SMC_BASE+SAM_SMC_ECCPR4_OFFSET)
+#define SAM_SMC_ECCPR5               (SAM_SMC_BASE+SAM_SMC_ECCPR5_OFFSET)
+#define SAM_SMC_ECCPR6               (SAM_SMC_BASE+SAM_SMC_ECCPR6_OFFSET)
+#define SAM_SMC_ECCPR7               (SAM_SMC_BASE+SAM_SMC_ECCPR7_OFFSET)
+#define SAM_SMC_ECCPR8               (SAM_SMC_BASE+SAM_SMC_ECCPR8_OFFSET)
+#define SAM_SMC_ECCPR9               (SAM_SMC_BASE+SAM_SMC_ECCPR9_OFFSET)
+#define SAM_SMC_ECCPR10              (SAM_SMC_BASE+SAM_SMC_ECCPR10_OFFSET)
+#define SAM_SMC_ECCPR11              (SAM_SMC_BASE+SAM_SMC_ECCPR11_OFFSET)
+#define SAM_SMC_ECCPR12              (SAM_SMC_BASE+SAM_SMC_ECCPR12_OFFSET)
+#define SAM_SMC_ECCPR13              (SAM_SMC_BASE+SAM_SMC_ECCPR13_OFFSET)
+#define SAM_SMC_ECCPR14              (SAM_SMC_BASE+SAM_SMC_ECCPR14_OFFSET)
+#define SAM_SMC_ECCPR15              (SAM_SMC_BASE+SAM_SMC_ECCPR15_OFFSET)
+
+#define SAM_SMCCS_BASE(n)            (SAM_SMC_BASE+SAM_SMCCS_OFFSET(n))
+#  define SAM_SMC_CS0_BASE           (SAM_SMC_BASE+SAM_SMCCS_OFFSET(0))
+#  define SAM_SMC_CS1_BASE           (SAM_SMC_BASE+SAM_SMCCS_OFFSET(1))
+#  define SAM_SMC_CS2_BASE           (SAM_SMC_BASE+SAM_SMCCS_OFFSET(2))
+#  define SAM_SMC_CS3_BASE           (SAM_SMC_BASE+SAM_SMCCS_OFFSET(3))
+#define SAM_SMCCS_SETUP(n)           (SAM_SMCCS_BASE(n)+SAM_SMCCS_SETUP_OFFSET)
+#define SAM_SMCCS_PULSE(n)           (SAM_SMCCS_BASE(n)+SAM_SMCCS_PULSE_OFFSET)
+#define SAM_SMCCS_CYCLE(n)           (SAM_SMCCS_BASE(n)+SAM_SMCCS_CYCLE_OFFSET)
+#define SAM_SMCCS_TIMINGS(n)         (SAM_SMCCS_BASE(n)+SAM_SMCCS_TIMINGS_OFFSET)
+#define SAM_SMCCS_MODE(n)            (SAM_SMCCS_BASE(n)+SAM_SMCCS_MODE_OFFSET)
+
+#define SAM_SMC_OCMS                 (SAM_SMC_BASE+SAM_SMC_OCMS_OFFSET)
+#define SAM_SMC_KEY1                 (SAM_SMC_BASE+SAM_SMC_KEY1_OFFSET)
+#define SAM_SMC_KEY2                 (SAM_SMC_BASE+SAM_SMC_KEY2_OFFSET)
+#define SAM_SMC_WPCR                 (SAM_SMC_BASE+SAM_SMC_WPCR_OFFSET)
+#define SAM_SMC_WPSR                 (SAM_SMC_BASE+SAM_SMC_WPSR_OFFSET)
 
 /* SMC register bit definitions *********************************************************/
 
@@ -174,7 +174,7 @@
 #define SMC_CTRL_NFCDIS              (1 << 1)  /* Bit 1:  NAND Flash Controller Disable */
 
 /* SMC NFC Status Register, SMC NFC Interrupt Enable Register, SMC NFC Interrupt
- * Disable Register, and SMC NFC Interrupt Mask Register common bit-field definitions 
+ * Disable Register, and SMC NFC Interrupt Mask Register common bit-field definitions
  */
 
 #define SMC_SR_SMCSTS                (1 << 0)  /* Bit 0:  NAND Flash Controller status (SR only) */
@@ -429,4 +429,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_SMC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SMC_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_spi.h b/nuttx/arch/arm/src/sam34/chip/sam_spi.h
new file mode 100644
index 000000000..91720647f
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_spi.h
@@ -0,0 +1,189 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_spi.h
+ *
+ *   Copyright (C) 2009, 2011, 2013 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_SAM34_CHIP_SAM_SPI_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SPI_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* SPI register offsets *****************************************************************/
+
+#define SAM_SPI_CR_OFFSET         0x00 /* Control Register */
+#define SAM_SPI_MR_OFFSET         0x04 /* Mode Register */
+#define SAM_SPI_RDR_OFFSET        0x08 /* Receive Data Register */
+#define SAM_SPI_TDR_OFFSET        0x0c /* Transmit Data Register */
+#define SAM_SPI_SR_OFFSET         0x10 /* Status Register */
+#define SAM_SPI_IER_OFFSET        0x14 /* Interrupt Enable Register */
+#define SAM_SPI_IDR_OFFSET        0x18 /* Interrupt Disable Register */
+#define SAM_SPI_IMR_OFFSET        0x1c /* Interrupt Mask Register */
+                                       /* 0x20-0x2c: Reserved */
+#define SAM_SPI_CSR0_OFFSET       0x30 /* Chip Select Register 0 */
+#define SAM_SPI_CSR1_OFFSET       0x34 /* Chip Select Register 1 */
+#define SAM_SPI_CSR2_OFFSET       0x38 /* Chip Select Register 2 */
+#define SAM_SPI_CSR3_OFFSET       0x3c /* Chip Select Register 3 */
+                                       /* 0x40-0xe0: Reserved */
+#define SAM_SPI_WPCR_OFFSET       0xe4 /* Write Protection Control Register */
+#define SAM_SPI_WPSR_OFFSET       0xe8 /* Write Protection Status Register */
+                                       /* 0xec-0xf8: Reserved*/
+
+/* SPI register adresses ****************************************************************/
+
+#define SAM_SPI_CR                (SAM_SPI_BASE+SAM_SPI_CR_OFFSET)   /* Control Register */
+#define SAM_SPI_MR                (SAM_SPI_BASE+SAM_SPI_MR_OFFSET)   /* Mode Register */
+#define SAM_SPI_RDR               (SAM_SPI_BASE+SAM_SPI_RDR_OFFSET)  /* Receive Data Register */
+#define SAM_SPI_TDR               (SAM_SPI_BASE+SAM_SPI_TDR_OFFSET)  /* Transmit Data Register */
+#define SAM_SPI_SR                (SAM_SPI_BASE+SAM_SPI_SR_OFFSET)   /* Status Register */
+#define SAM_SPI_IER               (SAM_SPI_BASE+SAM_SPI_IER_OFFSET)  /* Interrupt Enable Register */
+#define SAM_SPI_IDR               (SAM_SPI_BASE+SAM_SPI_IDR_OFFSET)  /* Interrupt Disable Register */
+#define SAM_SPI_IMR               (SAM_SPI_BASE+SAM_SPI_IMR_OFFSET)  /* Interrupt Mask Register */
+#define SAM_SPI_CSR0              (SAM_SPI_BASE+SAM_SPI_CSR0_OFFSET) /* Chip Select Register 0 */
+#define SAM_SPI_CSR1              (SAM_SPI_BASE+SAM_SPI_CSR1_OFFSET) /* Chip Select Register 1 */
+#define SAM_SPI_CSR2              (SAM_SPI_BASE+SAM_SPI_CSR2_OFFSET) /* Chip Select Register 2 */
+#define SAM_SPI_CSR3              (SAM_SPI_BASE+SAM_SPI_CSR3_OFFSET) /* Chip Select Register 3 */
+#define SAM_SPI_WPCR              (SAM_SPI_BASE+SAM_SPI_WPCR_OFFSET) /* Write Protection Control Register */
+#define SAM_SPI_WPSR              (SAM_SPI_BASE+SAM_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_BITS(n)         (((n)-8) << SPI_CSR_BITS_SHIFT) /* n, n=8-16 */
+#  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_BITS16          (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_SAM34_CHIP_SAM_SPI_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_ssc.h b/nuttx/arch/arm/src/sam34/chip/sam_ssc.h
new file mode 100644
index 000000000..552659260
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_ssc.h
@@ -0,0 +1,292 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_ssc.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM34_CHIP_SAM_SSC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* SSC register offsets *****************************************************************/
+
+#define SAM_SSC_CR_OFFSET          0x000 /* Control Register */
+#define SAM_SSC_CMR_OFFSET         0x004 /* Clock Mode Register */
+                                           /* 0x008: Reserved */
+                                           /* 0x00c: Reserved */
+#define SAM_SSC_RCMR_OFFSET        0x010 /* Receive Clock Mode Register */
+#define SAM_SSC_RFMR_OFFSET        0x014 /* Receive Frame Mode Register */
+#define SAM_SSC_TCMR_OFFSET        0x018 /* Transmit Clock Mode Register */
+#define SAM_SSC_TFMR_OFFSET        0x01c /* Transmit Frame Mode Register */
+#define SAM_SSC_RHR_OFFSET         0x020 /* Receive Holding Register */
+#define SAM_SSC_THR_OFFSET         0x024 /* Transmit Holding Register */
+                                           /* 0x028: Reserved */
+                                           /* 0x02c: Reserved */
+#define SAM_SSC_RSHR_OFFSET        0x030 /* Receive Sync. Holding Register */
+#define SAM_SSC_TSHR_OFFSET        0x034 /* Transmit Sync. Holding Register */
+#define SAM_SSC_RC0R_OFFSET        0x038 /* Receive Compare 0 Register */
+#define SAM_SSC_RC1R_OFFSET        0x03c /* Receive Compare 1 Register */
+#define SAM_SSC_SR_OFFSET          0x040 /* Status Register */
+#define SAM_SSC_IER_OFFSET         0x044 /* Interrupt Enable Register */
+#define SAM_SSC_IDR_OFFSET         0x048 /* Interrupt Disable Register */
+#define SAM_SSC_IMR_OFFSET         0x04c /* Interrupt Mask Register */
+#define SAM_SSC_WPMR_OFFSET        0x0e4 /* Write Protect Mode Register */
+#define SAM_SSC_WPSR_OFFSET        0x0e8 /* Write Protect Status Register */
+                                           /* 0x050-0x0fc: Reserved */
+                                           /* 0x100-0x124: Reserved */
+
+/* SSC register adresses ****************************************************************/
+
+#define SAM_SSC_CR                 (SAM_SSC_BASE+SAM_SSC_CR_OFFSET)
+#define SAM_SSC_CMR                (SAM_SSC_BASE+SAM_SSC_CMR_OFFSET)
+#define SAM_SSC_RCMR               (SAM_SSC_BASE+SAM_SSC_RCMR_OFFSET)
+#define SAM_SSC_RFMR               (SAM_SSC_BASE+SAM_SSC_RFMR_OFFSET)
+#define SAM_SSC_TCMR               (SAM_SSC_BASE+SAM_SSC_TCMR_OFFSET)
+#define SAM_SSC_TFMR               (SAM_SSC_BASE+SAM_SSC_TFMR_OFFSET)
+#define SAM_SSC_RHR                (SAM_SSC_BASE+SAM_SSC_RHR_OFFSET)
+#define SAM_SSC_THR                (SAM_SSC_BASE+SAM_SSC_THR_OFFSET)
+#define SAM_SSC_RSHR               (SAM_SSC_BASE+SAM_SSC_RSHR_OFFSET)
+#define SAM_SSC_TSHR               (SAM_SSC_BASE+SAM_SSC_TSHR_OFFSET)
+#define SAM_SSC_RC0R               (SAM_SSC_BASE+SAM_SSC_RC0R_OFFSET)
+#define SAM_SSC_RC1R               (SAM_SSC_BASE+SAM_SSC_RC1R_OFFSET)
+#define SAM_SSC_SR                 (SAM_SSC_BASE+SAM_SSC_SR_OFFSET)
+#define SAM_SSC_IER                (SAM_SSC_BASE+SAM_SSC_IER_OFFSET)
+#define SAM_SSC_IDR                (SAM_SSC_BASE+SAM_SSC_IDR_OFFSET)
+#define SAM_SSC_IMR                (SAM_SSC_BASE+SAM_SSC_IMR_OFFSET)
+#define SAM_SSC_WPMR               (SAM_SSC_BASE+SAM_SSC_WPMR_OFFSET)
+#define SAM_SSC_WPSR               (SAM_SSC_BASE+SAM_SSC_WPSR_OFFSET)
+
+/* SSC register bit definitions *********************************************************/
+
+/* SSC Control Register */
+
+#define SSC_CR_RXEN                (1 << 0)  /* Bit 0:  Receive Enable */
+#define SSC_CR_RXDIS               (1 << 1)  /* Bit 1:  Receive Disable */
+#define SSC_CR_TXEN                (1 << 8)  /* Bit 8:  Transmit Enable */
+#define SSC_CR_TXDIS               (1 << 9)  /* Bit 9:  Transmit Disable */
+#define SSC_CR_SWRST               (1 << 15) /* Bit 15: Software Reset */
+
+/* SSC Clock Mode Register */
+
+#define SSC_CMR_DIV_SHIFT          (0)       /* Bits 0-11:  Clock Divider */
+#define SSC_CMR_DIV_MASK           (0xfff << SSC_CMR_DIV_SHIFT)
+
+/* SSC Receive Clock Mode Register */
+
+#define SSC_RCMR_CKS_SHIFT         (0)       /* Bits 0-1:  Receive Clock Selection */
+#define SSC_RCMR_CKS_MASK          (3 << SSC_RCMR_CKS_SHIFT)
+#  define SSC_RCMR_CKS_DIVIDED     (0 << SSC_RCMR_CKS_SHIFT) /* Divided Clock */
+#  define SSC_RCMR_CKS_TK          (1 << SSC_RCMR_CKS_SHIFT) /* TK Clock signal */
+#  define SSC_RCMR_CKS_RK          (2 << SSC_RCMR_CKS_SHIFT) /* RK pin */
+#define SSC_RCMR_CKO_SHIFT         (2)       /* Bits 2-4:  Receive Clock Output Mode Selection */
+#define SSC_RCMR_CKO_MASK          (7 << SSC_RCMR_CKO_SHIFT)
+#  define SSC_RCMR_CKO_ NONE       (0 << SSC_RCMR_CKO_SHIFT) /* None */
+#  define SSC_RCMR_CKO_CONTINUOUS  (1 << SSC_RCMR_CKO_SHIFT) /* Continuous Receive Clock */
+#  define SSC_RCMR_CKO_XFERS       (2 << SSC_RCMR_CKO_SHIFT) /* Receive Clock only during data transfers */
+#define SSC_RCMR_CKI               (1 << 5)  /* Bit 5:  Receive Clock Inversion */
+#define SSC_RCMR_CKG_SHIFT         (6)       /* Bits 6-7:  Receive Clock Gating Selection */
+#define SSC_RCMR_CKG_MASK          (3 << SSC_RCMR_CKG_SHIFT)
+#  define SSC_RCMR_CKG_NONE        (0 << SSC_RCMR_CKG_SHIFT) /* None, continuous clock */
+#  define SSC_RCMR_CKG_RFLOW       (1 << SSC_RCMR_CKG_SHIFT) /* Receive Clock enabled only if RF Low */
+#  define SSC_RCMR_CKG_RFHIGH      (2 << SSC_RCMR_CKG_SHIFT) /* Receive Clock enabled only if RF High */
+#define SSC_RCMR_START_SHIFT       (8)      /* Bits 8-11:  Receive Start Selection */
+#define SSC_RCMR_START_MASK        (15 << SSC_RCMR_START_SHIFT)
+#  define SSC_RCMR_START_CONTINOUS (0 << SSC_RCMR_START_SHIFT) /* Continuous */
+#  define SSC_RCMR_START_START     (1 << SSC_RCMR_START_SHIFT) /* Transmit start */
+#  define SSC_RCMR_START_RFLOW     (2 << SSC_RCMR_START_SHIFT) /* Low level on RF signal */
+#  define SSC_RCMR_START_RFHIGH    (3 << SSC_RCMR_START_SHIFT) /* High level on RF signal */
+#  define SSC_RCMR_START_RFFALL    (4 << SSC_RCMR_START_SHIFT) /* Falling edge on RF signal */
+#  define SSC_RCMR_START_RFRISE    (5 << SSC_RCMR_START_SHIFT) /* Rising edge on RF signal */
+#  define SSC_RCMR_START_ANYLEVEL  (6 << SSC_RCMR_START_SHIFT) /* Any level change on RF signal */
+#  define SSC_RCMR_START_ANYEDGE   (7 << SSC_RCMR_START_SHIFT) /* Any edge on RF signal */
+#  define SSC_RCMR_START_CMP0      (8 << SSC_RCMR_START_SHIFT) /* Compare 0 */
+#define SSC_RCMR_STOP              (1 << 12) /* Bit 12: Receive Stop Select */
+#define SSC_RCMR_STTDLY_SHIFT      (15)      /* Bits 16-23:  Receive Start Delay */
+#define SSC_RCMR_STTDLY_MASK       (0xff << SSC_RCMR_STTDLY_SHIFT)
+#define SSC_RCMR_PERIOD_SHIFT      (24)      /* Bits 24-31:  Receive Period Divider Selection */
+#define SSC_RCMR_PERIOD_MASK       (0xff << SSC_RCMR_PERIOD_SHIFT)
+
+
+/* SSC Receive Frame Mode Register */
+
+#define SSC_RFMR_DATLEN_SHIFT      (0)       /* Bits 0-4:  Data Length */
+#define SSC_RFMR_DATLEN_MASK       (31 << SSC_RFMR_DATLEN_SHIFT)
+#define SSC_RFMR_LOOP              (1 << 5)  /* Bit 5:  Loop Mode */
+#define SSC_RFMR_MSBF              (1 << 7)  /* Bit 7:  Most Significant Bit First */
+#define SSC_RFMR_DATNB_SHIFT       (8)       /* Bits 8-11:  Data Number per Frame */
+#define SSC_RFMR_DATNB_MASK        (15 << SSC_RFMR_DATNB_SHIFT)
+#define SSC_RFMR_FSLEN_SHIFT       (16)      /* Bits 16-19:  Receive Frame Sync Length */
+#define SSC_RFMR_FSLEN_MASK        (15 << SSC_RFMR_FSLEN_SHIFT)
+#define SSC_RFMR_FSOS_SHIFT        (20)      /* Bits 20-22:  Receive Frame Sync Output Selection */
+#define SSC_RFMR_FSOS_MASK         (7 << SSC_RFMR_FSOS_SHIFT)
+#  define SSC_RFMR_FSOS_NONE       (0 << SSC_RFMR_FSOS_SHIFT) /* None */
+#  define SSC_RFMR_FSOS_NEG        (1 << SSC_RFMR_FSOS_SHIFT) /* 0x1 Negative Pulse */
+#  define SSC_RFMR_FSOS_POW        (2 << SSC_RFMR_FSOS_SHIFT) /* 0x2 Positive Pulse */
+#  define SSC_RFMR_FSOS_LOW        (3 << SSC_RFMR_FSOS_SHIFT) /* 0x3 Driven Low during data transfer */
+#  define SSC_RFMR_FSOS_HIGH       (4 << SSC_RFMR_FSOS_SHIFT) /* 0x4 Driven High during data transfer */
+#  define SSC_RFMR_FSOS_TOGGLE     (5 << SSC_RFMR_FSOS_SHIFT) /* 0x5 Toggling at each start of data transfer */
+#define SSC_RFMR_FSEDGE            (1 << 24) /* Bit 24: Frame Sync Edge Detect */
+#define SSC_RFMR_FSLENEXT_SHIFT    (28)      /* Bits 28-31:  FSLEN Field Extension */
+#define SSC_RFMR_FSLENEXT_MASK     (15 << SSC_RFMR_FSLENEXT_SHIFT)
+
+/* SSC Transmit Clock Mode Register */
+
+#define SSC_TCMR_CKS_SHIFT         (0)       /* Bits 0-1:  Transmit Clock Selection */
+#define SSC_TCMR_CKS_MASK          (3 << SSC_TCMR_CKS_SHIFT)
+#  define SSC_TCMR_CKS_DIVIDED     (0 << SSC_TCMR_CKS_SHIFT) /* Divided Clock */
+#  define SSC_TCMR_CKS_TK          (1 << SSC_TCMR_CKS_SHIFT) /* TK Clock signal */
+#  define SSC_TCMR_CKS_RK          (2 << SSC_TCMR_CKS_SHIFT) /* RK pin */
+#define SSC_TCMR_CKO_SHIFT         (2)       /* Bits 2-4:  Transmit Clock Output Mode Selection */
+#define SSC_TCMR_CKO_MASK          (7 << SSC_TCMR_CKO_SHIFT)
+#  define SSC_TCMR_CKO_ NONE       (0 << SSC_TCMR_CKO_SHIFT) /* None */
+#  define SSC_TCMR_CKO_CONTINUOUS  (1 << SSC_TCMR_CKO_SHIFT) /* Continuous Transmit Clock */
+#  define SSC_TCMR_CKO_XFERS       (2 << SSC_TCMR_CKO_SHIFT) /* Transmit Clock only during data transfers */
+#define SSC_TCMR_CKI               (1 << 5)  /* Bit 5:  Transmit Clock Inversion */
+#define SSC_TCMR_CKG_SHIFT         (6)       /* Bits 6-7:  Transmit Clock Gating Selection */
+#define SSC_TCMR_CKG_MASK          (3 << SSC_TCMR_CKG_SHIFT)
+#  define SSC_TCMR_CKG_NONE        (0 << SSC_TCMR_CKG_SHIFT) /* None, continuous clock */
+#  define SSC_tCMR_CKG_TFLOW       (1 << SSC_TCMR_CKG_SHIFT) /* Receive Clock enabled only if TF Low */
+#  define SSC_TCMR_CKG_TFHIGH      (2 << SSC_TCMR_CKG_SHIFT) /* Receive Clock enabled only if TF High */
+#define SSC_TCMR_START_SHIFT       (8)      /* Bits 8-11:  Transmit Start Selection */
+#define SSC_TCMR_START_MASK        (15 << SSC_TCMR_START_SHIFT)
+#  define SSC_TCMR_START_CONTINOUS (0 << SSC_TCMR_START_SHIFT) /* Continuous */
+#  define SSC_TCMR_START_START     (1 << SSC_TCMR_START_SHIFT) /* Receive start */
+#  define SSC_TCMR_START_TFLOW     (2 << SSC_TCMR_START_SHIFT) /* Low level on TF signal */
+#  define SSC_TCMR_START_TFHIGH    (3 << SSC_TCMR_START_SHIFT) /* High level on TF signal */
+#  define SSC_TCMR_START_TFFALL    (4 << SSC_TCMR_START_SHIFT) /* Falling edge on TF signal */
+#  define SSC_TCMR_START_TFRISE    (5 << SSC_TCMR_START_SHIFT) /* Rising edge on TF signal */
+#  define SSC_TCMR_START_ANYLEVEL  (6 << SSC_TCMR_START_SHIFT) /* Any level change on TF signal */
+#  define SSC_TCMR_START_ANYEDGE   (7 << SSC_TCMR_START_SHIFT) /* Any edge on TF signal */
+#define SSC_TCMR_STTDLY_SHIFT      (16)      /* Bits 16-23:  Transmit Start Delay */
+#define SSC_TCMR_STTDLY_MASK       (0xff << SSC_TCMR_STTDLY_SHIFT)
+#define SSC_TCMR_PERIOD_SHIFT      (24)      /* Bits 24-31:  Transmit Period Divider Selection */
+#define SSC_TCMR_PERIOD_MASK       (0xff << SSC_TCMR_PERIOD_SHIFT)
+
+/* SSC Transmit Frame Mode Register */
+
+#define SSC_TFMR_DATLEN_SHIFT      (0)       /* Bits 0-4:  Data Length */
+#define SSC_TFMR_DATLEN_MASK       (31 << SSC_TFMR_DATLEN_SHIFT)
+#define SSC_TFMR_DATDEF            (1 << 5)  /* Bit 5:  Data Default Value */
+#define SSC_TFMR_MSBF              (1 << 7)  /* Bit 7:  Most Significant Bit First */
+#define SSC_TFMR_DATNB_SHIFT       (8)       /* Bits 8-11:  Data Number per frame */
+#define SSC_TFMR_DATNB_MASK        (15 << SSC_TFMR_DATNB_SHIFT)
+#define SSC_TFMR_FSLEN_SHIFT       (16)      /* Bits 16-19:  Transmit Frame Syn Length */
+#define SSC_TFMR_FSLEN_MASK        (15 << SSC_TFMR_FSLEN_SHIFT)
+#define SSC_TFMR_FSOS_SHIFT        (20)      /* Bits 20-22:  Transmit Frame Sync Output Selection */
+#define SSC_TFMR_FSOS_MASK         (7 << SSC_TFMR_FSOS_SHIFT)
+#  define SSC_TFMR_FSOS_NONE       (0 << SSC_TFMR_FSOS_SHIFT) /* None */
+#  define SSC_TFMR_FSOS_NEG        (1 << SSC_TFMR_FSOS_SHIFT) /* 0x1 Negative Pulse */
+#  define SSC_TFMR_FSOS_POW        (2 << SSC_TFMR_FSOS_SHIFT) /* 0x2 Positive Pulse */
+#  define SSC_TFMR_FSOS_LOW        (3 << SSC_TFMR_FSOS_SHIFT) /* 0x3 Driven Low during data transfer */
+#  define SSC_TFMR_FSOS_HIGH       (4 << SSC_TFMR_FSOS_SHIFT) /* 0x4 Driven High during data transfer */
+#  define SSC_TFMR_FSOS_TOGGLE     (5 << SSC_TFMR_FSOS_SHIFT) /* 0x5 Toggling at each start of data transfer */
+#define SSC_TFMR_FSDEN             (1 << 23) /* Bit 23: Frame Sync Data Enable */
+#define SSC_TFMR_FSEDGE            (1 << 24) /* Bit 24: Frame Sync Edge Detection */
+#define SSC_TFMR_FSLENEXT_SHIFT    (28)      /* Bits 28-31:  FSLEN Field Extension */
+#define SSC_TFMR_FSLENEXT_MASK     (15 << SSC_TFMR_FSLENEXT_SHIFT)
+
+/* SSC Receive Synchronization Holding Register */
+
+#define SSC_RSHR_RSDAT_SHIFT       (0)       /* Bits 0-15:  Receive Synchronization Data */
+#define SSC_RSHR_RSDAT_MASK        (0xffff << SSC_RSHR_RSDAT_SHIFT)
+
+/* SSC Transmit Synchronization Holding Register */
+
+#define SSC_TSHR_TSDAT_SHIFT       (0)       /* Bits 0-15:  Transmit Synchronization Data */
+#define SSC_TSHR_TSDAT_MASK        (0xffff << SSC_TSHR_TSDAT_SHIFT)
+
+/* SSC Receive Compare 0 Register */
+
+#define SSC_RC0R_CP0_SHIFT         (0)        /* Bits 0-15:  Receive Compare Data 0 */
+#define SSC_RC0R_CP0_MASK          (0xffff << SSC_RC0R_CP0_SHIFT)
+
+/* SSC Receive Compare 1 Register */
+
+#define SSC_RC1R_CP1_SHIFT         (0)      /* Bits 0-15:  Receive Compare Data 1 */
+#define SSC_RC1R_CP1_MASK          (0xffff << SSC_RC1R_CP1_SHIFT)
+
+/* SSC Status Register, SSC Interrupt Enable Register, SSC Interrupt Disable
+ * Register, and SSC Interrupt Mask Register commin bit-field definitions
+ */
+
+#define SSC_INT_TXRDY              (1 << 0)  /* Bit 0:  Transmit Ready */
+#define SSC_INT_TXEMPTY            (1 << 1)  /* Bit 1:  Transmit Empty */
+#define SSC_INT_ENDTX              (1 << 2)  /* Bit 2:  End of Transmission */
+#define SSC_INT_TXBUFE             (1 << 3)  /* Bit 3:  Transmit Buffer Empty */
+#define SSC_INT_RXRDY              (1 << 4)  /* Bit 4:  Receive Ready */
+#define SSC_INT_OVRUN              (1 << 5)  /* Bit 5:  Receive Overrun */
+#define SSC_INT_ENDRX              (1 << 6)  /* Bit 6:  End of Reception */
+#define SSC_INT_RXBUFF             (1 << 7)  /* Bit 7:  Receive Buffer Full */
+#define SSC_INT_CP0                (1 << 8)  /* Bit 8:  Compare 0 */
+#define SSC_INT_CP1                (1 << 9)  /* Bit 9:  Compare 1 */
+#define SSC_INT_TXSYN              (1 << 10) /* Bit 10: Transmit Sync */
+#define SSC_INT_RXSYN              (1 << 11) /* Bit 11: Receive Sync */
+#define SSC_SR_TXEN                (1 << 16) /* Bit 16: Transmit Enable (SR only) */
+#define SSC_SR_RXEN                (1 << 17) /* Bit 17: Receive Enable (SR only) */
+
+/* SSC Write Protect Mode Register */
+
+#define SSC_WPMR_WPEN              (1 << 0)  /* Bit 0:  Write Protect Enable */
+#define SSC_WPMR_WPKEY_SHIFT       (8)       /* Bits 8-31:  Write Protect KEY */
+#define SSC_WPMR_WPKEY_MASK        (0x00ffffff << SSC_WPMR_WPKEY_SHIFT)
+
+/* SSC Write Protect Status Register */
+
+#define SSC_WPSR_WPVS              (1 << 0)  /* Bit 0:  Write Protect Violation Status */
+#define SSC_WPSR_WPVSRC_SHIFT      (8)       /* Bits 8-23:  Write Protect Violation Source */
+#define SSC_WPSR_WPVSRC_MASK       (0xffff << SSC_WPSR_WPVSRC_SHIFT)
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Data
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Functions
+ ****************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SSC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_supc.h b/nuttx/arch/arm/src/sam34/chip/sam_supc.h
index 5bd28de50..1be920d0d 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_supc.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_supc.h
@@ -1,7 +1,7 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/sam3u_supc.h
+ * arch/arm/src/sam34/chip/sam_supc.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_SUPC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_SUPC_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "sam3u_memorymap.h"
+#include "chip/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -51,21 +51,21 @@
 
 /* SUPC register offsets ****************************************************************/
 
-#define SAM3U_SUPC_CR_OFFSET           0x00 /* Supply Controller Control Register */
-#define SAM3U_SUPC_SMMR_OFFSET         0x04 /* Supply Controller Supply Monitor Mode Register */
-#define SAM3U_SUPC_MR_OFFSET           0x08 /* Supply Controller Mode Register */
-#define SAM3U_SUPC_WUMR_OFFSET         0x0c /* Supply Controller Wake Up Mode Register */
-#define SAM3U_SUPC_WUIR_OFFSET         0x10 /* Supply Controller Wake Up Inputs Register */
-#define SAM3U_SUPC_SR_OFFSET           0x14 /* Supply Controller Status Register */
+#define SAM_SUPC_CR_OFFSET             0x00 /* Supply Controller Control Register */
+#define SAM_SUPC_SMMR_OFFSET           0x04 /* Supply Controller Supply Monitor Mode Register */
+#define SAM_SUPC_MR_OFFSET             0x08 /* Supply Controller Mode Register */
+#define SAM_SUPC_WUMR_OFFSET           0x0c /* Supply Controller Wake Up Mode Register */
+#define SAM_SUPC_WUIR_OFFSET           0x10 /* Supply Controller Wake Up Inputs Register */
+#define SAM_SUPC_SR_OFFSET             0x14 /* Supply Controller Status Register */
 
 /* SUPC register adresses ***************************************************************/
 
-#define SAM3U_SUPC_CR                  (SAM3U_SUPC_BASE+SAM3U_SUPC_CR_OFFSET)
-#define SAM3U_SUPC_SMMR                (SAM3U_SUPC_BASE+SAM3U_SUPC_SMMR_OFFSET)
-#define SAM3U_SUPC_MR                  (SAM3U_SUPC_BASE+SAM3U_SUPC_MR_OFFSET)
-#define SAM3U_SUPC_WUMR                (SAM3U_SUPC_BASE+SAM3U_SUPC_WUMR_OFFSET)
-#define SAM3U_SUPC_WUIR                (SAM3U_SUPC_BASE+SAM3U_SUPC_WUIR_OFFSET)
-#define SAM3U_SUPC_SR                  (SAM3U_SUPC_BASE+SAM3U_SUPC_SR_OFFSET)
+#define SAM_SUPC_CR                    (SAM_SUPC_BASE+SAM_SUPC_CR_OFFSET)
+#define SAM_SUPC_SMMR                  (SAM_SUPC_BASE+SAM_SUPC_SMMR_OFFSET)
+#define SAM_SUPC_MR                    (SAM_SUPC_BASE+SAM_SUPC_MR_OFFSET)
+#define SAM_SUPC_WUMR                  (SAM_SUPC_BASE+SAM_SUPC_WUMR_OFFSET)
+#define SAM_SUPC_WUIR                  (SAM_SUPC_BASE+SAM_SUPC_WUIR_OFFSET)
+#define SAM_SUPC_SR                    (SAM_SUPC_BASE+SAM_SUPC_SR_OFFSET)
 
 /* SUPC register bit definitions ********************************************************/
 
@@ -161,4 +161,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_SUPC_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_SUPC_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_tc.h b/nuttx/arch/arm/src/sam34/chip/sam_tc.h
new file mode 100644
index 000000000..de2046852
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_tc.h
@@ -0,0 +1,347 @@
+/************************************************************************************************
+ * arch/arm/src/sam34/chip/sam_tc.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM34_CHIP_SAM_TC_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H
+
+/************************************************************************************************
+ * Included Files
+ ************************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/************************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************************/
+
+/* TC register offsets **************************************************************************/
+
+/* Timer channel offsets (with respect to timer base offset 0f 0x00, 0x40, or 0x80 */
+
+#define SAM_TCN_OFFSET(n)            (0x00 + ((n)<<6)) /* 0x00, 0x40, 0x80 */
+#define SAM_TCN_CCR_OFFSET           0x00 /* Channel Control Register */
+#define SAM_TCN_CMR_OFFSET           0x04 /* Channel Mode Register */
+                                          /* 0x08 Reserved */
+                                          /* 0x0c Reserved */
+#define SAM_TCN_CV_OFFSET            0x10 /* Counter Value */
+#define SAM_TCN_RA_OFFSET            0x14 /* Register A */
+#define SAM_TCN_RB_OFFSET            0x18 /* Register B */
+#define SAM_TCN_RC_OFFSET            0x1c /* Register C */
+#define SAM_TCN_SR_OFFSET            0x20 /* Status Register */
+#define SAM_TCN_IER_OFFSET           0x24 /* Interrupt Enable Register */
+#define SAM_TCN_IDR_OFFSET           0x28 /* Interrupt Disable Register */
+#define SAM_TCN_IMR_OFFSET           0x2c /* Interrupt Mask Register */
+
+/* Timer common registers */
+
+#define SAM_TC_BCR_OFFSET            0xc0 /* Block Control Register */
+#define SAM_TC_BMR_OFFSET            0xc4 /* Block Mode Register */
+#define SAM_TC_QIER_OFFSET           0xc8 /* QDEC Interrupt Enable Register */
+#define SAM_TC_QIDR_OFFSET           0xcc /* QDEC Interrupt Disable Register */
+#define SAM_TC_QIMR_OFFSET           0xd0 /* QDEC Interrupt Mask Register */
+#define SAM_TC_QISR_OFFSET           0xd4 /* QDEC Interrupt Status Register */
+                                          /* 0xd8 Reserved */
+                                          /* 0xe4 Reserved */
+
+/* TC register adresses *************************************************************************/
+
+/* Timer channel offsets (with respect to timer base offset 0f 0x00, 0x40, or 0x80 */
+
+#define SAM_TC_CCR(n)                (SAM_TCN_BASE(n)+SAM_TCN_CCR_OFFSET)
+#define SAM_TC_CMR(n)                (SAM_TCN_BASE(n)+SAM_TCN_CMR_OFFSET)
+#define SAM_TC_CV(n)                 (SAM_TCN_BASE(n)+SAM_TCN_CV_OFFSET)
+#define SAM_TC_RA(n)                 (SAM_TCN_BASE(n)+SAM_TCN_RA_OFFSET)
+#define SAM_TC_RB(n)                 (SAM_TCN_BASE(n)+SAM_TCN_RB_OFFSET)
+#define SAM_TC_RC(n)                 (SAM_TCN_BASE(n)+SAM_TCN_RC_OFFSET)
+#define SAM_TC_SR(n)                 (SAM_TCN_BASE(n)+SAM_TCN_SR_OFFSET)
+#define SAM_TC_IER(n)                (SAM_TCN_BASE(n)+SAM_TCN_IER_OFFSET)
+#define SAM_TC_IDR(n)                (SAM_TCN_BASE(n)+SAM_TCN_IDR_OFFSET)
+#define SAM_TC_IMR(n)                (SAM_TCN_BASE(n)+SAM_TCN_IMR_OFFSET)
+
+#define SAM_TC0_CCR                  (SAM_TC0_BASE+SAM_TCN_CCR_OFFSET)
+#define SAM_TC0_CMR                  (SAM_TC0_BASE+SAM_TCN_CMR_OFFSET)
+#define SAM_TC0_CV                   (SAM_TC0_BASE+SAM_TCN_CV_OFFSET)
+#define SAM_TC0_RA                   (SAM_TC0_BASE+SAM_TCN_RA_OFFSET)
+#define SAM_TC0_RB                   (SAM_TC0_BASE+SAM_TCN_RB_OFFSET)
+#define SAM_TC0_RC                   (SAM_TC0_BASE+SAM_TCN_RC_OFFSET)
+#define SAM_TC0_SR                   (SAM_TC0_BASE+SAM_TCN_SR_OFFSET)
+#define SAM_TC0_IER                  (SAM_TC0_BASE+SAM_TCN_IER_OFFSET)
+#define SAM_TC0_IDR                  (SAM_TC0_BASE+SAM_TCN_IDR_OFFSET)
+#define SAM_TC0_IMR                  (SAM_TC0_BASE+SAM_TCN_IMR_OFFSET)
+
+#define SAM_TC1_CCR                  (SAM_TC1_BASE+SAM_TCN_CCR_OFFSET)
+#define SAM_TC1_CMR                  (SAM_TC1_BASE+SAM_TCN_CMR_OFFSET)
+#define SAM_TC1_CV                   (SAM_TC1_BASE+SAM_TCN_CV_OFFSET)
+#define SAM_TC1_RA                   (SAM_TC1_BASE+SAM_TCN_RA_OFFSET)
+#define SAM_TC1_RB                   (SAM_TC1_BASE+SAM_TCN_RB_OFFSET)
+#define SAM_TC1_RC                   (SAM_TC1_BASE+SAM_TCN_RC_OFFSET)
+#define SAM_TC1_SR                   (SAM_TC1_BASE+SAM_TCN_SR_OFFSET)
+#define SAM_TC1_IER                  (SAM_TC1_BASE+SAM_TCN_IER_OFFSET)
+#define SAM_TC1_IDR                  (SAM_TC1_BASE+SAM_TCN_IDR_OFFSET)
+#define SAM_TC1_IMR                  (SAM_TC1_BASE+SAM_TCN_IMR_OFFSET)
+
+#define SAM_TC2_CCR                  (SAM_TC2_BASE+SAM_TCN_CCR_OFFSET)
+#define SAM_TC2_CMR                  (SAM_TC2_BASE+SAM_TCN_CMR_OFFSET)
+#define SAM_TC2_CV                   (SAM_TC2_BASE+SAM_TCN_CV_OFFSET)
+#define SAM_TC2_RA                   (SAM_TC2_BASE+SAM_TCN_RA_OFFSET)
+#define SAM_TC2_RB                   (SAM_TC2_BASE+SAM_TCN_RB_OFFSET)
+#define SAM_TC2_RC                   (SAM_TC2_BASE+SAM_TCN_RC_OFFSET)
+#define SAM_TC2_SR                   (SAM_TC2_BASE+SAM_TCN_SR_OFFSET)
+#define SAM_TC2_IER                  (SAM_TC2_BASE+SAM_TCN_IER_OFFSET)
+#define SAM_TC2_IDR                  (SAM_TC2_BASE+SAM_TCN_IDR_OFFSET)
+#define SAM_TC2_IMR                  (SAM_TC2_BASE+SAM_TCN_IMR_OFFSET)
+
+/* Timer common registers */
+
+#define SAM_TC_BCR                   (SAM_TC_BASE+SAM_TC_BCR_OFFSET)
+#define SAM_TC_BMR                   (SAM_TC_BASE+SAM_TC_BMR_OFFSET)
+#define SAM_TC_QIER                  (SAM_TC_BASE+SAM_TC_QIER_OFFSET)
+#define SAM_TC_QIDR                  (SAM_TC_BASE+SAM_TC_QIDR_OFFSET)
+#define SAM_TC_QIMR                  (SAM_TC_BASE+SAM_TC_QIMR_OFFSET)
+#define SAM_TC_QISR                  (SAM_TC_BASE+SAM_TC_QISR_OFFSET)
+
+/* TC register bit definitions ******************************************************************/
+
+/* Timer common registers */
+/* TC Block Control Register */
+
+#define TC_BCR_SYNC                  (1 << 0)  /* Bit 0: Synchro Command
+
+/* TC Block Mode Register */
+
+#define TC_BMR_TC0XC0S_SHIFT         (0)       /* Bits 0-1: External Clock Signal 0 Selection */
+#define TC_BMR_TC0XC0S_MASK          (3 << TC_BMR_TC0XC0S_SHIFT)
+#  define TC_BMR_TC0XC0S_TCLK0       (0 << TC_BMR_TC0XC0S_SHIFT)
+#  define TC_BMR_TC0XC0S_NONE        (1 << TC_BMR_TC0XC0S_SHIFT)
+#  define TC_BMR_TC0XC0S_TIOA1       (2 << TC_BMR_TC0XC0S_SHIFT)
+#  define TC_BMR_TC0XC0S_TIOA2       (3 << TC_BMR_TC0XC0S_SHIFT)
+#define TC_BMR_TC1XC1S_SHIFT         (2)       /* Bits 2-3: External Clock Signal 1 Selection */
+#define TC_BMR_TC1XC1S_MASK          (3 << TC_BMR_TC1XC1S_MASK)
+#  define TC_BMR_TC1XC1S_TCLK1       (0 << TC_BMR_TC1XC1S_SHIFT)
+#  define TC_BMR_TC1XC1S_NONE        (1 << TC_BMR_TC1XC1S_SHIFT)
+#  define TC_BMR_TC1XC1S_TIOA0       (2 << TC_BMR_TC1XC1S_SHIFT)
+#  define TC_BMR_TC1XC1S_TIOA2       (3 << TC_BMR_TC1XC1S_SHIFT)
+#define TC_BMR_TC2XC2S_SHIFT         (4)       /* Bits 4-5: External Clock Signal 2 Selection */
+#define TC_BMR_TC2XC2S_MASK          (3 << TC_BMR_TC2XC2S_SHIFT)
+#  define TC_BMR_TC2XC2S_TCLK2       (0 << TC_BMR_TC2XC2S_SHIFT)
+#  define TC_BMR_TC2XC2S_NONE        (1 << TC_BMR_TC2XC2S_SHIFT)
+#  define TC_BMR_TC2XC2S_TIOA0       (2 << TC_BMR_TC2XC2S_SHIFT)
+#  define TC_BMR_TC2XC2S_TIOA1       (3 << TC_BMR_TC2XC2S_SHIFT)
+#define TC_BMR_QDEN                  (1 << 8)  /* Bit 8:  Quadrature Decoder Enabled */
+#define TC_BMR_POSEN                 (1 << 9)  /* Bit 9:  Position Enabled */
+#define TC_BMR_SPEEDEN               (1 << 10) /* Bit 10: Speed Enabled */
+#define TC_BMR_QDTRANS               (1 << 11) /* Bit 11: Quadrature Decoding Transparent */
+#define TC_BMR_EDGPHA                (1 << 12) /* Bit 12: Edge on PHA count mode */
+#define TC_BMR_INVA                  (1 << 13) /* Bit 13: Inverted PHA */
+#define TC_BMR_INVB                  (1 << 14) /* Bit 14: Inverted PHB */
+#define TC_BMR_SWAP                  (1 << 15) /* Bit 15: Swap PHA and PHB */
+#define TC_BMR_INVIDX                (1 << 16) /* Bit 16: Inverted Index */
+#define TC_BMR_IDXPHB                (1 << 17) /* Bit 17: Index pin is PHB pin */
+#define TC_BMR_FILTER                (1 << 19) /* Bit 19 */
+#define TC_BMR_MAXFILT_SHIFT         (20)      /* Bits 20-25: Maximum Filter */
+#define TC_BMR_MAXFILT_MASK          (63 << TC_BMR_MAXFILT_SHIFT)
+
+/* TC QDEC Interrupt Enable Register, TC QDEC Interrupt Disable Register,
+ * TC QDEC Interrupt Mask Register, TC QDEC Interrupt Status Register common
+ * bit field definitions
+ */
+
+#define TC_QINT_IDX                  (1 << 0)  /* Bit 0: Index (Common) */
+#define TC_QINT_DIRCHG               (1 << 1)  /* Bit 1: Direction Change (Common) */
+#define TC_QINT_QERR                 (1 << 2)  /* Bit 2: Quadrature Error (Common) */
+#define TC_QISR_DIR                  (1 << 8)  /* Bit 8: Direction (QISR only) */
+
+/* Timer Channel Registers */
+/* TC Channel Control Register */
+
+#define TCN_CCR_CLKEN                (1 << 0)  /* Bit 0: Counter Clock Enable Command */
+#define TCN_CCR_CLKDIS               (1 << 1)  /* Bit 1: Counter Clock Disable Command */
+#define TCN_CCR_SWTRG                (1 << 2)  /* Bit 2: Software Trigger Command */
+
+/* TC Channel Mode Register */
+
+#define TCN_CMR_TCCLKS_SHIFT         (0)       /* Bits 0-2: Clock Selection (Common) */
+#define TCN_CMR_TCCLKS_MASK          (7 << TCN_CMR_TCCLKS_SHIFT)
+#  define TCN_CMR_TCCLKS_TIMERCLOCK1 (0 << TCN_CMR_TCCLKS_SHIFT)
+#  define TCN_CMR_TCCLKS_TIMERCLOCK2 (1 << TCN_CMR_TCCLKS_SHIFT)
+#  define TCN_CMR_TCCLKS_TIMERCLOCK3 (2 << TCN_CMR_TCCLKS_SHIFT)
+#  define TCN_CMR_TCCLKS_TIMERCLOCK4 (3 << TCN_CMR_TCCLKS_SHIFT)
+#  define TCN_CMR_TCCLKS_TIMERCLOCK5 (4 << TCN_CMR_TCCLKS_SHIFT)
+#  define TCN_CMR_TCCLKS_XC0         (5 << TCN_CMR_TCCLKS_SHIFT)
+#  define TCN_CMR_TCCLKS_XC1         (6 << TCN_CMR_TCCLKS_SHIFT)
+#  define TCN_CMR_TCCLKS_XC2         (7 << TCN_CMR_TCCLKS_SHIFT)
+#define TCN_CMR_CLKI                 (1 << 3)  /* Bit 3: Clock Invert (Common) */
+#define TCN_CMR_BURST_SHIFT          (4)       /* Bits 4-5: Burst Signal Selection (Common) */
+#define TCN_CMR_BURST_MASK           (3 << TCN_CMR_BURST_MASK)
+#define TCN_CMR_BURST_MASK           (3 << TCN_CMR_BURST_MASK)
+#  define TCN_CMR_BURST_NOTGATED     (0 << TCN_CMR_BURST_MASK) /* Nott gated by external signal */
+#  define TCN_CMR_BURST_XC0          (1 << TCN_CMR_BURST_MASK) /* XC0 ANDed with selected clock */
+#  define TCN_CMR_BURST_XC1          (2 << TCN_CMR_BURST_MASK) /* XC1 ANDed with selected clock */
+#  define TCN_CMR_BURST_XC2          (3 << TCN_CMR_BURST_MASK) /* XC2 ANDed with selected clock */
+#define TCN_CMR_WAVE                 (1 << 15) /* Bit 15: (Common) */
+
+#define TCN_CMR_LDBSTOP              (1 << 6)  /* Bit 6: Counter stopped with RB Loading (Capture mode) */
+#define TCN_CMR_LDBDIS               (1 << 7)  /* Bit 7: Counter disable with RB Loading (Capture mode) */
+#define TCN_CMR_ETRGEDG_SHIFT        (8)       /* Bits 8-9: External Trigger Edge Selection (Capture mode) */
+#define TCN_CMR_ETRGEDG_MASK         (3 << TCN_CMR_ETRGEDG_SHIFT)
+#  define TCN_CMR_ETRGEDG_NONE       (0 << TCN_CMR_ETRGEDG_SHIFT) /* None */
+#  define TCN_CMR_ETRGEDG_REDGE      (1 << TCN_CMR_ETRGEDG_SHIFT) /* Rising edge */
+#  define TCN_CMR_ETRGEDG_FEDGE      (2 << TCN_CMR_ETRGEDG_SHIFT) /* Falling edge */
+#  define TCN_CMR_ETRGEDG_EACH       (3 << TCN_CMR_ETRGEDG_SHIFT) /* Each */
+#define TCN_CMR_ABETRG               (1 << 10) /* Bit 10: TIOA or TIOB External Trigger Selection (Capture mode) */
+#define TCN_CMR_CPCTRG               (1 << 14) /* Bit 14: RC Compare Trigger Enable (Capture mode) */
+#define TCN_CMR_LDRA_SHIFT           (16)      /* Bits 16-17: RA Loading Selection (Capture mode) */
+#define TCN_CMR_LDRA_MASK            (3 << TCN_CMR_LDRA_SHIFT)
+#  define TCN_CMR_LDRA_NONE          (0 << TCN_CMR_LDRA_SHIFT) /* None */
+#  define TCN_CMR_LDRA_REDGE         (1 << TCN_CMR_LDRA_SHIFT) /* Rising edge of TIOA */
+#  define TCN_CMR_LDRA_FEDGE         (2 << TCN_CMR_LDRA_SHIFT) /* Falling edge of TIOA */
+#  define TCN_CMR_LDRA_EACH          (3 << TCN_CMR_LDRA_SHIFT) /* Each  edge of TIOA */
+#define TCN_CMR_LDRB_SHIFT           (18)      /* Bits 18-19: RB Loading Selection (Capture mode) */
+#define TCN_CMR_LDRB_MASK            (3 << TCN_CMR_LDRB_SHIFT)
+#  define TCN_CMR_LDRB_NONE          (0 << TCN_CMR_LDRB_SHIFT) /* None */
+#  define TCN_CMR_LDRB_REDGE         (1 << TCN_CMR_LDRB_SHIFT) /* Rising edge of TIOB */
+#  define TCN_CMR_LDRB_FEDGE         (2 << TCN_CMR_LDRB_SHIFT) /* Falling edge of TIOB */
+#  define TCN_CMR_LDRB_EACH          (3 << TCN_CMR_LDRB_SHIFT) /* Each  edge of TIOB */
+
+#define TCN_CMR_CPCSTOP              (1 << 6)  /* Bit 6: Counter Clock Stopped with RC Compare (Waveform mode) */
+#define TCN_CMR_CPCDIS               (1 << 7)  /* Bit 7: Counter Clock Disable with RC Compare (Waveform mode) */
+#define TCN_CMR_EEVTEDG_SHIFT        (8)       /* Bits 8-9: External Event Edge Selection (Waveform mode) */
+#define TCN_CMR_EEVTEDG_MASK         (3 << TCN_CMR_EEVTEDG_SHIFT)
+#  define TCN_CMR_EEVTEDG_NONE       (0 << TCN_CMR_EEVTEDG_SHIFT) /* None */
+#  define TCN_CMR_EEVTEDG_REDGE      (1 << TCN_CMR_EEVTEDG_SHIFT) /* Rising edge */
+#  define TCN_CMR_EEVTEDG_FEDGE      (2 << TCN_CMR_EEVTEDG_SHIFT) /* Falling edge */
+#  define TCN_CMR_EEVTEDG_EACH       (3 << TCN_CMR_EEVTEDG_SHIFT) /* Each edge */
+#define TCN_CMR_EEVT_SHIFT           (10)      /* Bits 10-11: External Event Selection (Waveform mode) */
+#define TCN_CMR_EEVT_MASK            (3 << TCN_CMR_EEVT_SHIFT)
+#  define TCN_CMR_EEVT_TIOB          (0 << TCN_CMR_EEVT_SHIFT) /* TIOB input */
+#  define TCN_CMR_EEVT_XC0           (1 << TCN_CMR_EEVT_SHIFT) /* XC0 output */
+#  define TCN_CMR_EEVT_XC1           (2 << TCN_CMR_EEVT_SHIFT) /* XC1 output */
+#  define TCN_CMR_EEVT_XC2           (3 << TCN_CMR_EEVT_SHIFT) /* XC2 output */
+#define TCN_CMR_ENETRG               (1 << 12) /* Bit 12: External Event Trigger Enable (Waveform mode) */
+#define TCN_CMR_WAVSEL_SHIFT         (13)      /* Bits 13-14: Waveform Selection (Waveform mode) */
+#define TCN_CMR_WAVSEL_MASK          (3 << TCN_CMR_WAVSEL_SHIFT)
+#  define TCN_CMR_WAVSEL_UP          (0 << TCN_CMR_WAVSEL_SHIFT) /* UP mode w/o auto trigger (Waveform mode) */
+#  define TCN_CMR_WAVSEL_UPAUTO      (1 << TCN_CMR_WAVSEL_SHIFT) /* UP mode with auto trigger (Waveform mode) */
+#  define TCN_CMR_WAVSEL_UPDWN       (2 << TCN_CMR_WAVSEL_SHIFT) /* UPDOWN mode w/o  auto trigger (Waveform mode) */
+#  define TCN_CMR_WAVSEL_UPDWNAUTO   (3 << TCN_CMR_WAVSEL_SHIFT) /* UPDOWN mode with auto trigger (Waveform mode) */
+#define TCN_CMR_ACPA_SHIFT           (16)      /* Bits 16-17: RA Compare Effect on TIOA (Waveform mode) */
+#define TCN_CMR_ACPA_MASK            (3 << TCN_CMR_ACPA_SHIFT)
+#  define TCN_CMR_ACPA_NONE          (0 << TCN_CMR_ACPA_SHIFT)
+#  define TCN_CMR_ACPA_SET           (1 << TCN_CMR_ACPA_SHIFT)
+#  define TCN_CMR_ACPA_CLEAR         (2 << TCN_CMR_ACPA_SHIFT)
+#  define TCN_CMR_ACPA_TOGGLE        (3 << TCN_CMR_ACPA_SHIFT)
+#define TCN_CMR_ACPC_SHIFT           (18)      /* Bits 18-19: RC Compare Effect on TIOA (Waveform mode) */
+#define TCN_CMR_ACPC_MASK            (3 << TCN_CMR_ACPC_SHIFT)
+#  define TCN_CMR_ACPC_NONE          (0 << TCN_CMR_ACPC_SHIFT)
+#  define TCN_CMR_ACPC_SET           (1 << TCN_CMR_ACPC_SHIFT)
+#  define TCN_CMR_ACPC_CLEAR         (2 << TCN_CMR_ACPC_SHIFT)
+#  define TCN_CMR_ACPC_TOGGLE        (3 << TCN_CMR_ACPC_SHIFT)
+#define TCN_CMR_AEEVT_SHIFT          (20)      /* Bits 20-21: External Event Effect on TIOA (Waveform mode) */
+#define TCN_CMR_AEEVT_MASK           (3 << TCN_CMR_AEEVT_SHIFT)
+#  define TCN_CMR_AEEVT_NONE         (0 << TCN_CMR_AEEVT_SHIFT)
+#  define TCN_CMR_AEEVT_SET          (1 << TCN_CMR_AEEVT_SHIFT)
+#  define TCN_CMR_AEEVT_CLEAR        (2 << TCN_CMR_AEEVT_SHIFT)
+#  define TCN_CMR_AEEVT_TOGGLE       (3 << TCN_CMR_AEEVT_SHIFT)
+#define TCN_CMR_ASWTRG_SHIFT         (22)      /* Bits 22-23: Software Trigger Effect on TIOA (Waveform mode) */
+#define TCN_CMR_ASWTRG_MASK          (3 << TCN_CMR_ASWTRG_SHIFT)
+#  define TCN_CMR_ASWTRG_NONE        (0 << TCN_CMR_ASWTRG_SHIFT)
+#  define TCN_CMR_ASWTRG_SET         (1 << TCN_CMR_ASWTRG_SHIFT)
+#  define TCN_CMR_ASWTRG_CLEAR       (2 << TCN_CMR_ASWTRG_SHIFT)
+#  define TCN_CMR_ASWTRG_TOGGLE      (3 << TCN_CMR_ASWTRG_SHIFT)
+#define TCN_CMR_BCPB_SHIFT           (24)      /* Bits 24-25: RB Compare Effect on TIOB (Waveform mode) */
+#define TCN_CMR_BCPB_MASK            (3 << TCN_CMR_BCPB_SHIFT)
+#  define TCN_CMR_BCPB_NONE          (0 << TCN_CMR_BCPB_SHIFT)
+#  define TCN_CMR_BCPB_SET           (1 << TCN_CMR_BCPB_SHIFT)
+#  define TCN_CMR_BCPB_CLEAR         (2 << TCN_CMR_BCPB_SHIFT)
+#  define TCN_CMR_BCPB_TOGGLE        (3 << TCN_CMR_BCPB_SHIFT)
+#define TCN_CMR_BCPC_SHIFT           (26)      /* Bits 26-27: RC Compare Effect on TIOB (Waveform mode) */
+#define TCN_CMR_BCPC_MASK            (3 << TCN_CMR_BCPC_SHIFT)
+#  define TCN_CMR_BCPC_NONE          (0 << TCN_CMR_BCPC_SHIFT)
+#  define TCN_CMR_BCPC_SET           (1 << TCN_CMR_BCPC_SHIFT)
+#  define TCN_CMR_BCPC_CLEAR         (2 << TCN_CMR_BCPC_SHIFT)
+#  define TCN_CMR_BCPC_TOGGLE        (3 << TCN_CMR_BCPC_SHIFT)
+#define TCN_CMR_BEEVT_SHIFT          (28)      /* Bits 28-29: External Event Effect on TIOB (Waveform mode) */
+#define TCN_CMR_BEEVT_MASK           (3 << TCN_CMR_BEEVT_SHIFT)
+#  define TCN_CMR_BEEVT_NONE         (0 << TCN_CMR_BEEVT_SHIFT)
+#  define TCN_CMR_BEEVT_SET          (1 << TCN_CMR_BEEVT_SHIFT)
+#  define TCN_CMR_BEEVT_CLEAR        (2 << TCN_CMR_BEEVT_SHIFT)
+#  define TCN_CMR_BEEVT_TOGGLE       (3 << TCN_CMR_BEEVT_SHIFT)
+#define TCN_CMR_BSWTRG_SHIFT         (30)      /* Bits 30-31: Software Trigger Effect on TIOB (Waveform mode) */
+#define TCN_CMR_BSWTRG_MASK          (3 << TCN_CMR_BSWTRG_SHIFT)
+#  define TCN_CMR_BSWTRG_NONE        (0 << TCN_CMR_BSWTRG_SHIFT)
+#  define TCN_CMR_BSWTRG_SET         (1 << TCN_CMR_BSWTRG_SHIFT)
+#  define TCN_CMR_BSWTRG_CLEAR       (2 << TCN_CMR_BSWTRG_SHIFT)
+#  define TCN_CMR_BSWTRG_TOGGLE      (3 << TCN_CMR_BSWTRG_SHIFT)
+
+/* TC Counter Value Register */
+
+#define TCN_CV_SHIFT                 (0)       /* Bits 0-15: Counter Value */
+#define TCN_CV_MASK                  (0xffff << TCN_CV_SHIFT)
+
+/* TC Register A, B, C */
+
+#define TCN_RVALUE_SHIFT             (0)       /* Bits 0-15: Register A, B, or C value */
+#define TCN_RVALUE_MASK              (0xffff << TCN_RVALUE_SHIFT)
+
+/* TC Status Register, TC Interrupt Enable Register, TC Interrupt Disable Register, and  TC Interrupt Mask Register common bit-field definitions */
+
+#define TCN_INT_COVFS                (1 << 0)  /* Bit 0:  Counter Overflow */
+#define TCN_INT_LOVRS                (1 << 1)  /* Bit 1:  Load Overrun */
+#define TCN_INT_CPAS                 (1 << 2)  /* Bit 2:  RA Compare */
+#define TCN_INT_CPBS                 (1 << 3)  /* Bit 3:  RB Compare */
+#define TCN_INT_CPCS                 (1 << 4)  /* Bit 4:  RC Compare */
+#define TCN_INT_LDRAS                (1 << 5)  /* Bit 5:  RA Loading */
+#define TCN_INT_LDRBS                (1 << 6)  /* Bit 6:  RB Loading */
+#define TCN_INT_ETRGS                (1 << 7)  /* Bit 7:  External Trigger */
+#define TCN_INT_CLKSTA               (1 << 16) /* Bit 16: Clock Enabling (SR only) */
+#define TCN_SR_MTIOA                 (1 << 17) /* Bit 17: TIOA Mirror (SR only) */
+#define TCN_SR_MTIOB                 (1 << 18) /* Bit 18: TIOB Mirror (SR only)*/
+
+/************************************************************************************************
+ * Public Types
+ ************************************************************************************************/
+
+/************************************************************************************************
+ * Public Data
+ ************************************************************************************************/
+
+/************************************************************************************************
+ * Public Functions
+ ************************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_TC_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_twi.h b/nuttx/arch/arm/src/sam34/chip/sam_twi.h
new file mode 100644
index 000000000..056f1062e
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_twi.h
@@ -0,0 +1,192 @@
+/****************************************************************************************
+ * arch/arm/src/sam34/chip/sam_twi.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM34_CHIP_SAM_TWI_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H
+
+/****************************************************************************************
+ * Included Files
+ ****************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/****************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************/
+
+/* TWI register offsets *****************************************************************/
+
+#define SAM_TWI_CR_OFFSET          0x00 /* Control Register */
+#define SAM_TWI_MMR_OFFSET         0x04 /* Master Mode Register */
+#define SAM_TWI_SMR_OFFSET         0x08 /* Slave Mode Register */
+#define SAM_TWI_IADR_OFFSET        0x0c /* Internal Address Register */
+#define SAM_TWI_CWGR_OFFSET        0x10 /* Clock Waveform Generator Register */
+#define SAM_TWI_SR_OFFSET          0x20 /* Status Register */
+#define SAM_TWI_IER_OFFSET         0x24 /* Interrupt Enable Register */
+#define SAM_TWI_IDR_OFFSET         0x28 /* Interrupt Disable Register */
+#define SAM_TWI_IMR_OFFSET         0x2c /* Interrupt Mask Register */
+#define SAM_TWI_RHR_OFFSET         0x30 /* Receive Holding Register */
+#define SAM_TWI_THR_OFFSET         0x34 /* Transmit Holding Register */
+                                        /* 0x38-0xfc: Reserved */
+                                        /* 0x100-0x124: Reserved for the PDC */
+
+/* TWI register adresses ****************************************************************/
+
+#define SAM_TWI_CR(n)              (SAM_TWIN_BASE(n)+SAM_TWI_CR_OFFSET)
+#define SAM_TWI_MMR(n)             (SAM_TWIN_BASE(n)+SAM_TWI_MMR_OFFSET)
+#define SAM_TWI_SMR(n)             (SAM_TWIN_BASE(n)+SAM_TWI_SMR_OFFSET)
+#define SAM_TWI_IADR(n)            (SAM_TWIN_BASE(n)+SAM_TWI_IADR_OFFSET)
+#define SAM_TWI_CWGR(n)            (SAM_TWIN_BASE(n)+SAM_TWI_CWGR_OFFSET)
+#define SAM_TWI_SR(n)              (SAM_TWIN_BASE(n)+SAM_TWI_SR_OFFSET)
+#define SAM_TWI_IER(n)             (SAM_TWIN_BASE(n)+SAM_TWI_IER_OFFSET)
+#define SAM_TWI_IDR(n)             (SAM_TWIN_BASE(n)+SAM_TWI_IDR_OFFSET)
+#define SAM_TWI_IMR(n)             (SAM_TWIN_BASE(n)+SAM_TWI_IMR_OFFSET)
+#define SAM_TWI_RHR(n)             (SAM_TWIN_BASE(n)+SAM_TWI_RHR_OFFSET)
+#define SAM_TWI_THR(n)             (SAM_TWIN_BASE(n)+SAM_TWI_THR_OFFSET)
+
+#define SAM_TWI0_CR                (SAM_TWI0_BASE+SAM_TWI_CR_OFFSET)
+#define SAM_TWI0_MMR               (SAM_TWI0_BASE+SAM_TWI_MMR_OFFSET)
+#define SAM_TWI0_SMR               (SAM_TWI0_BASE+SAM_TWI_SMR_OFFSET)
+#define SAM_TWI0_IADR              (SAM_TWI0_BASE+SAM_TWI_IADR_OFFSET)
+#define SAM_TWI0_CWGR              (SAM_TWI0_BASE+SAM_TWI_CWGR_OFFSET)
+#define SAM_TWI0_SR                (SAM_TWI0_BASE+SAM_TWI_SR_OFFSET)
+#define SAM_TWI0_IER               (SAM_TWI0_BASE+SAM_TWI_IER_OFFSET)
+#define SAM_TWI0_IDR               (SAM_TWI0_BASE+SAM_TWI_IDR_OFFSET)
+#define SAM_TWI0_IMR               (SAM_TWI0_BASE+SAM_TWI_IMR_OFFSET)
+#define SAM_TWI0_RHR               (SAM_TWI0_BASE+SAM_TWI_RHR_OFFSET)
+#define SAM_TWI0_THR               (SAM_TWI0_BASE+SAM_TWI_THR_OFFSET)
+
+#define SAM_TWI1_CR                (SAM_TWI1_BASE+SAM_TWI_CR_OFFSET)
+#define SAM_TWI1_MMR               (SAM_TWI1_BASE+SAM_TWI_MMR_OFFSET)
+#define SAM_TWI1_SMR               (SAM_TWI1_BASE+SAM_TWI_SMR_OFFSET)
+#define SAM_TWI1_IADR              (SAM_TWI1_BASE+SAM_TWI_IADR_OFFSET)
+#define SAM_TWI1_CWGR              (SAM_TWI1_BASE+SAM_TWI_CWGR_OFFSET)
+#define SAM_TWI1_SR                (SAM_TWI1_BASE+SAM_TWI_SR_OFFSET)
+#define SAM_TWI1_IER               (SAM_TWI1_BASE+SAM_TWI_IER_OFFSET)
+#define SAM_TWI1_IDR               (SAM_TWI1_BASE+SAM_TWI_IDR_OFFSET)
+#define SAM_TWI1_IMR               (SAM_TWI1_BASE+SAM_TWI_IMR_OFFSET)
+#define SAM_TWI1_RHR               (SAM_TWI1_BASE+SAM_TWI_RHR_OFFSET)
+#define SAM_TWI1_THR               (SAM_TWI1_BASE+SAM_TWI_THR_OFFSET)
+
+/* TWI register bit definitions *********************************************************/
+
+/* TWI Control Register */
+
+#define TWI_CR_START               (1 << 0)  /* Bit 0:  Send a START Condition */
+#define TWI_CR_STOP                (1 << 1)  /* Bit 1:  Send a STOP Condition */
+#define TWI_CR_MSEN                (1 << 2)  /* Bit 2:  TWI Master Mode Enabled */
+#define TWI_CR_MSDIS               (1 << 3)  /* Bit 3:  TWI Master Mode Disabled */
+#define TWI_CR_SVEN                (1 << 4)  /* Bit 4:  TWI Slave Mode Enabled */
+#define TWI_CR_SVDIS               (1 << 5)  /* Bit 5:  TWI Slave Mode Disabled */
+#define TWI_CR_QUICK               (1 << 6)  /* Bit 6:  SMBUS Quick Command */
+#define TWI_CR_SWRST               (1 << 7)  /* Bit 7:  Software Reset */
+
+/* TWI Master Mode Register */'
+
+#define TWI_MMR_IADRSZ_SHIFT       (8)      /* Bits 8-9:  Internal Device Address Size */
+#define TWI_MMR_IADRSZ_MASK        (3 << TWI_MMR_IADRSZ_SHIFT)
+#  define TWI_MMR_IADRSZ_NONE      (0 << TWI_MMR_IADRSZ_SHIFT) /* No internal device address */
+#  define TWI_MMR_IADRSZ_1BYTE     (1 << TWI_MMR_IADRSZ_SHIFT) /* One-byte internal device address */
+#  define TWI_MMR_IADRSZ_3BYTE     (2 << TWI_MMR_IADRSZ_SHIFT) /* Two-byte internal device address */
+#  define TWI_MMR_IADRSZ_3BYTE     (3 << TWI_MMR_IADRSZ_SHIFT) /* Three-byte internal device address */
+#define TWI_MMR_MREAD              (1 << 12) /* Bit 12: Master Read Direction */
+#define TWI_MMR_DADR_SHIFT         (16)      /* Bits 16-23:  Device Address */
+#define TWI_MMR_DADR_MASK          (0xff << TWI_MMR_DADR_SHIFT)
+
+/* TWI Slave Mode Register */
+
+#define TWI_SMR_SADR_SHIFT         (16)      /* Bits 16-23:  Slave Address */
+#define TWI_SMR_SADR_MASK          (0xff << TWI_SMR_SADR_SHIFT)
+
+/* TWI Internal Address Register */
+
+#define TWI_IADR_SHIFT             (0)      /* Bits 0-23:  Internal Address */
+#define TWI_IADR_MASK              (0x00ffffff << TWI_IADR_SHIFT)
+
+/* TWI Clock Waveform Generator Register */
+
+#define TWI_CWGR_CLDIV_SHIFT       (0)       /* Bits 0-7:  Clock Low Divider */
+#define TWI_CWGR_CLDIV_MASK        (0xff << TWI_CWGR_CLDIV_SHIFT)
+#define TWI_CWGR_CHDIV_SHIFT       (8)       /* Bits 8-15:  Clock High Divider */
+#define TWI_CWGR_CHDIV_MASK        (0xff << TWI_CWGR_CLDIV_SHIFT)
+#define TWI_CWGR_CKDIV_SHIFT       (16)      /* Bits 16-18:  Clock Divider */
+#define TWI_CWGR_CKDIV_MASK        (7 << TWI_CWGR_CLDIV_SHIFT)
+
+/* TWI Status Register, TWI Interrupt Enable Register, TWI Interrupt Disable
+ * Register, and TWI Interrupt Mask Register common bit fields.
+ */
+
+#define TWI_INT_TXCOMP             (1 << 0)  /* Bit 0:  Transmission Completed */
+#define TWI_INT_RXRDY              (1 << 1)  /* Bit 1:  Receive Holding Register */
+#define TWI_INT_TXRDY              (1 << 2)  /* Bit 2:  Transmit Holding Register Ready */
+#define TWI_SR_SVREAD              (1 << 3)  /* Bit 3:  Slave Read (SR only) */
+#define TWI_INT_SVACC              (1 << 4)  /* Bit 4:  Slave Access */
+#define TWI_INT_GACC               (1 << 5)  /* Bit 5:  General Call Access */
+#define TWI_INT_OVRE               (1 << 6)  /* Bit 6:  Overrun Error */
+#define TWI_INT_NACK               (1 << 8)  /* Bit 8:  Not Acknowledged */
+#define TWI_INT_ARBLST             (1 << 9)  /* Bit 9:  Arbitration Lost */
+#define TWI_INT_SCLWS              (1 << 10) /* Bit 10: Clock Wait State */
+#define TWI_INT_EOSACC             (1 << 11) /* Bit 11: End Of Slave Access */
+#define TWI_INT_ENDRX              (1 << 12) /* Bit 12: End of RX buffer */
+#define TWI_INT_ENDTX              (1 << 13) /* Bit 13: End of TX buffer */
+#define TWI_INT_RXBUFF             (1 << 14) /* Bit 14: RX Buffer */
+#define TWI_INT_TXBUFE             (1 << 15) /* Bit 15: TX Buffer Empty */
+
+/* TWI Receive Holding Register */
+
+#define TWI_RHR_RXDATA_SHIFT       (0)       /* Bits 0-7:  Master or Slave Receive Holding Data */
+#define TWI_RHR_RXDATA_MASK        (0xff << TWI_RHR_RXDATA_SHIFT)
+
+/* TWI Transmit Holding Register */
+
+#define TWI_THR_TXDATA_SHIFT       (0)       /* Bits 0-7:  Master or Slave Transmit Holding Data */
+#define TWI_THR_TXDATA_MASK        (0xff << TWI_THR_TXDATA_SHIFT)
+
+/****************************************************************************************
+ * Public Types
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Data
+ ****************************************************************************************/
+
+/****************************************************************************************
+ * Public Functions
+ ****************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_TWI_H */
diff --git a/nuttx/arch/arm/src/sam34/chip/sam_uart.h b/nuttx/arch/arm/src/sam34/chip/sam_uart.h
new file mode 100644
index 000000000..4825435fd
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/chip/sam_uart.h
@@ -0,0 +1,391 @@
+/************************************************************************************************
+ * arch/arm/src/sam34/chip/sam_uart.h
+ *
+ *   Copyright (C) 2009, 2013 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_SAM34_CHIP_SAM_UART_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H
+
+/************************************************************************************************
+ * Included Files
+ ************************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include "chip.h"
+#include "chip/sam_memorymap.h"
+
+/************************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************************/
+
+/* UART register offsets ************************************************************************/
+
+#define SAM_UART_CR_OFFSET           0x0000 /* Control Register (Common) */
+#define SAM_UART_MR_OFFSET           0x0004 /* Mode Register (Common) */
+#define SAM_UART_IER_OFFSET          0x0008 /* Interrupt Enable Register (Common) */
+#define SAM_UART_IDR_OFFSET          0x000c /* Interrupt Disable Register (Common) */
+#define SAM_UART_IMR_OFFSET          0x0010 /* Interrupt Mask Register (Common) */
+#define SAM_UART_SR_OFFSET           0x0014 /* Status Register (Common) */
+#define SAM_UART_RHR_OFFSET          0x0018 /* Receive Holding Register (Common) */
+#define SAM_UART_THR_OFFSET          0x001c /* Transmit Holding Register (Common) */
+#define SAM_UART_BRGR_OFFSET         0x0020 /* Baud Rate Generator Register (Common) */
+                                            /* 0x0024-0x003c: Reserved (UART) */
+#define SAM_USART_RTOR_OFFSET        0x0024 /* Receiver Time-out Register (USART only) */
+#define SAM_USART_TTGR_OFFSET        0x0028 /* Transmitter Timeguard Register (USART only) */
+                                            /* 0x002c-0x003c: Reserved (UART) */
+#define SAM_USART_FIDI_OFFSET        0x0040 /* FI DI Ratio Register (USART only) */
+#define SAM_USART_NER_OFFSET         0x0044 /* Number of Errors Register ((USART only) */
+                                            /* 0x0048: Reserved (USART) */
+#define SAM_USART_IF_OFFSET          0x004c /* IrDA Filter Register (USART only) */
+#define SAM_USART_MAN_OFFSET         0x0050 /* Manchester Encoder Decoder Register (USART only) */
+#define SAM_USART_WPMR_OFFSET        0x00e4 /* Write Protect Mode Register (USART only) */
+#define SAM_USART_WPSR_OFFSET        0x00e8 /* Write Protect Status Register (USART only) */
+                                            /* 0x005c-0xf008: Reserved (USART) */
+#define SAM_USART_VERSION_OFFSET     0x00fc /* Version Register (USART only) */
+                                            /* 0x0100-0x0124: PDC Area (Common) */
+
+/* UART register adresses ***********************************************************************/
+
+#define SAM_UART_CR                  (SAM_UART_BASE+SAM_UART_CR_OFFSET)
+#define SAM_UART_MR                  (SAM_UART_BASE+SAM_UART_MR_OFFSET)
+#define SAM_UART_IER                 (SAM_UART_BASE+SAM_UART_IER_OFFSET)
+#define SAM_UART_IDR                 (SAM_UART_BASE+SAM_UART_IDR_OFFSET)
+#define SAM_UART_IMR                 (SAM_UART_BASE+SAM_UART_IMR_OFFSET)
+#define SAM_UART_SR                  (SAM_UART_BASE+SAM_UART_SR_OFFSET)
+#define SAM_UART_RHR                 (SAM_UART_BASE+SAM_UART_RHR_OFFSET)
+#define SAM_UART_THR                 (SAM_UART_BASE+SAM_UART_THR_OFFSET)
+#define SAM_UART_BRGR                (SAM_UART_BASE+SAM_UART_BRGR_OFFSET)
+
+#define SAM_USART_CR(n)              (SAM_USARTN_BASE(n)+SAM_UART_CR_OFFSET)
+#define SAM_USART_MR(n)              (SAM_USARTN_BASE(n)+SAM_UART_MR_OFFSET)
+#define SAM_USART_IER(n)             (SAM_USARTN_BASE(n)+SAM_UART_IER_OFFSET)
+#define SAM_USART_IDR(n)             (SAM_USARTN_BASE(n)+SAM_UART_IDR_OFFSET)
+#define SAM_USART_IMR(n)             (SAM_USARTN_BASE(n)+SAM_UART_IMR_OFFSET)
+#define SAM_USART_SR(n)              (SAM_USARTN_BASE(n)+SAM_UART_SR_OFFSET)
+#define SAM_USART_RHR(n)             (SAM_USARTN_BASE(n)+SAM_UART_RHR_OFFSET)
+#define SAM_USART_THR(n)             (SAM_USARTN_BASE(n)+SAM_UART_THR_OFFSET)
+#define SAM_USART_BRGR(n)            (SAM_USARTN_BASE(n)+SAM_UART_BRGR_OFFSET)
+#define SAM_USART_RTOR(n)            (SAM_USARTN_BASE(n)+SAM_USART_RTOR_OFFSET)
+#define SAM_USART_TTGR(n)            (SAM_USARTN_BASE(n)+SAM_USART_TTGR_OFFSET)
+#define SAM_USART_FIDI(n)            (SAM_USARTN_BASE(n)+SAM_USART_FIDI_OFFSET)
+#define SAM_USART_NER(n)             (SAM_USARTN_BASE(n)+SAM_USART_NER_OFFSET)
+#define SAM_USART_IF(n)              (SAM_USARTN_BASE(n)+SAM_USART_IF_OFFSET)
+#define SAM_USART_MAN(n)             (SAM_USARTN_BASE(n)+SAM_USART_MAN_OFFSET)
+#define SAM_USART_WPMR(n)            (SAM_USARTN_BASE(n)+SAM_USART_WPMR_OFFSET)
+#define SAM_USART_WPSR(n)            (SAM_USARTN_BASE(n)+SAM_USART_WPSR_OFFSET)
+#define SAM_USART_VERSION(n)         (SAM_USARTN_BASE(n)+SAM_USART_VERSION_OFFSET)
+
+#define SAM_USART0_CR                (SAM_USART0_BASE+SAM_UART_CR_OFFSET)
+#define SAM_USART0_MR_               (SAM_USART0_BASE+SAM_UART_MR_OFFSET)
+#define SAM_USART0_IER               (SAM_USART0_BASE+SAM_UART_IER_OFFSET)
+#define SAM_USART0_IDR               (SAM_USART0_BASE+SAM_UART_IDR_OFFSET)
+#define SAM_USART0_IMR               (SAM_USART0_BASE+SAM_UART_IMR_OFFSET)
+#define SAM_USART0_SR                (SAM_USART0_BASE+SAM_UART_SR_OFFSET)
+#define SAM_USART0_RHR               (SAM_USART0_BASE+SAM_UART_RHR_OFFSET)
+#define SAM_USART0_THR               (SAM_USART0_BASE+SAM_UART_THR_OFFSET)
+#define SAM_USART0_BRGR              (SAM_USART0_BASE+SAM_UART_BRGR_OFFSET)
+#define SAM_USART0_RTOR              (SAM_USART0_BASE+SAM_USART_RTOR_OFFSET)
+#define SAM_USART0_TTGR              (SAM_USART0_BASE+SAM_USART_TTGR_OFFSET)
+#define SAM_USART0_FIDI              (SAM_USART0_BASE+SAM_USART_FIDI_OFFSET)
+#define SAM_USART0_NER               (SAM_USART0_BASE+SAM_USART_NER_OFFSET)
+#define SAM_USART0_IF                (SAM_USART0_BASE+SAM_USART_IF_OFFSET)
+#define SAM_USART0_MAN               (SAM_USART0_BASE+SAM_USART_MAN_OFFSET)
+#define SAM_USART0_WPMR              (SAM_USART0_BASE+SAM_USART_WPMR_OFFSET)
+#define SAM_USART0_WPSR              (SAM_USART0_BASE+SAM_USART_WPSR_OFFSET)
+#define SAM_USART0_VERSION           (SAM_USART0_BASE+SAM_USART_VERSION_OFFSET)
+
+#define SAM_USART1_CR                (SAM_USART1_BASE+SAM_UART_CR_OFFSET)
+#define SAM_USART1_MR_               (SAM_USART1_BASE+SAM_UART_MR_OFFSET)
+#define SAM_USART1_IER               (SAM_USART1_BASE+SAM_UART_IER_OFFSET)
+#define SAM_USART1_IDR               (SAM_USART1_BASE+SAM_UART_IDR_OFFSET)
+#define SAM_USART1_IMR               (SAM_USART1_BASE+SAM_UART_IMR_OFFSET)
+#define SAM_USART1_SR                (SAM_USART1_BASE+SAM_UART_SR_OFFSET)
+#define SAM_USART1_RHR               (SAM_USART1_BASE+SAM_UART_RHR_OFFSET)
+#define SAM_USART1_THR               (SAM_USART1_BASE+SAM_UART_THR_OFFSET)
+#define SAM_USART1_BRGR              (SAM_USART1_BASE+SAM_UART_BRGR_OFFSET)
+#define SAM_USART1_RTOR              (SAM_USART1_BASE+SAM_USART_RTOR_OFFSET)
+#define SAM_USART1_TTGR              (SAM_USART1_BASE+SAM_USART_TTGR_OFFSET)
+#define SAM_USART1_FIDI              (SAM_USART1_BASE+SAM_USART_FIDI_OFFSET)
+#define SAM_USART1_NER               (SAM_USART1_BASE+SAM_USART_NER_OFFSET)
+#define SAM_USART1_IF                (SAM_USART1_BASE+SAM_USART_IF_OFFSET)
+#define SAM_USART1_MAN               (SAM_USART1_BASE+SAM_USART_MAN_OFFSET)
+#define SAM_USART1_WPMR              (SAM_USART1_BASE+SAM_USART_WPMR_OFFSET)
+#define SAM_USART1_WPSR              (SAM_USART1_BASE+SAM_USART_WPSR_OFFSET)
+#define SAM_USART1_VERSION           (SAM_USART1_BASE+SAM_USART_VERSION_OFFSET)
+
+#define SAM_USART2_CR                (SAM_USART2_BASE+SAM_UART_CR_OFFSET)
+#define SAM_USART2_MR_               (SAM_USART2_BASE+SAM_UART_MR_OFFSET)
+#define SAM_USART2_IER               (SAM_USART2_BASE+SAM_UART_IER_OFFSET)
+#define SAM_USART2_IDR               (SAM_USART2_BASE+SAM_UART_IDR_OFFSET)
+#define SAM_USART2_IMR               (SAM_USART2_BASE+SAM_UART_IMR_OFFSET)
+#define SAM_USART2_SR                (SAM_USART2_BASE+SAM_UART_SR_OFFSET)
+#define SAM_USART2_RHR               (SAM_USART2_BASE+SAM_UART_RHR_OFFSET)
+#define SAM_USART2_THR               (SAM_USART2_BASE+SAM_UART_THR_OFFSET)
+#define SAM_USART2_BRGR              (SAM_USART2_BASE+SAM_UART_BRGR_OFFSET)
+#define SAM_USART2_RTOR              (SAM_USART2_BASE+SAM_USART_RTOR_OFFSET)
+#define SAM_USART2_TTGR              (SAM_USART2_BASE+SAM_USART_TTGR_OFFSET)
+#define SAM_USART2_FIDI              (SAM_USART2_BASE+SAM_USART_FIDI_OFFSET)
+#define SAM_USART2_NER               (SAM_USART2_BASE+SAM_USART_NER_OFFSET)
+#define SAM_USART2_IF                (SAM_USART2_BASE+SAM_USART_IF_OFFSET)
+#define SAM_USART2_MAN               (SAM_USART2_BASE+SAM_USART_MAN_OFFSET)
+#define SAM_USART2_WPMR              (SAM_USART2_BASE+SAM_USART_WPMR_OFFSET)
+#define SAM_USART2_WPSR              (SAM_USART2_BASE+SAM_USART_WPSR_OFFSET)
+#define SAM_USART2_VERSION           (SAM_USART2_BASE+SAM_USART_VERSION_OFFSET)
+
+#define SAM_USART3_CR                (SAM_USART3_BASE+SAM_UART_CR_OFFSET)
+#define SAM_USART3_MR_               (SAM_USART3_BASE+SAM_UART_MR_OFFSET)
+#define SAM_USART3_IER               (SAM_USART3_BASE+SAM_UART_IER_OFFSET)
+#define SAM_USART3_IDR               (SAM_USART3_BASE+SAM_UART_IDR_OFFSET)
+#define SAM_USART3_IMR               (SAM_USART3_BASE+SAM_UART_IMR_OFFSET)
+#define SAM_USART3_SR                (SAM_USART3_BASE+SAM_UART_SR_OFFSET)
+#define SAM_USART3_RHR               (SAM_USART3_BASE+SAM_UART_RHR_OFFSET)
+#define SAM_USART3_THR               (SAM_USART3_BASE+SAM_UART_THR_OFFSET)
+#define SAM_USART3_BRGR              (SAM_USART3_BASE+SAM_UART_BRGR_OFFSET)
+#define SAM_USART3_RTOR              (SAM_USART3_BASE+SAM_USART_RTOR_OFFSET)
+#define SAM_USART3_TTGR              (SAM_USART3_BASE+SAM_USART_TTGR_OFFSET)
+#define SAM_USART3_FIDI              (SAM_USART3_BASE+SAM_USART_FIDI_OFFSET)
+#define SAM_USART3_NER               (SAM_USART3_BASE+SAM_USART_NER_OFFSET)
+#define SAM_USART3_IF                (SAM_USART3_BASE+SAM_USART_IF_OFFSET)
+#define SAM_USART3_MAN               (SAM_USART3_BASE+SAM_USART_MAN_OFFSET)
+#define SAM_USART3_WPMR              (SAM_USART3_BASE+SAM_USART_WPMR_OFFSET)
+#define SAM_USART3_WPSR              (SAM_USART3_BASE+SAM_USART_WPSR_OFFSET)
+#define SAM_USART3_VERSION           (SAM_USART3_BASE+SAM_USART_VERSION_OFFSET)
+
+/* UART register bit definitions ****************************************************************/
+
+/* UART Control Register */
+
+#define UART_CR_RSTRX                (1 << 2)  /* Bit 2:  Reset Receiver (Common) */
+#define UART_CR_RSTTX                (1 << 3)  /* Bit 3:  Reset Transmitter (Common) */
+#define UART_CR_RXEN                 (1 << 4)  /* Bit 4:  Receiver Enable (Common) */
+#define UART_CR_RXDIS                (1 << 5)  /* Bit 5:  Receiver Disable (Common) */
+#define UART_CR_TXEN                 (1 << 6)  /* Bit 6:  Transmitter Enable (Common) */
+#define UART_CR_TXDIS                (1 << 7)  /* Bit 7:  Transmitter Disable (Common) */
+#define UART_CR_RSTSTA               (1 << 8)  /* Bit 8:  Reset Status Bits (Common) */
+#define USART_CR_STTBRK              (1 << 9)  /* Bit 9:  Start Break (USART only) */
+#define USART_CR_STPBRK              (1 << 10) /* Bit 10: Stop Break (USART only) */
+#define USART_CR_STTTO               (1 << 11) /* Bit 11: Start Time-out (USART only) */
+#define USART_CR_SENDA               (1 << 12) /* Bit 12: Send Address (USART only) */
+#define USART_CR_RSTIT               (1 << 13) /* Bit 13: Reset Iterations (USART only) */
+#define USART_CR_RSTNACK             (1 << 14) /* Bit 14: Reset Non Acknowledge (USART only) */
+#define USART_CR_RETTO               (1 << 15) /* Bit 15: Rearm Time-out (USART only) */
+#define USART_CR_RTSEN               (1 << 18) /* Bit 18: Request to Send Enable (USART only) */
+#define USART_CR_FCS                 (1 << 18) /* Bit 18: Force SPI Chip Select (USART only) */
+#define USART_CR_RTSDIS              (1 << 19) /* Bit 19: Request to Send Disable (USART only) */
+#define USART_CR_RCS                 (1 << 19) /* Bit 19: Release SPI Chip Select (USART only) */
+
+/* UART Mode Register */
+
+#define USART_MR_MODE_SHIFT          (0)       /* Bits 0-3: (USART only) */
+#define USART_MR_MODE_MASK           (15 << USART_MR_MODE_SHIFT)
+#  define USART_MR_MODE_NORMAL       (0  << USART_MR_MODE_SHIFT) /* Normal */
+#  define USART_MR_MODE_RS485        (1  << USART_MR_MODE_SHIFT) /* RS485 */
+#  define USART_MR_MODE_HWHS         (2  << USART_MR_MODE_SHIFT) /* Hardware Handshaking */
+#  define USART_MR_MODE_ISO7816_0    (4  << USART_MR_MODE_SHIFT) /* IS07816 Protocol: T = 0 */
+#  define USART_MR_MODE_ISO7816_1    (6  << USART_MR_MODE_SHIFT) /* IS07816 Protocol: T = 1 */
+#  define USART_MR_MODE_IRDA         (8  << USART_MR_MODE_SHIFT) /* IrDA */
+#  define USART_MR_MODE_SPIMSTR      (14 << USART_MR_MODE_SHIFT) /* SPI Master */
+#  define USART_MR_MODE_SPISLV       (15 << USART_MR_MODE_SHIFT) /* SPI Slave */
+#define USART_MR_USCLKS_SHIFT        (4)       /* Bits 4-5: Clock Selection (USART only) */
+#define USART_MR_USCLKS_MASK         (3 << USART_MR_USCLKS_SHIFT)
+#  define USART_MR_USCLKS_MCK        (0 << USART_MR_USCLKS_SHIFT) /* MCK */
+#  define USART_MR_USCLKS_MCKDIV     (1 << USART_MR_USCLKS_SHIFT) /* MCK/DIV (DIV = 8) */
+#  define USART_MR_USCLKS_SCK        (3 << USART_MR_USCLKS_SHIFT) /* SCK */
+#define USART_MR_CHRL_SHIFT          (6)       /* Bits 6-7: Character Length (USART only) */
+#define USART_MR_CHRL_MASK           (3 << USART_MR_CHRL_SHIFT)
+#  define USART_MR_CHRL_5BITS        (0 << USART_MR_CHRL_SHIFT) /* 5 bits */
+#  define USART_MR_CHRL_6BITS        (1 << USART_MR_CHRL_SHIFT) /* 6 bits */
+#  define USART_MR_CHRL_7BITS        (2 << USART_MR_CHRL_SHIFT) /* 7 bits */
+#  define USART_MR_CHRL_8BITS        (3 << USART_MR_CHRL_SHIFT) /* 8 bits */
+#define USART_MR_YNC                 (1 << 8)  /* Bit 8: Synchronous Mode Select (USART only) */
+#define USART_MR_CPHA                (1 << 8)  /* Bit 8: SPI Clock Phase (USART only) */
+#define UART_MR_PAR_SHIFT            (9)       /* Bits 9-11: Parity Type (Common) */
+#define UART_MR_PAR_MASK             (7 << UART_MR_PAR_SHIFT)
+#  define UART_MR_PAR_EVEN           (0 << UART_MR_PAR_SHIFT) /* Even parity (Common) */
+#  define UART_MR_PAR_ODD            (1 << UART_MR_PAR_SHIFT) /* Odd parity (Common) */
+#  define UART_MR_PAR_SPACE          (2 << UART_MR_PAR_SHIFT) /* Space: parity forced to 0 (Common) */
+#  define UART_MR_PAR_MARK           (3 << UART_MR_PAR_SHIFT) /* Mark: parity forced to 1 (Common) */
+#  define UART_MR_PAR_NONE           (4 << UART_MR_PAR_SHIFT) /* No parity (Common) */
+#  define UART_MR_PAR_MULTIDROP      (6 << UART_MR_PAR_SHIFT) /* Multidrop mode (USART only) */
+#define USART_MR_NBSTOP_SHIFT        (12)      /* Bits 12-13: Number of Stop Bits (USART only) */
+#define USART_MR_NBSTOP_MASK         (3 << USART_MR_NBSTOP_SHIFT)
+#  define USART_MR_NBSTOP_1          (0 << USART_MR_NBSTOP_SHIFT) /* 1 stop bit 1 stop bit */
+#  define USART_MR_NBSTOP_1p5        (1 << USART_MR_NBSTOP_SHIFT) /* 1.5 stop bits */
+#  define USART_MR_NBSTOP_2          (2 << USART_MR_NBSTOP_SHIFT) /* 2 stop bits 2 stop bits */
+#define UART_MR_CHMODE_SHIFT         (14)      /* Bits 14-15: Channel Mode (Common) */
+#define UART_MR_CHMODE_MASK          (3 << UART_MR_CHMODE_SHIFT)
+#  define UART_MR_CHMODE_NORMAL      (0 << UART_MR_CHMODE_SHIFT) /* Normal Mode */
+#  define UART_MR_CHMODE_ECHO        (1 << UART_MR_CHMODE_SHIFT) /* Automatic Echo */
+#  define UART_MR_CHMODE_LLPBK       (2 << UART_MR_CHMODE_SHIFT) /* Local Loopback */
+#  define UART_MR_CHMODE_RLPBK       (3 << UART_MR_CHMODE_SHIFT) /* Remote Loopback */
+#define USART_MR_MSBF                (1 << 16) /* Bit 16: Bit Order or SPI Clock Polarity (USART only) */
+#define USART_MR_CPOL                (1 << 16)
+#define USART_MR_MODE9               (1 << 17) /* Bit 17: 9-bit Character Length (USART only) */
+#define USART_MR_CLKO                (1 << 18) /* Bit 18: Clock Output Select (USART only) */
+#define USART_MR_OVER                (1 << 19) /* Bit 19: Oversampling Mode (USART only) */
+#define USART_MR_INACK               (1 << 20) /* Bit 20: Inhibit Non Acknowledge (USART only) */
+#define USART_MR_DSNACK              (1 << 21) /* Bit 21: Disable Successive NACK (USART only) */
+#define USART_MR_VARSYNC             (1 << 22) /* Bit 22: Variable Synchronization of Command/Data Sync Start Frame Delimiter (USART only) */
+#define USART_MR_INVDATA             (1 << 23) /* Bit 23: INverted Data (USART only) */
+#define USART_MR_MAXITER_SHIFT       (24)      /* Bits 24-26: Max iterations (ISO7816 T=0 (USART only) */
+#define USART_MR_MAXITER_MASK        (7 << USART_MR_MAXITER_SHIFT)
+#define USART_MR_FILTER              (1 << 28) /* Bit 28: Infrared Receive Line Filter (USART only) */
+#define USART_MR_MAN                 (1 << 29) /* Bit 29: Manchester Encoder/Decoder Enable (USART only) */
+#define USART_MR_MODSYNC             (1 << 30) /* Bit 30: Manchester Synchronization Mode (USART only) */
+#define USART_MR_ONEBIT              (1 << 31) /* Bit 31: Start Frame Delimiter Selector (USART only) */
+
+/* UART Interrupt Enable Register, UART Interrupt Disable Register, UART Interrupt Mask
+ * Register, and UART Status Register common bit field definitions
+ */
+
+#define UART_INT_RXRDY               (1 << 0)  /* Bit 0:  RXRDY Interrupt (Common) */
+#define UART_INT_TXRDY               (1 << 1)  /* Bit 1:  TXRDY Interrupt (Common) */
+#define UART_INT_RXBRK               (1 << 2)  /* Bit 2:  Break Received/End of Break */
+#define UART_INT_ENDRX               (1 << 3)  /* Bit 3:  End of Receive Transfer Interrupt (Common) */
+#define UART_INT_ENDTX               (1 << 4)  /* Bit 4:  End of Transmit Interrupt (Common) */
+#define UART_INT_OVRE                (1 << 5)  /* Bit 5:  Overrun Error Interrupt (Common) */
+#define UART_INT_FRAME               (1 << 6)  /* Bit 6:  Framing Error Interrupt (Common) */
+#define UART_INT_PARE                (1 << 7)  /* Bit 7:  Parity Error Interrupt (Common) */
+#define USART_INT_TIMEOUT            (1 << 8)  /* Bit 8:  Time-out Interrupt (USART only) */
+#define UART_INT_TXEMPTY             (1 << 9)  /* Bit 9:  TXEMPTY Interrupt (Common) */
+#define USART_INT_ITER               (1 << 10) /* Bit 10: Iteration Interrupt (USART only) */
+#define USART_INT_UNRE               (1 << 10) /* Bit 10: SPI Underrun Error Interrupt (USART only) */
+#define UART_INT_TXBUFE              (1 << 11) /* Bit 11: Buffer Empty Interrupt (Common) */
+#define UART_INT_RXBUFF              (1 << 12) /* Bit 12: Buffer Full Interrupt (Common) */
+#define USART_INT_NACK               (1 << 13) /* Bit 13: Non Acknowledge Interrupt (USART only) */
+#define USART_INT_CTSIC              (1 << 19) /* Bit 19: Clear to Send Input Change Interrupt (USART only) */
+#define USART_INT_MANE               (1 << 24) /* Bit 24: Manchester Error Interrupt (USART only) */
+
+/* UART Receiver Holding Register */
+
+#define UART_RHR_RXCHR_SHIFT         (0)       /* Bits 0-7: Received Character (UART only) */
+#define UART_RHR_RXCHR_MASK          (0xff << UART_RHR_RXCHR_SHIFT)
+#define USART_RHR_RXCHR_SHIFT        (0)       /* Bits 0-8: Received Character (USART only) */
+#define USART_RHR_RXCHR_MASK         (0x1ff << UART_RHR_RXCHR_SHIFT)
+#define USART_RHR_RXSYNH             (1 << 15) /* Bit 15: Received Sync (USART only) */
+
+/* UART Transmit Holding Register */
+
+#define UART_THR_TXCHR_SHIFT         (0)       /* Bits 0-7: Character to be Transmitted (UART only) */
+#define UART_THR_TXCHR_MASK          (0xff << UART_THR_TXCHR_SHIFT)
+#define USART_THR_TXCHR_SHIFT        (0)       /* Bits 0-8: Character to be Transmitted (USART only) */
+#define USART_THR_TXCHR_MASK         (0x1ff << USART_THR_TXCHR_SHIFT)
+#define USART_THR_TXSYNH             (1 << 15) /* Bit 15: Sync Field to be tran (USART only) */
+
+/* UART Baud Rate Generator Register */
+
+#define UART_BRGR_CD_SHIFT           (0)      /* Bits 0-15: Clock Divisor (Common) */
+#define UART_BRGR_CD_MASK            (0xffff << UART_BRGR_CD_SHIFT)
+#define UART_BRGR_FP_SHIFT           (16)      /* Bits 16-18: Fractional Part (USART only) */
+#define UART_BRGR_FP_MASK            (7 << UART_BRGR_FP_SHIFT)
+
+/* USART Receiver Time-out Register (USART only) */
+
+#define USART_RTOR_TO_SHIFT          (0)       /* Bits 0-15: Time-out Value (USART only) */
+#define USART_RTOR_TO_MASK           (0xffff << USART_RTOR_TO_SHIFT)
+
+/* USART Transmitter Timeguard Register (USART only) */
+
+#define USART_TTGR_TG_SHIFT          (0)       /* Bits 0-7: Timeguard Value (USART only) */
+#define USART_TTGR_TG_MASK           (0xff << USART_TTGR_TG_SHIFT)
+
+/* USART FI DI RATIO Register (USART only) */
+
+#define USART_FIDI_RATIO_SHIFT       (0)       /* Bits 0-10: FI Over DI Ratio Value (USART only) */
+#define USART_FIDI_RATIO_MASK        (0x7ff << USART_FIDI_RATIO_SHIFT)
+
+/* USART Number of Errors Register (USART only) */
+
+#define USART_NER_NBERRORS_SHIFT     (0)       /* Bits 0-7: Number of Errrors (USART only) */
+#define USART_NER_NBERRORS_MASK      (0xff << USART_NER_NBERRORS_SHIFT)
+
+/* USART IrDA FILTER Register (USART only) */
+
+#define USART_IF_IRDAFILTER_SHIFT    (0)       /* Bits 0-7: IrDA Filter (USART only) */
+#define USART_IF_IRDAFILTER_MASK     (0xff << USART_IF_IRDAFILTER_SHIFT)
+
+/* USART Manchester Configuration Register (USART only) */
+
+#define USART_MAN_TXPL_SHIFT         (0)       /* Bits 0-3: Transmitter Preamble Length (USART only) */
+#define USART_MAN_TXPL_MASK          (15 << USART_MAN_TXPL_SHIFT)
+#define USART_MAN_TXPP_SHIFT         (8)       /* Bits 8-9: Transmitter Preamble Pattern (USART only) */
+#define USART_MAN_TXPP_MASK          (3 << USART_MAN_TXPP_SHIFT)
+#  define USART_MAN_TXPP_ALLONE      (0 << USART_MAN_TXPP_SHIFT) /* ALL_ONE */
+#  define USART_MAN_TXPP_ALLZERO     (1 << USART_MAN_TXPP_SHIFT) /* ALL_ZERO */
+#  define USART_MAN_TXPP_ZEROONE     (2 << USART_MAN_TXPP_SHIFT) /* ZERO_ONE */
+#  define USART_MAN_TXPP_ONEZERO     (3 << USART_MAN_TXPP_SHIFT) /* ONE_ZERO */
+#define USART_MAN_TXMPOL             (1 << 12) /* Bit 12: Transmitter Manchester Polarity (USART only) */
+#define USART_MAN_RXPL_SHIFT         (16)      /* Bits 16-19: Receiver Preamble Length (USART only) */
+#define USART_MAN_RXPL_MASK          (15 << USART_MAN_RXPL_SHIFT)
+#define USART_MAN_RXPP_SHIFT         (24)      /* Bits 24-25: Receiver Preamble Pattern detected (USART only) */
+#define USART_MAN_RXPP_MASK          (3 << USART_MAN_RXPP_SHIFT)
+#  define USART_MAN_RXPP_ALLONE      (0 << USART_MAN_RXPP_SHIFT) /* ALL_ONE */
+#  define USART_MAN_RXPP_ALLZERO     (1 << USART_MAN_RXPP_SHIFT) /* ALL_ZERO */
+#  define USART_MAN_RXPP_ZEROONE     (2 << USART_MAN_RXPP_SHIFT) /* ZERO_ONE */
+#  define USART_MAN_RXPP_ONEZERO     (3 << USART_MAN_RXPP_SHIFT) /* ONE_ZERO */
+#define USART_MAN_RXMPOL             (1 << 28) /* Bit 28: Receiver Manchester Polarity (USART only) */
+#define USART_MAN_DRIFT              (1 << 30) /* Bit 30: Drift compensation (USART only) */
+
+/* USART Write Protect Mode Register (USART only) */
+
+#define USART_WPMR_WPEN              (1 << 0)  /* Bit 0: Write Protect Enable (USART only) */
+#define USART_WPMR_WPKEY_SHIFT       (8)       /* Bits 8-31: Write Protect KEY (USART only) */
+#define USART_WPMR_WPKEY_MASK        (0x00ffffff << USART_WPMR_WPKEY_SHIFT)
+
+/* USART Write Protect Status Register (USART only) */
+
+#define USART_WPSR_WPVS              (1 << 0)  /* Bit 0: Write Protect Violation Status (USART only) */
+#define USART_WPSR_WPVSRC_SHIFT      (8)       /* Bits 8-23: Write Protect Violation Source (USART only) */
+#define USART_WPSR_WPVSRC_MASK       (0xffff << USART_WPSR_WPVSRC_SHIFT)
+
+/* USART Version Register */
+
+#define USART_VERSION_VERSION_SHIFT  (0)       /* Bits 0-11: Macrocell version number (USART only) */
+#define USART_VERSION_VERSION_MASK   (0xfff << USART_VERSION_VERSION_SHIFT)
+#define USART_VERSION_MFN_SHIFT      (16)      /* Bits 16-18: Reserved (USART only) */
+#define USART_VERSION_MFN_MASK       (7 << USART_VERSION_MFN_SHIFT)
+
+/************************************************************************************************
+ * Public Types
+ ************************************************************************************************/
+
+/************************************************************************************************
+ * Public Data
+ ************************************************************************************************/
+
+/************************************************************************************************
+ * Public Functions
+ ************************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_UART_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_udphs.h b/nuttx/arch/arm/src/sam34/chip/sam_udphs.h
index e6eb88c77..9229cd837 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_udphs.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_udphs.h
@@ -1,7 +1,7 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/sam3u_udphs.h
+ * arch/arm/src/sam34/chip/sam_udphs.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_UDPHS_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_UDPHS_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "sam3u_memorymap.h"
+#include "chip/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -51,76 +51,76 @@
 
 /* UDPHS register offsets ***************************************************************/
 
-#define SAM3U_UDPHS_CTRL_OFFSET               0x00 /* UDPHS Control Register */
-#define SAM3U_UDPHS_FNUM_OFFSET               0x04 /* UDPHS Frame Number Register */
+#define SAM_UDPHS_CTRL_OFFSET                 0x00 /* UDPHS Control Register */
+#define SAM_UDPHS_FNUM_OFFSET                 0x04 /* UDPHS Frame Number Register */
                                                    /* 0x08-0x0C: Reserved */
-#define SAM3U_UDPHS_IEN_OFFSET                0x10 /* UDPHS Interrupt Enable Register */
-#define SAM3U_UDPHS_INTSTA_OFFSET             0x14 /* UDPHS Interrupt Status Register */
-#define SAM3U_UDPHS_CLRINT_OFFSET             0x18 /* UDPHS Clear Interrupt Register */
-#define SAM3U_UDPHS_EPTRST_OFFSET             0x1c /* UDPHS Endpoints Reset Register */
+#define SAM_UDPHS_IEN_OFFSET                  0x10 /* UDPHS Interrupt Enable Register */
+#define SAM_UDPHS_INTSTA_OFFSET               0x14 /* UDPHS Interrupt Status Register */
+#define SAM_UDPHS_CLRINT_OFFSET               0x18 /* UDPHS Clear Interrupt Register */
+#define SAM_UDPHS_EPTRST_OFFSET               0x1c /* UDPHS Endpoints Reset Register */
                                                    /* 0x20-0xcc: Reserved */
-#define SAM3U_UDPHS_TST_OFFSET                0xe0 /* UDPHS Test Register */
+#define SAM_UDPHS_TST_OFFSET                  0xe0 /* UDPHS Test Register */
                                                    /* 0xE4-0xE8: Reserved */
-#define SAM3U_UDPHS_IPNAME1_OFFSET            0xf0 /* UDPHS Name1 Register */
-#define SAM3U_UDPHS_IPNAME2_OFFSET            0xf4 /* UDPHS Name2 Register */
-#define SAM3U_UDPHS_IPFEATURES_OFFSET         0xf8 /* UDPHS Features Register */
+#define SAM_UDPHS_IPNAME1_OFFSET              0xf0 /* UDPHS Name1 Register */
+#define SAM_UDPHS_IPNAME2_OFFSET              0xf4 /* UDPHS Name2 Register */
+#define SAM_UDPHS_IPFEATURES_OFFSET           0xf8 /* UDPHS Features Register */
 
 /* Endpoint registers:  Offsets for Endpoints 0-6: 0x100, 0x120, 0x140, 0x160, 0x180,
  * 0x1a0, and 0x1c0
  */
 
-#define SAM3U_UDPHSEP_OFFSET(n)               (0x100+((n)<<5))
-#define SAM3U_UDPHSEP_CFG_OFFSET              0x00 /* UDPHS Endpoint Configuration Register */
-#define SAM3U_UDPHSEP_CTLENB_OFFSET           0x04 /* UDPHS Endpoint Control Enable Register */
-#define SAM3U_UDPHSEP_CTLDIS_OFFSET           0x08 /* UDPHS Endpoint Control Disable Register */
-#define SAM3U_UDPHSEP_CTL_OFFSET              0x0c /* UDPHS Endpoint Control Register */
+#define SAM_UDPHSEP_OFFSET(n)                 (0x100+((n)<<5))
+#define SAM_UDPHSEP_CFG_OFFSET                0x00 /* UDPHS Endpoint Configuration Register */
+#define SAM_UDPHSEP_CTLENB_OFFSET             0x04 /* UDPHS Endpoint Control Enable Register */
+#define SAM_UDPHSEP_CTLDIS_OFFSET             0x08 /* UDPHS Endpoint Control Disable Register */
+#define SAM_UDPHSEP_CTL_OFFSET                0x0c /* UDPHS Endpoint Control Register */
                                                    /* 0x10: Reserved */
-#define SAM3U_UDPHSEP_SETSTA_OFFSET           0x14 /* UDPHS Endpoint Set Status Register */
-#define SAM3U_UDPHSEP_CLRSTA_OFFSET           0x18 /* UDPHS Endpoint Clear Status Register */
-#define SAM3U_UDPHSEP_STA_OFFSET              0x1c /* UDPHS Endpoint Status Register */
+#define SAM_UDPHSEP_SETSTA_OFFSET             0x14 /* UDPHS Endpoint Set Status Register */
+#define SAM_UDPHSEP_CLRSTA_OFFSET             0x18 /* UDPHS Endpoint Clear Status Register */
+#define SAM_UDPHSEP_STA_OFFSET                0x1c /* UDPHS Endpoint Status Register */
                                                    /* 0x1e0-0x300: Reserved */
                                                    /* 0x300-0x30c: Reserved */
 /* DMA Channel Registers:  Offsets for DMA channels 1-6 0x320, 0x330, 0x340, 0x350, and
  * 0x360.  NOTE that there is no DMA channel 0.
  */
 
-#define SAM3U_UDPHSDMA_OFFSET(n)              (0x310+((n)<<4))
-#define SAM3U_UDPHSDMA_NXTDSC_OFFSET          0x00 /* UDPHS DMA Next Descriptor Address Register */
-#define SAM3U_UDPHSDMA_ADDRESS_OFFSET         0x04 /* UDPHS DMA Channel Address Register */
-#define SAM3U_UDPHSDMA_CONTROL_OFFSET         0x08 /* UDPHS DMA Channel Control Register */
-#define SAM3U_UDPHSDMA_STATUS_OFFSET)         0x0c /* UDPHS DMA Channel Status Register */
+#define SAM_UDPHSDMA_OFFSET(n)                (0x310+((n)<<4))
+#define SAM_UDPHSDMA_NXTDSC_OFFSET            0x00 /* UDPHS DMA Next Descriptor Address Register */
+#define SAM_UDPHSDMA_ADDRESS_OFFSET           0x04 /* UDPHS DMA Channel Address Register */
+#define SAM_UDPHSDMA_CONTROL_OFFSET           0x08 /* UDPHS DMA Channel Control Register */
+#define SAM_UDPHSDMA_STATUS_OFFSET)           0x0c /* UDPHS DMA Channel Status Register */
 
 /* UDPHS register adresses **************************************************************/
 
-#define SAM3U_UDPHS_CTRL                      (SAM3U_UDPHS_BASE+SAM3U_UDPHS_CTRL_OFFSET)
-#define SAM3U_UDPHS_FNUM                      (SAM3U_UDPHS_BASE+SAM3U_UDPHS_FNUM_OFFSET)
-#define SAM3U_UDPHS_IEN                       (SAM3U_UDPHS_BASE+SAM3U_UDPHS_IEN_OFFSET)
-#define SAM3U_UDPHS_INTSTA                    (SAM3U_UDPHS_BASE+SAM3U_UDPHS_INTSTA_OFFSET)
-#define SAM3U_UDPHS_CLRINT                    (SAM3U_UDPHS_BASE+ SAM3U_UDPHS_CLRINT_OFFSET)
-#define SAM3U_UDPHS_EPTRST                    (SAM3U_UDPHS_BASE+SAM3U_UDPHS_EPTRST_OFFSET)
-#define SAM3U_UDPHS_TST                       (SAM3U_UDPHS_BASE+SAM3U_UDPHS_TST_OFFSET)
-#define SAM3U_UDPHS_IPNAME1                   (SAM3U_UDPHS_BASE+SAM3U_UDPHS_IPNAME1_OFFSET)
-#define SAM3U_UDPHS_IPNAME2                   (SAM3U_UDPHS_BASE+SAM3U_UDPHS_IPNAME2_OFFSET)
-#define SAM3U_UDPHS_IPFEATURES                (SAM3U_UDPHS_BASE+SAM3U_UDPHS_IPFEATURES_OFFSET)
+#define SAM_UDPHS_CTRL                        (SAM_UDPHS_BASE+SAM_UDPHS_CTRL_OFFSET)
+#define SAM_UDPHS_FNUM                        (SAM_UDPHS_BASE+SAM_UDPHS_FNUM_OFFSET)
+#define SAM_UDPHS_IEN                         (SAM_UDPHS_BASE+SAM_UDPHS_IEN_OFFSET)
+#define SAM_UDPHS_INTSTA                      (SAM_UDPHS_BASE+SAM_UDPHS_INTSTA_OFFSET)
+#define SAM_UDPHS_CLRINT                      (SAM_UDPHS_BASE+ SAM_UDPHS_CLRINT_OFFSET)
+#define SAM_UDPHS_EPTRST                      (SAM_UDPHS_BASE+SAM_UDPHS_EPTRST_OFFSET)
+#define SAM_UDPHS_TST                         (SAM_UDPHS_BASE+SAM_UDPHS_TST_OFFSET)
+#define SAM_UDPHS_IPNAME1                     (SAM_UDPHS_BASE+SAM_UDPHS_IPNAME1_OFFSET)
+#define SAM_UDPHS_IPNAME2                     (SAM_UDPHS_BASE+SAM_UDPHS_IPNAME2_OFFSET)
+#define SAM_UDPHS_IPFEATURES                  (SAM_UDPHS_BASE+SAM_UDPHS_IPFEATURES_OFFSET)
 
 /* Endpoint registers */
 
-#define SAM3U_UDPHSEP_BASE(n))                (SAM3U_UDPHS_BASE+SAM3U_UDPHSEP_OFFSET(n))
-#define SAM3U_UDPHSEP_CFG(n)                  (SAM3U_UDPHSEP_BASE(n)+SAM3U_UDPHSEP_CFG_OFFSET)
-#define SAM3U_UDPHSEP_CTLENB(n)               (SAM3U_UDPHSEP_BASE(n)+SAM3U_UDPHSEP_CTLENB_OFFSET)
-#define SAM3U_UDPHSEP_CTLDIS(n)               (SAM3U_UDPHSEP_BASE(n)+SAM3U_UDPHSEP_CTLDIS_OFFSET)
-#define SAM3U_UDPHSEP_CTL(n)                  (SAM3U_UDPHSEP_BASE(n)+SAM3U_UDPHSEP_CTL_OFFSET)
-#define SAM3U_UDPHSEP_SETSTA(n)               (SAM3U_UDPHSEP_BASE(n)+SAM3U_UDPHSEP_SETSTA_OFFSET)
-#define SAM3U_UDPHSEP_CLRSTA(n)               (SAM3U_UDPHSEP_BASE(n)+SAM3U_UDPHSEP_CLRSTA_OFFSET)
-#define SAM3U_UDPHSEP_STA(n)                  (SAM3U_UDPHSEP_BASE(n)+SAM3U_UDPHSEP_STA_OFFSET)
+#define SAM_UDPHSEP_BASE(n))                  (SAM_UDPHS_BASE+SAM_UDPHSEP_OFFSET(n))
+#define SAM_UDPHSEP_CFG(n)                    (SAM_UDPHSEP_BASE(n)+SAM_UDPHSEP_CFG_OFFSET)
+#define SAM_UDPHSEP_CTLENB(n)                 (SAM_UDPHSEP_BASE(n)+SAM_UDPHSEP_CTLENB_OFFSET)
+#define SAM_UDPHSEP_CTLDIS(n)                 (SAM_UDPHSEP_BASE(n)+SAM_UDPHSEP_CTLDIS_OFFSET)
+#define SAM_UDPHSEP_CTL(n)                    (SAM_UDPHSEP_BASE(n)+SAM_UDPHSEP_CTL_OFFSET)
+#define SAM_UDPHSEP_SETSTA(n)                 (SAM_UDPHSEP_BASE(n)+SAM_UDPHSEP_SETSTA_OFFSET)
+#define SAM_UDPHSEP_CLRSTA(n)                 (SAM_UDPHSEP_BASE(n)+SAM_UDPHSEP_CLRSTA_OFFSET)
+#define SAM_UDPHSEP_STA(n)                    (SAM_UDPHSEP_BASE(n)+SAM_UDPHSEP_STA_OFFSET)
 
 /* DMA Channel Registers*/
 
-#define SAM3U_UDPHSDMA_BASE(n)                (SAM3U_UDPHS_BASE+SAM3U_UDPHSDMA_OFFSET(n))
-#define SAM3U_UDPHSDMA_NXTDSC(n)              (SAM3U_UDPHSDMA_BASE(n)+SAM3U_UDPHSDMA_NXTDSC_OFFSET)
-#define SAM3U_UDPHSDMA_ADDRESS(n)             (SAM3U_UDPHSDMA_BASE(n)+SAM3U_UDPHSDMA_ADDRESS_OFFSET)
-#define SAM3U_UDPHSDMA_CONTROL(n)             (SAM3U_UDPHSDMA_BASE(n)+SAM3U_UDPHSDMA_CONTROL_OFFSET)
-#define SAM3U_UDPHSDMA_STATUS(n)              (SAM3U_UDPHSDMA_BASE(n)+SAM3U_UDPHSDMA_STATUS_OFFSET)
+#define SAM_UDPHSDMA_BASE(n)                  (SAM_UDPHS_BASE+SAM_UDPHSDMA_OFFSET(n))
+#define SAM_UDPHSDMA_NXTDSC(n)                (SAM_UDPHSDMA_BASE(n)+SAM_UDPHSDMA_NXTDSC_OFFSET)
+#define SAM_UDPHSDMA_ADDRESS(n)               (SAM_UDPHSDMA_BASE(n)+SAM_UDPHSDMA_ADDRESS_OFFSET)
+#define SAM_UDPHSDMA_CONTROL(n)               (SAM_UDPHSDMA_BASE(n)+SAM_UDPHSDMA_CONTROL_OFFSET)
+#define SAM_UDPHSDMA_STATUS(n)                (SAM_UDPHSDMA_BASE(n)+SAM_UDPHSDMA_STATUS_OFFSET)
 
 /* UDPHS register bit definitions *******************************************************/
 /* UDPHS Control Register */
@@ -308,52 +308,52 @@
 #  define UDPHSEP_STA_TOGGLESQSTA_DATA1       (1 << UDPHSEP_STA_TOGGLESQSTA_SHIFT) /* Data1 */
 #  define UDPHSEP_STA_TOGGLESQSTA_DATA2       (2 << UDPHSEP_STA_TOGGLESQSTA_SHIFT) /* Data2 (High B/W Isoc EP) */
 #  define UDPHSEP_STA_TOGGLESQSTA_MDATA       (3 << UDPHSEP_STA_TOGGLESQSTA_SHIFT) /* MData (High B/W Isoc EP) */
-#define UDPHSEP_STA_ERROVFLW                 (1 << 8)  /* Bit 8:  Overflow Error */
-#define UDPHSEP_STA_RXBKRDY                  (1 << 9)  /* Bit 9:  Received OUT Data */
-#define UDPHSEP_STA_KILLBANK                 (1 << 9)  /* Bit 9:  KILL Bank */
-#define UDPHSEP_STA_TXCOMPLT                 (1 << 10) /* Bit 10: Transmitted IN Data Complete */
-#define UDPHSEP_STA_TXPKRDY                  (1 << 11) /* Bit 11: TX Packet Ready */
-#define UDPHSEP_STA_ERRTRANS                 (1 << 11) /* Bit 11: Transaction Error */
-#define UDPHSEP_STA_RXSETUP                  (1 << 12) /* Bit 12: Received SETUP */
-#define UDPHSEP_STA_ERRFLISO                 (1 << 12) /* Bit 12: Error Flow */
-#define UDPHSEP_STA_STALLSNT                 (1 << 13) /* Bit 13: Stall Sent */
-#define UDPHSEP_STA_ERRCRISO                 (1 << 13) /* Bit 13: CRC ISO Error */
-#define UDPHSEP_STA_ERRNBTRA                 (1 << 13) /* Bit 13: Number of Transaction Error */
-#define UDPHSEP_STA_NAKIN                    (1 << 14) /* Bit 14: NAK IN */
-#define UDPHSEP_STA_ERRFLUSH                 (1 << 14) /* Bit 14: Bank Flush Error */
-#define UDPHSEP_STA_NAKOUT                   (1 << 15) /* Bit 15: NAK OUT */
-#define UDPHSEP_STA_CURRENTBANK_SHIFT        (16)      /* Bits 16-17: Current Bank */
-#define UDPHSEP_STA_CURRENTBANK_MASK         (3 << UDPHSEP_STA_CURRENTBANK_MASK)
-#define UDPHSEP_STA_CONTROLDIR_SHIFT         (16)      /* Bits 16-17: Control Direction */
-#define UDPHSEP_STA_CONTROLDIR_MASK          (3 << UDPHSEP_STA_CONTROLDIR_SHIFT)
-#define UDPHSEP_STA_BUSYBANKSTA_SHIFT        (18)      /* Bits 18-19: Busy Bank Number */
-#define UDPHSEP_STA_BUSYBANKSTA_MASK         (3 << UDPHSEP_STA_BUSYBANKSTA_SHIFT)
-#define UDPHSEP_STA_BYTECOUNT_SHIFT          (20)      /* Bits 20-23: UDPHS Byte Count */
-#define UDPHSEP_STA_BYTECOUNT_MASK           (15 << UDPHSEP_STA_BYTECOUNT_SHIFT)
-#define UDPHSEP_STA_SHRTPCKT                 (1 << 31) /* Bit 31: Short Packet
+#define UDPHSEP_STA_ERROVFLW                  (1 << 8)  /* Bit 8:  Overflow Error */
+#define UDPHSEP_STA_RXBKRDY                   (1 << 9)  /* Bit 9:  Received OUT Data */
+#define UDPHSEP_STA_KILLBANK                  (1 << 9)  /* Bit 9:  KILL Bank */
+#define UDPHSEP_STA_TXCOMPLT                  (1 << 10) /* Bit 10: Transmitted IN Data Complete */
+#define UDPHSEP_STA_TXPKRDY                   (1 << 11) /* Bit 11: TX Packet Ready */
+#define UDPHSEP_STA_ERRTRANS                  (1 << 11) /* Bit 11: Transaction Error */
+#define UDPHSEP_STA_RXSETUP                   (1 << 12) /* Bit 12: Received SETUP */
+#define UDPHSEP_STA_ERRFLISO                  (1 << 12) /* Bit 12: Error Flow */
+#define UDPHSEP_STA_STALLSNT                  (1 << 13) /* Bit 13: Stall Sent */
+#define UDPHSEP_STA_ERRCRISO                  (1 << 13) /* Bit 13: CRC ISO Error */
+#define UDPHSEP_STA_ERRNBTRA                  (1 << 13) /* Bit 13: Number of Transaction Error */
+#define UDPHSEP_STA_NAKIN                     (1 << 14) /* Bit 14: NAK IN */
+#define UDPHSEP_STA_ERRFLUSH                  (1 << 14) /* Bit 14: Bank Flush Error */
+#define UDPHSEP_STA_NAKOUT                    (1 << 15) /* Bit 15: NAK OUT */
+#define UDPHSEP_STA_CURRENTBANK_SHIFT         (16)      /* Bits 16-17: Current Bank */
+#define UDPHSEP_STA_CURRENTBANK_MASK          (3 << UDPHSEP_STA_CURRENTBANK_MASK)
+#define UDPHSEP_STA_CONTROLDIR_SHIFT          (16)      /* Bits 16-17: Control Direction */
+#define UDPHSEP_STA_CONTROLDIR_MASK           (3 << UDPHSEP_STA_CONTROLDIR_SHIFT)
+#define UDPHSEP_STA_BUSYBANKSTA_SHIFT         (18)      /* Bits 18-19: Busy Bank Number */
+#define UDPHSEP_STA_BUSYBANKSTA_MASK          (3 << UDPHSEP_STA_BUSYBANKSTA_SHIFT)
+#define UDPHSEP_STA_BYTECOUNT_SHIFT           (20)      /* Bits 20-23: UDPHS Byte Count */
+#define UDPHSEP_STA_BYTECOUNT_MASK            (15 << UDPHSEP_STA_BYTECOUNT_SHIFT)
+#define UDPHSEP_STA_SHRTPCKT                  (1 << 31) /* Bit 31: Short Packet
 
 /* UDPHS DMA Channel Control Register */
 
-#define UDPHSDMA_CONTROL_CHANNENB            (1 << 0)  /* Bit 0:  Channel Enable Command */
-#define UDPHSDMA_CONTROL_LDNXTDSC            (1 << 1)  /* Bit 1:  Load Next Channel Xfr Desc Enable (Command) */
-#define UDPHSDMA_CONTROL_ENDTREN             (1 << 2)  /* Bit 2:  End of Transfer Enable (Control) */
-#define UDPHSDMA_CONTROL_ENDBEN              (1 << 3)  /* Bit 3:  End of Buffer Enable (Control) */
-#define UDPHSDMA_CONTROL_ENDTRIT             (1 << 4)  /* Bit 4:  End of Transfer Interrupt Enable */
-#define UDPHSDMA_CONTROL_ENDBUFFIT           (1 << 5)  /* Bit 5:  End of Buffer Interrupt Enable */
-#define UDPHSDMA_CONTROL_DESCLDIT            (1 << 6)  /* Bit 6:  Descriptor Loaded Interrupt Enab */
-#define UDPHSDMA_CONTROL_BURSTLCK            (1 << 7)  /* Bit 7:  Burst Lock Ena */
-#define UDPHSDMA_CONTROL_BUFFLENGTH_SHIFT    (16)      /* Bits 16-31: Buffer Byte Length (Write-only) */
-#define UDPHSDMA_CONTROL_BUFFLENGTH_MASK     (0xffff << UDPHSDMA_CONTROL_BUFFLENGTH_SHIFT)
+#define UDPHSDMA_CONTROL_CHANNENB             (1 << 0)  /* Bit 0:  Channel Enable Command */
+#define UDPHSDMA_CONTROL_LDNXTDSC             (1 << 1)  /* Bit 1:  Load Next Channel Xfr Desc Enable (Command) */
+#define UDPHSDMA_CONTROL_ENDTREN              (1 << 2)  /* Bit 2:  End of Transfer Enable (Control) */
+#define UDPHSDMA_CONTROL_ENDBEN               (1 << 3)  /* Bit 3:  End of Buffer Enable (Control) */
+#define UDPHSDMA_CONTROL_ENDTRIT              (1 << 4)  /* Bit 4:  End of Transfer Interrupt Enable */
+#define UDPHSDMA_CONTROL_ENDBUFFIT            (1 << 5)  /* Bit 5:  End of Buffer Interrupt Enable */
+#define UDPHSDMA_CONTROL_DESCLDIT             (1 << 6)  /* Bit 6:  Descriptor Loaded Interrupt Enab */
+#define UDPHSDMA_CONTROL_BURSTLCK             (1 << 7)  /* Bit 7:  Burst Lock Ena */
+#define UDPHSDMA_CONTROL_BUFFLENGTH_SHIFT     (16)      /* Bits 16-31: Buffer Byte Length (Write-only) */
+#define UDPHSDMA_CONTROL_BUFFLENGTH_MASK      (0xffff << UDPHSDMA_CONTROL_BUFFLENGTH_SHIFT)
 
 /* UDPHS DMA Channel Status Register */
 
-#define UDPHSDMA_STATUS_CHANNENB             (1 << 0)  /* Bit 0:  Channel Enable Status */
-#define UDPHSDMA_STATUS_CHANNACT             (1 << 1)  /* Bit 1:  Channel Active Status */
-#define UDPHSDMA_STATUS_ENDTRST              (1 << 4)  /* Bit 4:  End of Channel Transfer Status */
-#define UDPHSDMA_STATUS_ENDBFST              (1 << 5)  /* Bit 5:  End of Channel Buffer Status */
-#define UDPHSDMA_STATUS_DESCLDST             (1 << 6)  /* Bit 6:  Descriptor Loaded Status */
-#define UDPHSDMA_STATUS_BUFFCOUNT_SHIFT      (16)      /* Bits 16-31: Buffer Byte Count */
-#define UDPHSDMA_STATUS_BUFFCOUNT_MASK       (0xffff << UDPHSDMA_STATUS_BUFFCOUNT_SHIFT)
+#define UDPHSDMA_STATUS_CHANNENB              (1 << 0)  /* Bit 0:  Channel Enable Status */
+#define UDPHSDMA_STATUS_CHANNACT              (1 << 1)  /* Bit 1:  Channel Active Status */
+#define UDPHSDMA_STATUS_ENDTRST               (1 << 4)  /* Bit 4:  End of Channel Transfer Status */
+#define UDPHSDMA_STATUS_ENDBFST               (1 << 5)  /* Bit 5:  End of Channel Buffer Status */
+#define UDPHSDMA_STATUS_DESCLDST              (1 << 6)  /* Bit 6:  Descriptor Loaded Status */
+#define UDPHSDMA_STATUS_BUFFCOUNT_SHIFT       (16)      /* Bits 16-31: Buffer Byte Count */
+#define UDPHSDMA_STATUS_BUFFCOUNT_MASK        (0xffff << UDPHSDMA_STATUS_BUFFCOUNT_SHIFT)
 
 /****************************************************************************************
  * Public Types
@@ -367,5 +367,5 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_UDPHS_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_UDPHS_H */
 
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_wdt.h b/nuttx/arch/arm/src/sam34/chip/sam_wdt.h
index 50b16d2a8..ffe0cb96d 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_wdt.h
+++ b/nuttx/arch/arm/src/sam34/chip/sam_wdt.h
@@ -1,7 +1,7 @@
 /****************************************************************************************
- * arch/arm/src/sam3u/sam3u_wdt.h
+ * arch/arm/src/sam34/chip/sam_wdt.h
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAM3U_SAM3U_WDT_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_WDT_H
+#ifndef __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H
+#define __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "sam3u_memorymap.h"
+#include "chip/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -51,35 +51,35 @@
 
 /* WDT register offsets ****************************************************************/
 
-#define SAM3U_WDT_CR_OFFSET         0x00 /* Control Register */
-#define SAM3U_WDT_MR_OFFSET         0x04 /* Mode Register */
-#define SAM3U_WDT_SR_OFFSET         0x08 /* Status Register */
+#define SAM_WDT_CR_OFFSET         0x00 /* Control Register */
+#define SAM_WDT_MR_OFFSET         0x04 /* Mode Register */
+#define SAM_WDT_SR_OFFSET         0x08 /* Status Register */
 
 /* WDT register adresses ***************************************************************/
 
-#define SAM3U_WDT_CR                (SAM3U_WDT_BASE+SAM3U_WDT_CR_OFFSET)
-#define SAM3U_WDT_MR                (SAM3U_WDT_BASE+SAM3U_WDT_MR_OFFSET)
-#define SAM3U_WDT_SR                (SAM3U_WDT_BASE+SAM3U_WDT_SR_OFFSET)
+#define SAM_WDT_CR                (SAM_WDT_BASE+SAM_WDT_CR_OFFSET)
+#define SAM_WDT_MR                (SAM_WDT_BASE+SAM_WDT_MR_OFFSET)
+#define SAM_WDT_SR                (SAM_WDT_BASE+SAM_WDT_SR_OFFSET)
 
 /* WDT register bit definitions ********************************************************/
 
-#define WDT_CR_WDRSTT               (1 << 0)   /* Bit 0:  Watchdog Rest */
-#define WDT_CR_KEY_SHIFT            (24)       /* Bits 24-31:  Password */
-#define WDT_CR_KEY_MASK             (0xff << WDT_CR_KEY_SHIFT)
+#define WDT_CR_WDRSTT             (1 << 0)   /* Bit 0:  Watchdog Rest */
+#define WDT_CR_KEY_SHIFT          (24)       /* Bits 24-31:  Password */
+#define WDT_CR_KEY_MASK           (0xff << WDT_CR_KEY_SHIFT)
 
-#define WDT_MR_WDV_SHIFT            (0)       /* Bits 0-11:  Watchdog Counter Value */
-#define WDT_MR_WDV_MASK             (0xfff << WDT_MR_WDV_SHIFT)
-#define WDT_MR_WDFIEN               (1 << 12) /* Bit 12: Watchdog Fault Interrupt Enable */
-#define WDT_MR_WDRSTEN              (1 << 13) /* Bit 13: Watchdog Reset Enable */
-#define WDT_MR_WDRPROC              (1 << 14) /* Bit 14: Watchdog Reset Processor */
-#define WDT_MR_WDDIS                (1 << 15) /* Bit 15: Watchdog Disable */
-#define WDT_MR_WDD_SHIFT            (16)      /* Bits 16-17:  Watchdog Delta Value */
-#define WDT_MR_WDD_MASK             (0xfff << WDT_MR_WDD_SHIFT)
-#define WDT_MR_WDDBGHLT             (1 << 28) /* Bit 28: Watchdog Debug Halt */
-#define WDT_MR_WDIDLEHLT            (1 << 29) /* Bit 29: Watchdog Idle Halt */
+#define WDT_MR_WDV_SHIFT          (0)       /* Bits 0-11:  Watchdog Counter Value */
+#define WDT_MR_WDV_MASK           (0xfff << WDT_MR_WDV_SHIFT)
+#define WDT_MR_WDFIEN             (1 << 12) /* Bit 12: Watchdog Fault Interrupt Enable */
+#define WDT_MR_WDRSTEN            (1 << 13) /* Bit 13: Watchdog Reset Enable */
+#define WDT_MR_WDRPROC            (1 << 14) /* Bit 14: Watchdog Reset Processor */
+#define WDT_MR_WDDIS              (1 << 15) /* Bit 15: Watchdog Disable */
+#define WDT_MR_WDD_SHIFT          (16)      /* Bits 16-17:  Watchdog Delta Value */
+#define WDT_MR_WDD_MASK           (0xfff << WDT_MR_WDD_SHIFT)
+#define WDT_MR_WDDBGHLT           (1 << 28) /* Bit 28: Watchdog Debug Halt */
+#define WDT_MR_WDIDLEHLT          (1 << 29) /* Bit 29: Watchdog Idle Halt */
 
-#define WDT_SR_WDUNF                (1 << 0)  /* Bit 0:  Watchdog Underflow */
-#define WDT_SR_WDERR                (1 << 1)  /* Bit 1:  Watchdog Error */
+#define WDT_SR_WDUNF              (1 << 0)  /* Bit 0:  Watchdog Underflow */
+#define WDT_SR_WDERR              (1 << 1)  /* Bit 1:  Watchdog Error */
 
 /****************************************************************************************
  * Public Types
@@ -93,4 +93,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_WDT_H */
+#endif /* __ARCH_ARM_SRC_SAM34_CHIP_SAM_WDT_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_allocateheap.c b/nuttx/arch/arm/src/sam34/sam_allocateheap.c
index 1b41812bb..bf765462e 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_allocateheap.c
+++ b/nuttx/arch/arm/src/sam34/sam_allocateheap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/common/sam3u_allocateheap.c
+ * arch/arm/src/common/sam_allocateheap.c
  *
  *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +51,7 @@
 #include "mpu.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "sam3u_internal.h"
+#include "sam_mpuinit.h"
 
 /****************************************************************************
  * Private Definitions
@@ -61,21 +61,21 @@
 #  warning "CONFIG_MM_REGIONS < 2: SRAM1 not included in HEAP"
 #endif
 
-#if CONFIG_MM_REGIONS < 3 && !defined(CONFIG_SAM3U_NAND)
+#if CONFIG_MM_REGIONS < 3 && !defined(CONFIG_SAM34_NAND)
 #  warning "CONFIG_MM_REGIONS < 3: NFC SRAM not included in HEAP"
 #endif
 
-#if CONFIG_MM_REGIONS > 2 && defined(CONFIG_SAM3U_NAND)
+#if CONFIG_MM_REGIONS > 2 && defined(CONFIG_SAM34_NAND)
 #  error "CONFIG_MM_REGIONS > 3 but cannot used NFC SRAM"
 #  undef CONFIG_MM_REGIONS
 #  define CONFIG_MM_REGIONS 2
 #endif
 
-#if CONFIG_DRAM_END > (SAM3U_INTSRAM0_BASE+CONFIG_SAM3U_SRAM0_SIZE)
+#if CONFIG_DRAM_END > (SAM_INTSRAM0_BASE+CONFIG_SAM34_SRAM0_SIZE)
 #  error "CONFIG_DRAM_END is beyond the end of SRAM0"
 #  undef CONFIG_DRAM_END
-#  define CONFIG_DRAM_END (SAM3U_INTSRAM0_BASE+CONFIG_SAM3U_SRAM0_SIZE)
-#elif CONFIG_DRAM_END < (SAM3U_INTSRAM0_BASE+CONFIG_SAM3U_SRAM0_SIZE)
+#  define CONFIG_DRAM_END (SAM_INTSRAM0_BASE+CONFIG_SAM34_SRAM0_SIZE)
+#elif CONFIG_DRAM_END < (SAM_INTSRAM0_BASE+CONFIG_SAM34_SRAM0_SIZE)
 #  warning "CONFIG_DRAM_END is before end of SRAM0... not all of SRAM0 used"
 #endif
 
@@ -157,7 +157,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
 
   /* Allow user-mode access to the user heap memory */
 
-   sam3u_mpu_uheap((uintptr_t)ubase, usize);
+   sam_mpu_uheap((uintptr_t)ubase, usize);
 #else
 
   /* Return the heap settings */
@@ -226,20 +226,20 @@ void up_addregion(void)
 {
   /* Allow user access to the heap memory */
 
-  sam3u_mpu_uheap(SAM3U_INTSRAM1_BASE, CONFIG_SAM3U_SRAM1_SIZE);
+  sam_mpu_uheap(SAM_INTSRAM1_BASE, CONFIG_SAM34_SRAM1_SIZE);
 
   /* Add the region */
 
-  kumm_addregion((FAR void*)SAM3U_INTSRAM1_BASE, CONFIG_SAM3U_SRAM1_SIZE);
+  kumm_addregion((FAR void*)SAM_INTSRAM1_BASE, CONFIG_SAM34_SRAM1_SIZE);
 
 #if CONFIG_MM_REGIONS > 2
   /* Allow user access to the heap memory */
 
-  sam3u_mpu_uheap(SAM3U_NFCSRAM_BASE, CONFIG_SAM3U_NFCSRAM_SIZE);
+  sam_mpu_uheap(SAM_NFCSRAM_BASE, CONFIG_SAM34_NFCSRAM_SIZE);
 
   /* Add the region */
 
-  kumm_addregion((FAR void*)SAM3U_NFCSRAM_BASE, CONFIG_SAM3U_NFCSRAM_SIZE);
+  kumm_addregion((FAR void*)SAM_NFCSRAM_BASE, CONFIG_SAM34_NFCSRAM_SIZE);
 #endif
 }
 #endif
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_clockconfig.c b/nuttx/arch/arm/src/sam34/sam_clockconfig.c
index c9ddba964..8a3988a40 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_clockconfig.c
+++ b/nuttx/arch/arm/src/sam34/sam_clockconfig.c
@@ -1,6 +1,6 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam3u_clockconfig.c
- * arch/arm/src/chip/sam3u_clockconfig.c
+ * arch/arm/src/sam34/sam_clockconfig.c
+ * arch/arm/src/chip/sam_clockconfig.c
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,12 +48,13 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "sam3u_internal.h"
-#include "sam3u_pmc.h"
-#include "sam3u_eefc.h"
-#include "sam3u_wdt.h"
-#include "sam3u_supc.h"
-#include "sam3u_matrix.h"
+
+#include "sam_clockconfig.h"
+#include "chip/sam_pmc.h"
+#include "chip/sam_eefc.h"
+#include "chip/sam_wdt.h"
+#include "chip/sam_supc.h"
+#include "chip/sam_matrix.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -92,85 +93,85 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_efcsetup
+ * Name: sam_efcsetup
  *
  * Description:
  *   Configure 2 waitstates for embedded flash access
  *
  ****************************************************************************/
 
-static inline void sam3u_efcsetup(void)
+static inline void sam_efcsetup(void)
 {
-  putreg32((2 << EEFC_FMR_FWS_SHIFT), SAM3U_EEFC0_FMR);
-  putreg32((2 << EEFC_FMR_FWS_SHIFT), SAM3U_EEFC1_FMR);
+  putreg32((2 << EEFC_FMR_FWS_SHIFT), SAM_EEFC0_FMR);
+  putreg32((2 << EEFC_FMR_FWS_SHIFT), SAM_EEFC1_FMR);
 }
 
 /****************************************************************************
- * Name: sam3u_wdtsetup
+ * Name: sam_wdtsetup
  *
  * Description:
  *   Disable the watchdog timer
  *
  ****************************************************************************/
 
-static inline void sam3u_wdtsetup(void)
+static inline void sam_wdtsetup(void)
 {
-  putreg32(WDT_MR_WDDIS, SAM3U_WDT_MR);
+  putreg32(WDT_MR_WDDIS, SAM_WDT_MR);
 }
 
 /****************************************************************************
- * Name: sam3u_supcsetup
+ * Name: sam_supcsetup
  *
  * Description:
  *   Select the external slow clock
  *
  ****************************************************************************/
 
-static inline void sam3u_supcsetup(void)
+static inline void sam_supcsetup(void)
 {
   /* Check if the 32-kHz is already selected */
 
-  if ((getreg32(SAM3U_SUPC_SR) & SUPC_SR_OSCSEL) == 0)
+  if ((getreg32(SAM_SUPC_SR) & SUPC_SR_OSCSEL) == 0)
     {
       uint32_t delay;
-      putreg32((SUPC_CR_XTALSEL|SUPR_CR_KEY), SAM3U_SUPC_CR);
+      putreg32((SUPC_CR_XTALSEL|SUPR_CR_KEY), SAM_SUPC_CR);
       for (delay = 0;
-           (getreg32(SAM3U_SUPC_SR) & SUPC_SR_OSCSEL) == 0 && delay < UINT32_MAX;
+           (getreg32(SAM_SUPC_SR) & SUPC_SR_OSCSEL) == 0 && delay < UINT32_MAX;
            delay++);
     }
 }
 
 /****************************************************************************
- * Name: sam3u_pmcwait
+ * Name: sam_pmcwait
  *
  * Description:
  *   Wait for the specide PMC status bit to become "1"
  *
  ****************************************************************************/
 
-static void sam3u_pmcwait(uint32_t bit)
+static void sam_pmcwait(uint32_t bit)
 {
   uint32_t delay;
   for (delay = 0;
-       (getreg32(SAM3U_PMC_SR) & bit) == 0 && delay < UINT32_MAX;
+       (getreg32(SAM_PMC_SR) & bit) == 0 && delay < UINT32_MAX;
        delay++);
 }
 
 /****************************************************************************
- * Name: sam3u_pmcsetup
+ * Name: sam_pmcsetup
  *
  * Description:
  *   Initialize clocking
  *
  ****************************************************************************/
 
-static inline void sam3u_pmcsetup(void)
+static inline void sam_pmcsetup(void)
 {
   uint32_t regval;
 
   /* Enable main oscillator (if it has not already been selected) */
 
-  if ((getreg32(SAM3U_CKGR_MOR) & CKGR_MOR_MOSCSEL) == 0)
+  if ((getreg32(SAM_CKGR_MOR) & CKGR_MOR_MOSCSEL) == 0)
     {
       /* "When the MOSCXTEN bit and the MOSCXTCNT are written in CKGR_MOR to
        *  enable the main oscillator, the MOSCXTS bit in the Power Management
@@ -180,10 +181,10 @@ static inline void sam3u_pmcsetup(void)
        *  indicating that the main clock is valid."
        */
 
-      putreg32(BOARD_CKGR_MOR, SAM3U_CKGR_MOR);
-      sam3u_pmcwait(PMC_INT_MOSCXTS);
+      putreg32(BOARD_CKGR_MOR, SAM_CKGR_MOR);
+      sam_pmcwait(PMC_INT_MOSCXTS);
     }
- 
+
   /* "Switch to the main oscillator.  The selection is made by writing the
    *  MOSCSEL bit in the Main Oscillator Register (CKGR_MOR). The switch of
    *  the Main Clock source is glitch free, so there is no need to run out
@@ -196,8 +197,8 @@ static inline void sam3u_pmcsetup(void)
    *             1 = Selection is in progress
    */
 
-  putreg32((BOARD_CKGR_MOR|CKGR_MOR_MOSCSEL), SAM3U_CKGR_MOR);
-  sam3u_pmcwait(PMC_INT_MOSCSELS);
+  putreg32((BOARD_CKGR_MOR|CKGR_MOR_MOSCSEL), SAM_CKGR_MOR);
+  sam_pmcwait(PMC_INT_MOSCSELS);
 
   /* "Select the master clock. "The Master Clock selection is made by writing
    *  the CSS field (Clock Source Selection) in PMC_MCKR (Master Clock Register).
@@ -208,88 +209,88 @@ static inline void sam3u_pmcsetup(void)
    *  established.
    */
 
-  regval = getreg32(SAM3U_PMC_MCKR);
+  regval = getreg32(SAM_PMC_MCKR);
   regval &= ~PMC_MCKR_CSS_MASK;
   regval |= PMC_MCKR_CSS_MAIN;
-  putreg32(regval, SAM3U_PMC_MCKR);
-  sam3u_pmcwait(PMC_INT_MCKRDY);
+  putreg32(regval, SAM_PMC_MCKR);
+  sam_pmcwait(PMC_INT_MCKRDY);
 
   /* Settup PLLA and wait for LOCKA */
 
-  putreg32(BOARD_CKGR_PLLAR, SAM3U_CKGR_PLLAR);
-  sam3u_pmcwait(PMC_INT_LOCKA);
+  putreg32(BOARD_CKGR_PLLAR, SAM_CKGR_PLLAR);
+  sam_pmcwait(PMC_INT_LOCKA);
 
   /* Setup UTMI for USB and wait for LOCKU */
 
 #ifdef CONFIG_USBDEV
-  regval = getreg32(SAM3U_CKGR_UCKR);
+  regval = getreg32(SAM_CKGR_UCKR);
   regval |= BOARD_CKGR_UCKR;
-  putreg32(regval, SAM3U_CKGR_UCKR);
-  sam3u_pmcwait(PMC_INT_LOCKU);
+  putreg32(regval, SAM_CKGR_UCKR);
+  sam_pmcwait(PMC_INT_LOCKU);
 #endif
 
   /* Switch to the fast clock and wait for MCKRDY */
 
-  putreg32(BOARD_PMC_MCKR_FAST, SAM3U_PMC_MCKR);
-  sam3u_pmcwait(PMC_INT_MCKRDY);
+  putreg32(BOARD_PMC_MCKR_FAST, SAM_PMC_MCKR);
+  sam_pmcwait(PMC_INT_MCKRDY);
 
-  putreg32(BOARD_PMC_MCKR, SAM3U_PMC_MCKR);
-  sam3u_pmcwait(PMC_INT_MCKRDY);
+  putreg32(BOARD_PMC_MCKR, SAM_PMC_MCKR);
+  sam_pmcwait(PMC_INT_MCKRDY);
 }
 
 /****************************************************************************
- * Name: sam3u_enabledefaultmaster and sam3u_disabledefaultmaster
+ * Name: sam_enabledefaultmaster and sam_disabledefaultmaster
  *
  * Description:
  *   Enable/disable default master access
  *
  ****************************************************************************/
 
-static inline void sam3u_enabledefaultmaster(void)
+static inline void sam_enabledefaultmaster(void)
 {
   uint32_t regval;
 
   /* Set default master: SRAM0 -> Cortex-M3 System */
 
-  regval  = getreg32(SAM3U_MATRIX_SCFG0);
+  regval  = getreg32(SAM_MATRIX_SCFG0);
   regval |= (MATRIX_SCFG0_FIXEDDEFMSTR_ARMS|MATRIX_SCFG_DEFMSTRTYPE_FIXED);
-  putreg32(regval, SAM3U_MATRIX_SCFG0);
+  putreg32(regval, SAM_MATRIX_SCFG0);
 
   /* Set default master: SRAM1 -> Cortex-M3 System */
 
-  regval  = getreg32(SAM3U_MATRIX_SCFG1);
+  regval  = getreg32(SAM_MATRIX_SCFG1);
   regval |= (MATRIX_SCFG1_FIXEDDEFMSTR_ARMS|MATRIX_SCFG_DEFMSTRTYPE_FIXED);
-  putreg32(regval, SAM3U_MATRIX_SCFG1);
+  putreg32(regval, SAM_MATRIX_SCFG1);
 
   /* Set default master: Internal flash0 -> Cortex-M3 Instruction/Data */
 
-  regval  = getreg32(SAM3U_MATRIX_SCFG3);
+  regval  = getreg32(SAM_MATRIX_SCFG3);
   regval |= (MATRIX_SCFG3_FIXEDDEFMSTR_ARMC|MATRIX_SCFG_DEFMSTRTYPE_FIXED);
-  putreg32(regval, SAM3U_MATRIX_SCFG3);
+  putreg32(regval, SAM_MATRIX_SCFG3);
 }
 
 #if 0 /* Not used */
-static inline void sam3u_disabledefaultmaster(void)
+static inline void sam_disabledefaultmaster(void)
 {
   uint32_t regval;
 
   /* Clear default master: SRAM0 -> Cortex-M3 System */
 
-  regval  = getreg32(SAM3U_MATRIX_SCFG0);
+  regval  = getreg32(SAM_MATRIX_SCFG0);
   regval &= ~MATRIX_SCFG_DEFMSTRTYPE_MASK;
-  putreg32(regval, SAM3U_MATRIX_SCFG0);
+  putreg32(regval, SAM_MATRIX_SCFG0);
 
   /* Clear default master: SRAM1 -> Cortex-M3 System */
 
-  regval  = getreg32(SAM3U_MATRIX_SCFG1);
+  regval  = getreg32(SAM_MATRIX_SCFG1);
   regval &= ~MATRIX_SCFG_DEFMSTRTYPE_MASK;
-  putreg32(regval, SAM3U_MATRIX_SCFG1);
+  putreg32(regval, SAM_MATRIX_SCFG1);
 
   /* Clear default master: Internal flash0 -> Cortex-M3 Instruction/Data */
 
-  regval  = getreg32(SAM3U_MATRIX_SCFG3);
+  regval  = getreg32(SAM_MATRIX_SCFG3);
   regval &= ~MATRIX_SCFG_DEFMSTRTYPE_MASK;
-  putreg32(regval, SAM3U_MATRIX_SCFG3);
+  putreg32(regval, SAM_MATRIX_SCFG3);
 }
 #endif
 
@@ -298,38 +299,38 @@ static inline void sam3u_disabledefaultmaster(void)
  ****************************************************************************/
 
 /************************************************************************************
- * Name: sam3u_clockconfig
+ * Name: sam_clockconfig
  *
  * Description:
- *   Called to initialize the SAM3U.  This does whatever setup is needed to put the
+ *   Called to initialize the SAM3/4.  This does whatever setup is needed to put the
  *   SoC in a usable state.  This includes the initialization of clocking using the
- *   settings in board.h.  (After power-on reset, the sam3u is initiallyrunning on
+ *   settings in board.h.  (After power-on reset, the SAM3/4 is initially running on
  *   a 4MHz internal RC clock).  This function also performs other low-level chip
  *   initialization of the chip including EFC, master clock, IRQ & watchdog
  *   configuration.
  *
  ************************************************************************************/
 
-void sam3u_clockconfig(void)
+void sam_clockconfig(void)
 {
   /* Configure embedded flash access */
 
-  sam3u_efcsetup();
+  sam_efcsetup();
 
   /* Configure the watchdog timer */
 
-  sam3u_wdtsetup();
-  
+  sam_wdtsetup();
+
   /* Setup the supply controller to use the external slow clock */
 
-  sam3u_supcsetup();
+  sam_supcsetup();
 
   /* Initialize clocking */
 
-  sam3u_pmcsetup();
+  sam_pmcsetup();
 
   /* Optimize CPU setting for speed */
 
-  sam3u_enabledefaultmaster();
+  sam_enabledefaultmaster();
 }
 
diff --git a/nuttx/arch/arm/src/sam34/sam_clockconfig.h b/nuttx/arch/arm/src/sam34/sam_clockconfig.h
new file mode 100644
index 000000000..4ed9e6b87
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/sam_clockconfig.h
@@ -0,0 +1,97 @@
+/************************************************************************************
+ * arch/arm/src/sam34/sam_clockconfig.h
+ *
+ *   Copyright (C) 2009-2011, 2013 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_SAM34_SAM_CLOCKCONFIG_H
+#define __ARCH_ARM_SRC_SAM34_SAM_CLOCKCONFIG_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+/************************************************************************************
+ * 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_clockconfig
+ *
+ * Description:
+ *   Called to initialize the SAM3/4.  This does whatever setup is needed to put the
+ *   SoC in a usable state.  This includes the initialization of clocking using the
+ *   settings in board.h.  (After power-on reset, the sam3u is initially running on
+ *   a 4MHz internal RC clock).  This function also performs other low-level chip
+ *   initialization of the chip including EFC, master clock, IRQ and watchdog
+ *   configuration.
+ *
+ ************************************************************************************/
+
+void sam_clockconfig(void);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_CLOCKCONFIG_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_dmac.c b/nuttx/arch/arm/src/sam34/sam_dmac.c
index e3958af74..75d692754 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_dmac.c
+++ b/nuttx/arch/arm/src/sam34/sam_dmac.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * arch/arm/src/sam3u-ek/sam3u_dmac.c
+ * arch/arm/src/sam34-ek/sam_dmac.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,9 +55,9 @@
 #include "os_internal.h"
 #include "chip.h"
 
-#include "sam3u_internal.h"
-#include "sam3u_pmc.h"
-#include "sam3u_dmac.h"
+#include "sam_dmac.h"
+#include "chip/sam_pmc.h"
+#include "chip/sam_dmac.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -67,7 +67,7 @@
 
 /* Condition out the whole file unless DMA is selected in the configuration */
 
-#ifdef CONFIG_SAM3U_DMA
+#ifdef CONFIG_SAM34_DMA
 
 /* If AT90SAM3U support is enabled, then OS DMA support should also be enabled */
 
@@ -77,15 +77,15 @@
 
 /* Check the number of link list descriptors to allocate */
 
-#ifndef CONFIG_SAM3U_NLLDESC
-#  define CONFIG_SAM3U_NLLDESC CONFIG_SAM3U_NDMACHAN
+#ifndef CONFIG_SAM34_NLLDESC
+#  define CONFIG_SAM34_NLLDESC CONFIG_SAM34_NDMACHAN
 #endif
 
-#if CONFIG_SAM3U_NLLDESC < CONFIG_SAM3U_NDMACHAN
-#  warning "At least CONFIG_SAM3U_NDMACHAN descriptors must be allocated"
+#if CONFIG_SAM34_NLLDESC < CONFIG_SAM34_NDMACHAN
+#  warning "At least CONFIG_SAM34_NDMACHAN descriptors must be allocated"
 
-#  undef CONFIG_SAM3U_NLLDESC
-#  define CONFIG_SAM3U_NLLDESC CONFIG_SAM3U_NDMACHAN
+#  undef CONFIG_SAM34_NLLDESC
+#  define CONFIG_SAM34_NLLDESC CONFIG_SAM34_NDMACHAN
 #endif
 
 /* Register values **********************************************************/
@@ -99,7 +99,7 @@
 
 /* This structure descibes one DMA channel */
 
-struct sam3u_dma_s
+struct sam_dma_s
 {
   uint8_t                chan;       /* DMA channel number (0-6) */
   bool                   inuse;      /* TRUE: The DMA channel is in use */
@@ -146,40 +146,40 @@ static const uint32_t g_fifocfg[3] =
 
 /* This array describes the available link list descriptors */
 
-static struct dma_linklist_s g_linklist[CONFIG_SAM3U_NLLDESC];
+static struct dma_linklist_s g_linklist[CONFIG_SAM34_NLLDESC];
 
 /* This array describes the state of each DMA */
 
-static struct sam3u_dma_s g_dma[CONFIG_SAM3U_NDMACHAN] =
+static struct sam_dma_s g_dma[CONFIG_SAM34_NDMACHAN] =
 {
 #ifdef CONFIG_ARCH_CHIP_AT91SAM3U4E
   /* the AT91SAM3U4E has four DMA channels.  The FIFOs for channels 0-2 are
    * 8 bytes in size; channel 3 is 32 bytes.
    */
 
-#if CONFIG_SAM3U_NDMACHAN != 4
-#  error "Logic here assumes CONFIG_SAM3U_NDMACHAN is 4"
+#if CONFIG_SAM34_NDMACHAN != 4
+#  error "Logic here assumes CONFIG_SAM34_NDMACHAN is 4"
 #endif
 
   {
     .chan     = 0,
     .flags    = DMACH_FLAG_FIFO_8BYTES,
-    .base     = SAM3U_DMACHAN0_BASE,
+    .base     = SAM_DMACHAN0_BASE,
   },
   {
     .chan     = 1,
     .flags    = DMACH_FLAG_FIFO_8BYTES,
-    .base     = SAM3U_DMACHAN1_BASE,
+    .base     = SAM_DMACHAN1_BASE,
   },
   {
     .chan     = 2,
     .flags    = DMACH_FLAG_FIFO_8BYTES,
-    .base     = SAM3U_DMACHAN2_BASE,
+    .base     = SAM_DMACHAN2_BASE,
   },
   {
     .chan     = 3,
     .flags    = (DMACH_FLAG_FIFO_32BYTES | DMACH_FLAG_FLOWCONTROL),
-    .base     = SAM3U_DMACHAN3_BASE,
+    .base     = SAM_DMACHAN3_BASE,
   }
 #else
 #  error "Nothing is known about the DMA channels for this device"
@@ -191,14 +191,14 @@ static struct sam3u_dma_s g_dma[CONFIG_SAM3U_NDMACHAN] =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_takechsem() and sam3u_givechsem()
+ * Name: sam_takechsem() and sam_givechsem()
  *
  * Description:
  *   Used to get exclusive access to the DMA channel table
  *
  ****************************************************************************/
 
-static void sam3u_takechsem(void)
+static void sam_takechsem(void)
 {
   /* Take the semaphore (perhaps waiting) */
 
@@ -212,20 +212,20 @@ static void sam3u_takechsem(void)
     }
 }
 
-static inline void sam3u_givechsem(void)
+static inline void sam_givechsem(void)
 {
   (void)sem_post(&g_chsem);
 }
 
 /****************************************************************************
- * Name: sam3u_takedsem() and sam3u_givedsem()
+ * Name: sam_takedsem() and sam_givedsem()
  *
  * Description:
  *   Used to wait for availability of descriptors in the descriptor table.
  *
  ****************************************************************************/
 
-static void sam3u_takedsem(void)
+static void sam_takedsem(void)
 {
   /* Take the semaphore (perhaps waiting) */
 
@@ -239,20 +239,20 @@ static void sam3u_takedsem(void)
     }
 }
 
-static inline void sam3u_givedsem(void)
+static inline void sam_givedsem(void)
 {
   (void)sem_post(&g_dsem);
 }
 
 /****************************************************************************
- * Name: sam3u_fifosize
+ * Name: sam_fifosize
  *
  * Description:
  *  Decode the FIFO size from the flags
  *
  ****************************************************************************/
 
-static unsigned int sam3u_fifosize(uint8_t dmach_flags)
+static unsigned int sam_fifosize(uint8_t dmach_flags)
 {
   dmach_flags &= DMACH_FLAG_FIFOSIZE_MASK;
   if (dmach_flags == DMACH_FLAG_FIFO_8BYTES)
@@ -266,27 +266,27 @@ static unsigned int sam3u_fifosize(uint8_t dmach_flags)
 }
 
 /****************************************************************************
- * Name: sam3u_flowcontrol
+ * Name: sam_flowcontrol
  *
  * Description:
  *  Decode the FIFO flow control from the flags
  *
  ****************************************************************************/
 
-static inline bool sam3u_flowcontrol(uint8_t dmach_flags)
+static inline bool sam_flowcontrol(uint8_t dmach_flags)
 {
   return ((dmach_flags & DMACH_FLAG_FLOWCONTROL) != 0);
 }
 
 /****************************************************************************
- * Name: sam3u_fifocfg
+ * Name: sam_fifocfg
  *
  * Description:
  *  Decode the FIFO config from the flags
  *
  ****************************************************************************/
 
-static inline uint32_t sam3u_fifocfg(struct sam3u_dma_s *dmach)
+static inline uint32_t sam_fifocfg(struct sam_dma_s *dmach)
 {
   unsigned int ndx = (dmach->flags & DMACH_FLAG_FIFOCFG_MASK) >> DMACH_FLAG_FIFOCFG_SHIFT;
   DEBUGASSERT(ndx < 3);
@@ -294,7 +294,7 @@ static inline uint32_t sam3u_fifocfg(struct sam3u_dma_s *dmach)
 }
 
 /****************************************************************************
- * Name: sam3u_txcfg
+ * Name: sam_txcfg
  *
  * Description:
  *  Decode the the flags to get the correct CFG register bit settings for
@@ -302,7 +302,7 @@ static inline uint32_t sam3u_fifocfg(struct sam3u_dma_s *dmach)
  *
  ****************************************************************************/
 
-static inline uint32_t sam3u_txcfg(struct sam3u_dma_s *dmach)
+static inline uint32_t sam_txcfg(struct sam_dma_s *dmach)
 {
   uint32_t regval;
 
@@ -312,12 +312,12 @@ static inline uint32_t sam3u_txcfg(struct sam3u_dma_s *dmach)
   regval  |=   (dmach->flags & DMACH_FLAG_MEMH2SEL) != 0 ? DMACHAN_CFG_SRCH2SEL : 0;
   regval  |= (((dmach->flags & DMACH_FLAG_PERIPHPID_MASK) >> DMACH_FLAG_PERIPHPID_SHIFT) << DMACHAN_CFG_DSTPER_SHIFT);
   regval  |=   (dmach->flags & DMACH_FLAG_PERIPHH2SEL) != 0 ? DMACHAN_CFG_DSTH2SEL : 0;
-  regval  |= sam3u_fifocfg(dmach);
+  regval  |= sam_fifocfg(dmach);
   return regval;
 }
 
 /****************************************************************************
- * Name: sam3u_rxcfg
+ * Name: sam_rxcfg
  *
  * Description:
  *  Decode the the flags to get the correct CFG register bit settings for
@@ -325,33 +325,33 @@ static inline uint32_t sam3u_txcfg(struct sam3u_dma_s *dmach)
  *
  ****************************************************************************/
 
-static inline uint32_t sam3u_rxcfg(struct sam3u_dma_s *dmach)
+static inline uint32_t sam_rxcfg(struct sam_dma_s *dmach)
 {
   uint32_t regval;
 
   /* Set received (peripheral to memory) DMA channel config */
-                         
+
   regval   = (((dmach->flags & DMACH_FLAG_PERIPHPID_MASK) >> DMACH_FLAG_PERIPHPID_SHIFT) << DMACHAN_CFG_SRCPER_SHIFT);
   regval  |=   (dmach->flags & DMACH_FLAG_PERIPHH2SEL) != 0 ? DMACHAN_CFG_SRCH2SEL : 0;
   regval  |= (((dmach->flags & DMACH_FLAG_MEMPID_MASK) >> DMACH_FLAG_MEMPID_SHIFT) << DMACHAN_CFG_DSTPER_SHIFT);
   regval  |=   (dmach->flags & DMACH_FLAG_MEMH2SEL) != 0 ? DMACHAN_CFG_DSTH2SEL : 0;
-  regval  |= sam3u_fifocfg(dmach);
+  regval  |= sam_fifocfg(dmach);
   return regval;
 }
 
 /****************************************************************************
- * Name: sam3u_txctrlabits
+ * Name: sam_txctrlabits
  *
  * Description:
  *  Decode the the flags to get the correct CTRLA register bit settings for
  *  a transmit (memory to peripheral) transfer.  These are only the "fixed"
  *  CTRLA values and  need to be updated with the actual transfer size before
- *  being written to CTRLA sam3u_txctrla).
+ *  being written to CTRLA sam_txctrla).
  *
  ****************************************************************************/
 
 static inline uint32_t
-sam3u_txctrlabits(struct sam3u_dma_s *dmach)
+sam_txctrlabits(struct sam_dma_s *dmach)
 {
   uint32_t regval;
   unsigned int ndx;
@@ -404,15 +404,15 @@ sam3u_txctrlabits(struct sam3u_dma_s *dmach)
 }
 
 /****************************************************************************
- * Name: sam3u_txctrla
+ * Name: sam_txctrla
  *
  * Description:
  *  Or in the variable CTRLA bits
  *
  ****************************************************************************/
 
-static inline uint32_t sam3u_txctrla(struct sam3u_dma_s *dmach,
-                                     uint32_t dmasize, uint32_t txctrlabits)
+static inline uint32_t sam_txctrla(struct sam_dma_s *dmach,
+                                   uint32_t dmasize, uint32_t txctrlabits)
 {
   /* Set the buffer transfer size field.  This is the number of transfers to
    * be performed, that is, the number of source width transfers to perform.
@@ -426,23 +426,23 @@ static inline uint32_t sam3u_txctrla(struct sam3u_dma_s *dmach,
     {
       dmasize >>= 2;
     }
- 
+
   DEBUGASSERT(dmasize <= DMACHAN_CTRLA_BTSIZE_MAX);
   return (txctrlabits & ~DMACHAN_CTRLA_BTSIZE_MASK) | (dmasize << DMACHAN_CTRLA_BTSIZE_SHIFT);
 }
 
 /****************************************************************************
- * Name: sam3u_rxctrlabits
+ * Name: sam_rxctrlabits
  *
  * Description:
  *  Decode the the flags to get the correct CTRLA register bit settings for
  *  a read (peripheral to memory) transfer. These are only the "fixed" CTRLA
  *  values and need to be updated with the actual transfer size before being
- *  written to CTRLA sam3u_rxctrla).
+ *  written to CTRLA sam_rxctrla).
  *
  ****************************************************************************/
 
-static inline uint32_t sam3u_rxctrlabits(struct sam3u_dma_s *dmach)
+static inline uint32_t sam_rxctrlabits(struct sam_dma_s *dmach)
 {
   uint32_t     regval;
   unsigned int ndx;
@@ -495,15 +495,15 @@ static inline uint32_t sam3u_rxctrlabits(struct sam3u_dma_s *dmach)
 }
 
 /****************************************************************************
- * Name: sam3u_rxctrla
+ * Name: sam_rxctrla
  *
  * Description:
  *  'OR' in the variable CTRLA bits
  *
  ****************************************************************************/
 
-static inline uint32_t sam3u_rxctrla(struct sam3u_dma_s *dmach,
-                                     uint32_t dmasize, uint32_t txctrlabits)
+static inline uint32_t sam_rxctrla(struct sam_dma_s *dmach,
+                                   uint32_t dmasize, uint32_t txctrlabits)
 {
   /* Set the buffer transfer size field.  This is the number of transfers to
    * be performed, that is, the number of source width transfers to perform.
@@ -517,13 +517,13 @@ static inline uint32_t sam3u_rxctrla(struct sam3u_dma_s *dmach,
     {
       dmasize >>= 2;
     }
- 
+
   DEBUGASSERT(dmasize <= DMACHAN_CTRLA_BTSIZE_MAX);
   return (txctrlabits & ~DMACHAN_CTRLA_BTSIZE_MASK) | (dmasize << DMACHAN_CTRLA_BTSIZE_SHIFT);
 }
 
 /****************************************************************************
- * Name: sam3u_txctrlb
+ * Name: sam_txctrlb
  *
  * Description:
  *  Decode the the flags to get the correct CTRLB register bit settings for
@@ -531,10 +531,10 @@ static inline uint32_t sam3u_rxctrla(struct sam3u_dma_s *dmach,
  *
  ****************************************************************************/
 
-static inline uint32_t sam3u_txctrlb(struct sam3u_dma_s *dmach)
+static inline uint32_t sam_txctrlb(struct sam_dma_s *dmach)
 {
   uint32_t regval;
- 
+
   /* Assume that we will not be using the link list and disable the source
    * and destination descriptors.  The default will be single transfer mode.
    */
@@ -602,7 +602,7 @@ static inline uint32_t sam3u_txctrlb(struct sam3u_dma_s *dmach)
 }
 
 /****************************************************************************
- * Name: sam3u_rxctrlb
+ * Name: sam_rxctrlb
  *
  * Description:
  *  Decode the the flags to get the correct CTRLB register bit settings for
@@ -610,10 +610,10 @@ static inline uint32_t sam3u_txctrlb(struct sam3u_dma_s *dmach)
  *
  ****************************************************************************/
 
-static inline uint32_t sam3u_rxctrlb(struct sam3u_dma_s *dmach)
+static inline uint32_t sam_rxctrlb(struct sam_dma_s *dmach)
 {
   uint32_t regval;
- 
+
   /* Assume that we will not be using the link list and disable the source and
    * destination descriptors.  The default will be single transfer mode.
    */
@@ -681,7 +681,7 @@ static inline uint32_t sam3u_rxctrlb(struct sam3u_dma_s *dmach)
 }
 
 /****************************************************************************
- * Name: sam3u_allocdesc
+ * Name: sam_allocdesc
  *
  * Description:
  *  Allocate and add one descriptor to the DMA channel's link list.
@@ -695,8 +695,8 @@ static inline uint32_t sam3u_rxctrlb(struct sam3u_dma_s *dmach)
  ****************************************************************************/
 
 static struct dma_linklist_s *
-sam3u_allocdesc(struct sam3u_dma_s *dmach, struct dma_linklist_s *prev,
-                uint32_t src, uint32_t dest, uint32_t ctrla, uint32_t ctrlb)
+sam_allocdesc(struct sam_dma_s *dmach, struct dma_linklist_s *prev,
+              uint32_t src, uint32_t dest, uint32_t ctrla, uint32_t ctrlb)
 {
   struct dma_linklist_s *desc = NULL;
   int i;
@@ -713,7 +713,7 @@ sam3u_allocdesc(struct sam3u_dma_s *dmach, struct dma_linklist_s *prev,
        * is at least one free descriptor in the table and it is ours.
        */
 
-      sam3u_takedsem();
+      sam_takedsem();
 
       /* Examine each link list entry to find an available one -- i.e., one
        * with src == 0.  That src field is set to zero by the DMA transfer
@@ -721,8 +721,8 @@ sam3u_allocdesc(struct sam3u_dma_s *dmach, struct dma_linklist_s *prev,
        * that is an atomic operation.
        */
 
-      sam3u_takechsem();
-      for (i = 0; i < CONFIG_SAM3U_NLLDESC; i++)
+      sam_takechsem();
+      for (i = 0; i < CONFIG_SAM34_NLLDESC; i++)
         {
           if (g_linklist[i].src == 0)
             {
@@ -760,7 +760,7 @@ sam3u_allocdesc(struct sam3u_dma_s *dmach, struct dma_linklist_s *prev,
                    */
 
                   prev->ctrlb &= ~DMACHAN_CTRLB_BOTHDSCR;
- 
+
                   /* Link the previous tail to the new tail */
 
                   prev->next = (uint32_t)desc;
@@ -780,14 +780,15 @@ sam3u_allocdesc(struct sam3u_dma_s *dmach, struct dma_linklist_s *prev,
        * search loop should always be successful.
        */
 
-      sam3u_givechsem();
+      sam_givechsem();
       DEBUGASSERT(desc != NULL);
     }
+
   return desc;
 }
 
 /****************************************************************************
- * Name: sam3u_freelinklist
+ * Name: sam_freelinklist
  *
  * Description:
  *  Free all descriptors in the DMA channel's link list.
@@ -796,7 +797,7 @@ sam3u_allocdesc(struct sam3u_dma_s *dmach, struct dma_linklist_s *prev,
  *
  ****************************************************************************/
 
-static void sam3u_freelinklist(struct sam3u_dma_s *dmach)
+static void sam_freelinklist(struct sam_dma_s *dmach)
 {
   struct dma_linklist_s *desc;
   struct dma_linklist_s *next;
@@ -816,13 +817,13 @@ static void sam3u_freelinklist(struct sam3u_dma_s *dmach)
       next = (struct dma_linklist_s *)desc->next;
       DEBUGASSERT(desc->src != 0);
       memset(desc, 0, sizeof(struct dma_linklist_s));
-      sam3u_givedsem();
+      sam_givedsem();
       desc = next;
     }
 }
 
 /****************************************************************************
- * Name: sam3u_txbuffer
+ * Name: sam_txbuffer
  *
  * Description:
  *   Configure DMA for transmit of one buffer (memory to peripheral).  This
@@ -831,8 +832,8 @@ static void sam3u_freelinklist(struct sam3u_dma_s *dmach)
  *
  ****************************************************************************/
 
-static int sam3u_txbuffer(struct sam3u_dma_s *dmach, uint32_t paddr,
-                          uint32_t maddr, size_t nbytes)
+static int sam_txbuffer(struct sam_dma_s *dmach, uint32_t paddr,
+                        uint32_t maddr, size_t nbytes)
 {
   uint32_t regval;
   uint32_t ctrla;
@@ -849,14 +850,15 @@ static int sam3u_txbuffer(struct sam3u_dma_s *dmach, uint32_t paddr,
     }
   else
     {
-      regval = sam3u_txctrlabits(dmach); 
-      ctrlb  = sam3u_txctrlb(dmach);
+      regval = sam_txctrlabits(dmach);
+      ctrlb  = sam_txctrlb(dmach);
     }
-  ctrla  = sam3u_txctrla(dmach, regval, nbytes);   
+
+  ctrla = sam_txctrla(dmach, regval, nbytes);
 
   /* Add the new link list entry */
 
-  if (!sam3u_allocdesc(dmach, dmach->lltail, maddr, paddr, ctrla, ctrlb))
+  if (!sam_allocdesc(dmach, dmach->lltail, maddr, paddr, ctrla, ctrlb))
     {
       return -ENOMEM;
     }
@@ -865,12 +867,12 @@ static int sam3u_txbuffer(struct sam3u_dma_s *dmach, uint32_t paddr,
    * the DMA is started).
    */
 
-  dmach->cfg = sam3u_txcfg(dmach);
+  dmach->cfg = sam_txcfg(dmach);
   return OK;
 }
 
 /****************************************************************************
- * Name: sam3u_rxbuffer
+ * Name: sam_rxbuffer
  *
  * Description:
  *   Configure DMA for receipt of one buffer (peripheral to memory).  This
@@ -879,8 +881,8 @@ static int sam3u_txbuffer(struct sam3u_dma_s *dmach, uint32_t paddr,
  *
  ****************************************************************************/
 
-static int sam3u_rxbuffer(struct sam3u_dma_s *dmach, uint32_t paddr,
-                          uint32_t maddr, size_t nbytes)
+static int sam_rxbuffer(struct sam_dma_s *dmach, uint32_t paddr,
+                        uint32_t maddr, size_t nbytes)
 {
   uint32_t regval;
   uint32_t ctrla;
@@ -897,14 +899,14 @@ static int sam3u_rxbuffer(struct sam3u_dma_s *dmach, uint32_t paddr,
     }
   else
     {
-      regval = sam3u_rxctrlabits(dmach); 
-      ctrlb  = sam3u_rxctrlb(dmach);
+      regval = sam_rxctrlabits(dmach);
+      ctrlb  = sam_rxctrlb(dmach);
     }
-   ctrla  = sam3u_rxctrla(dmach, regval, nbytes);   
+   ctrla  = sam_rxctrla(dmach, regval, nbytes);
 
   /* Add the new link list entry */
 
-  if (!sam3u_allocdesc(dmach, dmach->lltail, paddr, maddr, ctrla, ctrlb))
+  if (!sam_allocdesc(dmach, dmach->lltail, paddr, maddr, ctrla, ctrlb))
     {
       return -ENOMEM;
     }
@@ -913,19 +915,19 @@ static int sam3u_rxbuffer(struct sam3u_dma_s *dmach, uint32_t paddr,
    * the DMA is started).
    */
 
-  dmach->cfg = sam3u_rxcfg(dmach);
+  dmach->cfg = sam_rxcfg(dmach);
   return OK;
 }
 
 /****************************************************************************
- * Name: sam3u_single
+ * Name: sam_single
  *
  * Description:
  *   Start a single buffer DMA.
  *
  ****************************************************************************/
 
-static inline int sam3u_single(struct sam3u_dma_s *dmach)
+static inline int sam_single(struct sam_dma_s *dmach)
 {
   struct dma_linklist_s *llhead = dmach->llhead;
 
@@ -933,24 +935,24 @@ static inline int sam3u_single(struct sam3u_dma_s *dmach)
    * the interrupt status register.
    */
 
-  (void)getreg32(SAM3U_DMAC_EBCISR);
+  (void)getreg32(SAM_DMAC_EBCISR);
 
   /* Write the starting source address in the SADDR register */
 
   DEBUGASSERT(llhead != NULL && llhead->src != 0);
-  putreg32(llhead->src, dmach->base + SAM3U_DMACHAN_SADDR_OFFSET);
+  putreg32(llhead->src, dmach->base + SAM_DMACHAN_SADDR_OFFSET);
 
   /* Write the starting destination address in the DADDR register */
 
-  putreg32(llhead->dest, dmach->base + SAM3U_DMACHAN_DADDR_OFFSET);
+  putreg32(llhead->dest, dmach->base + SAM_DMACHAN_DADDR_OFFSET);
 
   /* Set up the CTRLA register */
 
-  putreg32(llhead->ctrla, dmach->base + SAM3U_DMACHAN_CTRLA_OFFSET);
+  putreg32(llhead->ctrla, dmach->base + SAM_DMACHAN_CTRLA_OFFSET);
 
   /* Set up the CTRLB register */
 
-  putreg32(llhead->ctrlb, dmach->base + SAM3U_DMACHAN_CTRLA_OFFSET);
+  putreg32(llhead->ctrlb, dmach->base + SAM_DMACHAN_CTRLA_OFFSET);
 
   /* Both the DST and SRC DSCR bits should be '1' in CTRLB */
 
@@ -958,11 +960,11 @@ static inline int sam3u_single(struct sam3u_dma_s *dmach)
 
   /* Set up the CFG register */
 
-  putreg32(dmach->cfg, dmach->base + SAM3U_DMACHAN_CFG_OFFSET);
+  putreg32(dmach->cfg, dmach->base + SAM_DMACHAN_CFG_OFFSET);
 
   /* Enable the channel by writing a ‘1’ to the CHER enable bit */
 
-  putreg32(DMAC_CHER_ENA(dmach->chan), SAM3U_DMAC_CHER);
+  putreg32(DMAC_CHER_ENA(dmach->chan), SAM_DMAC_CHER);
 
   /* The DMA has been started. Once the transfer completes, hardware sets the
    * interrupts and disables the channel.  We will received buffer complete and
@@ -973,19 +975,19 @@ static inline int sam3u_single(struct sam3u_dma_s *dmach)
    * interrupt).
    */
 
-  putreg32(DMAC_EBC_CBTCINTS(dmach->chan), SAM3U_DMAC_EBCIER);
+  putreg32(DMAC_EBC_CBTCINTS(dmach->chan), SAM_DMAC_EBCIER);
   return OK;
 }
 
 /****************************************************************************
- * Name: sam3u_multiple
+ * Name: sam_multiple
  *
  * Description:
  *   Start a multiple buffer DMA.
  *
  ****************************************************************************/
 
-static inline int sam3u_multiple(struct sam3u_dma_s *dmach)
+static inline int sam_multiple(struct sam_dma_s *dmach)
 {
   struct dma_linklist_s *llhead = dmach->llhead;
 
@@ -1000,27 +1002,27 @@ static inline int sam3u_multiple(struct sam3u_dma_s *dmach)
    * status register
    */
 
-  (void)getreg32(SAM3U_DMAC_EBCISR);
+  (void)getreg32(SAM_DMAC_EBCISR);
 
   /* Set up the initial CTRLB register (to enable descriptors) */
 
-  putreg32(llhead->ctrlb, dmach->base + SAM3U_DMACHAN_CTRLA_OFFSET);
+  putreg32(llhead->ctrlb, dmach->base + SAM_DMACHAN_CTRLA_OFFSET);
 
   /* Set up the CTRLB register */
 
-  putreg32(llhead->ctrlb, dmach->base + SAM3U_DMACHAN_CTRLA_OFFSET);
+  putreg32(llhead->ctrlb, dmach->base + SAM_DMACHAN_CTRLA_OFFSET);
 
   /* Write the channel configuration information into the CFG register */
 
-  putreg32(dmach->cfg, dmach->base + SAM3U_DMACHAN_CFG_OFFSET);
+  putreg32(dmach->cfg, dmach->base + SAM_DMACHAN_CFG_OFFSET);
 
   /* Program the DSCR register with the pointer to the firstlink list entry. */
 
-  putreg32((uint32_t)llhead, dmach->base + SAM3U_DMACHAN_DSCR_OFFSET);
+  putreg32((uint32_t)llhead, dmach->base + SAM_DMACHAN_DSCR_OFFSET);
 
   /* Finally, enable the channel by writing a ‘1’ to the CHER enable */
 
-  putreg32(DMAC_CHER_ENA(dmach->chan), SAM3U_DMAC_CHER);
+  putreg32(DMAC_CHER_ENA(dmach->chan), SAM_DMAC_CHER);
 
   /* As each buffer of data is transferred, the CTRLA register is written back
    * into the link list entry.  The CTRLA contains updated BTSIZE and DONE bits.
@@ -1034,31 +1036,31 @@ static inline int sam3u_multiple(struct sam3u_dma_s *dmach)
    * just to handle stall conditions.
    */
 
-  putreg32(DMAC_EBC_CHANINTS(dmach->chan), SAM3U_DMAC_EBCIER);
+  putreg32(DMAC_EBC_CHANINTS(dmach->chan), SAM_DMAC_EBCIER);
   return OK;
 }
 
 /****************************************************************************
- * Name: sam3u_dmasterminate
+ * Name: sam_dmaterminate
  *
  * Description:
  *   Terminate the DMA transfer and disable the DMA channel
  *
  ****************************************************************************/
 
-static void sam3u_dmaterminate(struct sam3u_dma_s *dmach, int result)
+static void sam_dmaterminate(struct sam_dma_s *dmach, int result)
 {
   /* Disable all channel interrupts */
 
-  putreg32(DMAC_EBC_CHANINTS(dmach->chan), SAM3U_DMAC_EBCIDR);
+  putreg32(DMAC_EBC_CHANINTS(dmach->chan), SAM_DMAC_EBCIDR);
 
   /* Disable the channel by writing one to the write-only channel disable register */
- 
-  putreg32(DMAC_CHDR_DIS(dmach->chan), SAM3U_DMAC_CHDR);
-  
+
+  putreg32(DMAC_CHDR_DIS(dmach->chan), SAM_DMAC_CHDR);
+
   /* Free the linklist */
- 
-  sam3u_freelinklist(dmach);
+
+  sam_freelinklist(dmach);
 
   /* Perform the DMA complete callback */
 
@@ -1072,16 +1074,16 @@ static void sam3u_dmaterminate(struct sam3u_dma_s *dmach, int result)
 }
 
 /****************************************************************************
- * Name: sam3u_dmainterrupt
+ * Name: sam_dmainterrupt
  *
  * Description:
  *  DMA interrupt handler
  *
  ****************************************************************************/
 
-static int sam3u_dmainterrupt(int irq, void *context)
+static int sam_dmainterrupt(int irq, void *context)
 {
-  struct sam3u_dma_s *dmach;
+  struct sam_dma_s *dmach;
   unsigned int chndx;
   uint32_t regval;
 
@@ -1089,7 +1091,7 @@ static int sam3u_dmainterrupt(int irq, void *context)
    * status bits.
    */
 
-  regval = getreg32(SAM3U_DMAC_EBCISR) & getreg32(SAM3U_DMAC_EBCIMR);
+  regval = getreg32(SAM_DMAC_EBCISR) & getreg32(SAM_DMAC_EBCIMR);
 
   /* Check if the any transfer has completed */
 
@@ -1097,7 +1099,7 @@ static int sam3u_dmainterrupt(int irq, void *context)
     {
       /* Yes.. Check each bit  to see which channel has interrupted */
 
-      for (chndx = 0; chndx < CONFIG_SAM3U_NDMACHAN; chndx++)
+      for (chndx = 0; chndx < CONFIG_SAM34_NDMACHAN; chndx++)
         {
           /* Are any interrupts pending for this channel? */
 
@@ -1111,7 +1113,7 @@ static int sam3u_dmainterrupt(int irq, void *context)
                 {
                    /* Yes... Terminate the transfer with an error? */
 
-                  sam3u_dmaterminate(dmach, -EIO);
+                  sam_dmaterminate(dmach, -EIO);
                 }
 
               /* Is the transfer complete? */
@@ -1120,7 +1122,7 @@ static int sam3u_dmainterrupt(int irq, void *context)
                {
                   /* Yes.. Terminate the transfer with success */
 
-                  sam3u_dmaterminate(dmach, OK);
+                  sam_dmaterminate(dmach, OK);
                 }
 
               /* Otherwise, this must be a Bufffer Transfer Complete (BTC)
@@ -1131,7 +1133,7 @@ static int sam3u_dmainterrupt(int irq, void *context)
                 {
                   /* Write the KEEPON field to clear the STALL states */
 
-                  putreg32(DMAC_CHER_KEEP(dmach->chan), SAM3U_DMAC_CHER);
+                  putreg32(DMAC_CHER_KEEP(dmach->chan), SAM_DMAC_CHER);
                 }
             }
         }
@@ -1144,7 +1146,7 @@ static int sam3u_dmainterrupt(int irq, void *context)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_dmainitialize
+ * Name: up_dmainitialize
  *
  * Description:
  *   Initialize the DMA subsystem
@@ -1158,36 +1160,36 @@ void weak_function up_dmainitialize(void)
 {
   /* Enable peripheral clock */
 
-  putreg32((1 << SAM3U_PID_DMAC), SAM3U_PMC_PCER);
+  putreg32((1 << SAM_PID_DMAC), SAM_PMC_PCER);
 
   /* Disable all DMA interrupts */
 
-  putreg32(DMAC_EBC_ALLINTS, SAM3U_DMAC_EBCIDR);
+  putreg32(DMAC_EBC_ALLINTS, SAM_DMAC_EBCIDR);
 
   /* Disable all DMA channels */
 
-  putreg32(DMAC_CHDR_DIS_ALL, SAM3U_DMAC_CHDR);
+  putreg32(DMAC_CHDR_DIS_ALL, SAM_DMAC_CHDR);
 
   /* Attach DMA interrupt vector */
 
-  (void)irq_attach(SAM3U_IRQ_DMAC, sam3u_dmainterrupt);
+  (void)irq_attach(SAM_IRQ_DMAC, sam_dmainterrupt);
 
   /* Enable the IRQ at the NVIC (still disabled at the DMA controller) */
 
-  up_enable_irq(SAM3U_IRQ_DMAC);
+  up_enable_irq(SAM_IRQ_DMAC);
 
   /* Enable the DMA controller */
 
-  putreg32(DMAC_EN_ENABLE, SAM3U_DMAC_EN);
+  putreg32(DMAC_EN_ENABLE, SAM_DMAC_EN);
 
   /* Initialize semaphores */
 
   sem_init(&g_chsem, 0, 1);
-  sem_init(&g_dsem, 0, CONFIG_SAM3U_NDMACHAN);
+  sem_init(&g_dsem, 0, CONFIG_SAM34_NDMACHAN);
 }
 
 /****************************************************************************
- * Name: sam3u_dmachannel
+ * Name: sam_dmachannel
  *
  * Description:
  *   Allocate a DMA channel.  This function sets aside a DMA channel with
@@ -1206,28 +1208,28 @@ void weak_function up_dmainitialize(void)
  *
  ****************************************************************************/
 
-DMA_HANDLE sam3u_dmachannel(uint32_t dmach_flags)
+DMA_HANDLE sam_dmachannel(uint32_t dmach_flags)
 {
-  struct sam3u_dma_s *dmach;
+  struct sam_dma_s *dmach;
   unsigned int chndx;
 
   /* Get the search parameters */
 
-  bool flowcontrol = sam3u_flowcontrol(dmach_flags);
-  unsigned int fifosize = sam3u_fifosize(dmach_flags);
+  bool flowcontrol = sam_flowcontrol(dmach_flags);
+  unsigned int fifosize = sam_fifosize(dmach_flags);
 
   /* Search for an available DMA channel with at least the requested FIFO
    * size.
    */
 
   dmach = NULL;
-  sam3u_takechsem();
-  for (chndx = 0; chndx < CONFIG_SAM3U_NDMACHAN; chndx++)
+  sam_takechsem();
+  for (chndx = 0; chndx < CONFIG_SAM34_NDMACHAN; chndx++)
     {
-      struct sam3u_dma_s *candidate = &g_dma[chndx];
+      struct sam_dma_s *candidate = &g_dma[chndx];
       if (!candidate->inuse &&
-          (sam3u_fifosize(candidate->flags) >= fifosize) &&
-          (!flowcontrol || sam3u_flowcontrol(dmach_flags)))
+          (sam_fifosize(candidate->flags) >= fifosize) &&
+          (!flowcontrol || sam_flowcontrol(dmach_flags)))
         {
           dmach         = candidate;
           dmach->inuse  = true;
@@ -1236,13 +1238,13 @@ DMA_HANDLE sam3u_dmachannel(uint32_t dmach_flags)
            * channel
            */
 
-          (void)getreg32(SAM3U_DMAC_EBCISR);
+          (void)getreg32(SAM_DMAC_EBCISR);
 
           /* Disable the channel by writing one to the write-only channel
            * disable register
            */
- 
-          putreg32(DMAC_CHDR_DIS(chndx), SAM3U_DMAC_CHDR);
+
+          putreg32(DMAC_CHDR_DIS(chndx), SAM_DMAC_CHDR);
 
           /* See the DMA channel flags, retaining the fifo size and flow
            * control settings which are inherent properties of the FIFO
@@ -1254,16 +1256,16 @@ DMA_HANDLE sam3u_dmachannel(uint32_t dmach_flags)
           break;
         }
     }
-  sam3u_givechsem();
+  sam_givechsem();
   return (DMA_HANDLE)dmach;
 }
 
 /****************************************************************************
- * Name: sam3u_dmafree
+ * Name: sam_dmafree
  *
  * Description:
  *   Release a DMA channel.  NOTE:  The 'handle' used in this argument must
- *   NEVER be used again until sam3u_dmachannel() is called again to re-gain
+ *   NEVER be used again until sam_dmachannel() is called again to re-gain
  *   a valid handle.
  *
  * Returned Value:
@@ -1271,9 +1273,9 @@ DMA_HANDLE sam3u_dmachannel(uint32_t dmach_flags)
  *
  ****************************************************************************/
 
-void sam3u_dmafree(DMA_HANDLE handle)
+void sam_dmafree(DMA_HANDLE handle)
 {
-  struct sam3u_dma_s *dmach = (struct sam3u_dma_s *)handle;
+  struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
 
   /* Mark the channel no longer in use.  Clearing the inuse flag is an atomic
    * operation and so should be safe.
@@ -1285,19 +1287,19 @@ void sam3u_dmafree(DMA_HANDLE handle)
 }
 
 /****************************************************************************
- * Name: sam3u_dmatxsetup
+ * Name: sam_dmatxsetup
  *
  * Description:
  *   Configure DMA for transmit of one buffer (memory to peripheral).  This
  *   function may be called multiple times to handle large and/or dis-
- *   continuous transfers.  Calls to sam3u_dmatxsetup() and sam3u_dmarxsetup()
+ *   continuous transfers.  Calls to sam_dmatxsetup() and sam_dmarxsetup()
  *   must not be intermixed on the same transfer, however.
  *
  ****************************************************************************/
 
-int sam3u_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t nbytes)
+int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t nbytes)
 {
-  struct sam3u_dma_s *dmach = (struct sam3u_dma_s *)handle;
+  struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
   int ret = OK;
 
   DEBUGASSERT(dmach && dmach->llhead != NULL && dmach->lltail != 0);
@@ -1308,7 +1310,7 @@ int sam3u_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t n
     {
       /* Set up the maximum size transfer */
 
-      ret = sam3u_txbuffer(dmach, paddr, maddr, DMACHAN_CTRLA_BTSIZE_MAX);
+      ret = sam_txbuffer(dmach, paddr, maddr, DMACHAN_CTRLA_BTSIZE_MAX);
       if (ret == OK);
         {
           /* Decrement the number of bytes left to transfer */
@@ -1318,7 +1320,7 @@ int sam3u_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t n
           /* Increment the memory & peripheral address (if it is appropriate to
            * do do).
            */
- 
+
           if ((dmach->flags & DMACH_FLAG_PERIPHINCREMENT) != 0)
             {
               paddr += DMACHAN_CTRLA_BTSIZE_MAX;
@@ -1335,25 +1337,25 @@ int sam3u_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t n
 
   if (ret == OK && nbytes > 0)
     {
-      ret = sam3u_txbuffer(dmach, paddr, maddr, nbytes);
+      ret = sam_txbuffer(dmach, paddr, maddr, nbytes);
     }
   return ret;
 }
 
 /****************************************************************************
- * Name: sam3u_dmarxsetup
+ * Name: sam_dmarxsetup
  *
  * Description:
  *   Configure DMA for receipt of one buffer (peripheral to memory).  This
  *   function may be called multiple times to handle large and/or dis-
- *   continuous transfers.  Calls to sam3u_dmatxsetup() and sam3u_dmarxsetup()
+ *   continuous transfers.  Calls to sam_dmatxsetup() and sam_dmarxsetup()
  *   must not be intermixed on the same transfer, however.
  *
  ****************************************************************************/
 
-int sam3u_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t nbytes)
+int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t nbytes)
 {
-  struct sam3u_dma_s *dmach = (struct sam3u_dma_s *)handle;
+  struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
   int ret = OK;
 
   DEBUGASSERT(dmach && dmach->llhead != NULL && dmach->lltail != 0);
@@ -1364,17 +1366,17 @@ int sam3u_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t n
     {
       /* Set up the maximum size transfer */
 
-      ret = sam3u_rxbuffer(dmach, paddr, maddr, DMACHAN_CTRLA_BTSIZE_MAX);
+      ret = sam_rxbuffer(dmach, paddr, maddr, DMACHAN_CTRLA_BTSIZE_MAX);
       if (ret == OK);
         {
           /* Decrement the number of bytes left to transfer */
- 
+
           nbytes -= DMACHAN_CTRLA_BTSIZE_MAX;
 
           /* Increment the memory & peripheral address (if it is appropriate to
            * do do).
            */
- 
+
           if ((dmach->flags & DMACH_FLAG_PERIPHINCREMENT) != 0)
             {
               paddr += DMACHAN_CTRLA_BTSIZE_MAX;
@@ -1391,22 +1393,22 @@ int sam3u_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr, size_t n
 
   if (ret == OK && nbytes > 0)
     {
-      ret = sam3u_rxbuffer(dmach, paddr, maddr, nbytes);
+      ret = sam_rxbuffer(dmach, paddr, maddr, nbytes);
     }
   return ret;
 }
 
 /****************************************************************************
- * Name: sam3u_dmastart
+ * Name: sam_dmastart
  *
  * Description:
  *   Start the DMA transfer
  *
  ****************************************************************************/
 
-int sam3u_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
+int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
 {
-  struct sam3u_dma_s *dmach = (struct sam3u_dma_s *)handle;
+  struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
   int ret = -EINVAL;
 
   /* Verify that the DMA has been setup (i.e., at least one entry in the
@@ -1425,52 +1427,52 @@ int sam3u_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg)
 
       if (dmach->llhead == dmach->lltail)
         {
-          ret = sam3u_single(dmach);
+          ret = sam_single(dmach);
         }
       else
         {
-          ret = sam3u_multiple(dmach);
+          ret = sam_multiple(dmach);
         }
     }
   return ret;
 }
 
 /****************************************************************************
- * Name: sam3u_dmastop
+ * Name: sam_dmastop
  *
  * Description:
- *   Cancel the DMA.  After sam3u_dmastop() is called, the DMA channel is
- *   reset and sam3u_dmasetup() must be called before sam3u_dmastart() can be
+ *   Cancel the DMA.  After sam_dmastop() is called, the DMA channel is
+ *   reset and sam_dmarx/txsetup() must be called before sam_dmastart() can be
  *   called again
  *
  ****************************************************************************/
 
-void sam3u_dmastop(DMA_HANDLE handle)
+void sam_dmastop(DMA_HANDLE handle)
 {
-  struct sam3u_dma_s *dmach = (struct sam3u_dma_s *)handle;
+  struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
   irqstate_t flags;
- 
+
   DEBUGASSERT(dmach != NULL);
   flags = irqsave();
-  sam3u_dmaterminate(dmach, -EINTR);
+  sam_dmaterminate(dmach, -EINTR);
   irqrestore(flags);
 }
 
 /****************************************************************************
- * Name: sam3u_dmasample
+ * Name: sam_dmasample
  *
  * Description:
  *   Sample DMA register contents
  *
  * Assumptions:
- *   - DMA handle allocated by sam3u_dmachannel()
+ *   - DMA handle allocated by sam_dmachannel()
  *
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_DMA
-void sam3u_dmasample(DMA_HANDLE handle, struct sam3u_dmaregs_s *regs)
+void sam_dmasample(DMA_HANDLE handle, struct sam_dmaregs_s *regs)
 {
-  struct sam3u_dma_s *dmach = (struct sam3u_dma_s *)handle;
+  struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
   irqstate_t flags;
 
   /* Sample global registers.  NOTE: reading EBCISR clears interrupts, but
@@ -1480,61 +1482,61 @@ void sam3u_dmasample(DMA_HANDLE handle, struct sam3u_dmaregs_s *regs)
    */
 
   flags        = irqsave();
-  regs->gcfg   = getreg32(SAM3U_DMAC_GCFG);
-  regs->en     = getreg32(SAM3U_DMAC_EN);
-  regs->sreq   = getreg32(SAM3U_DMAC_SREQ);
-  regs->creq   = getreg32(SAM3U_DMAC_CREQ);
-  regs->last   = getreg32(SAM3U_DMAC_LAST);
-  regs->ebcimr = getreg32(SAM3U_DMAC_EBCIMR);
-  regs->ebcisr = getreg32(SAM3U_DMAC_EBCISR);
-  regs->chsr   = getreg32(SAM3U_DMAC_CHSR);
+  regs->gcfg   = getreg32(SAM_DMAC_GCFG);
+  regs->en     = getreg32(SAM_DMAC_EN);
+  regs->sreq   = getreg32(SAM_DMAC_SREQ);
+  regs->creq   = getreg32(SAM_DMAC_CREQ);
+  regs->last   = getreg32(SAM_DMAC_LAST);
+  regs->ebcimr = getreg32(SAM_DMAC_EBCIMR);
+  regs->ebcisr = getreg32(SAM_DMAC_EBCISR);
+  regs->chsr   = getreg32(SAM_DMAC_CHSR);
 
   /* Sample channel registers */
 
-  regs->saddr  = getreg32(dmach->base + SAM3U_DMACHAN_SADDR_OFFSET);
-  regs->daddr  = getreg32(dmach->base + SAM3U_DMACHAN_DADDR_OFFSET);
-  regs->dscr   = getreg32(dmach->base + SAM3U_DMACHAN_DSCR_OFFSET);
-  regs->ctrla  = getreg32(dmach->base + SAM3U_DMACHAN_CTRLA_OFFSET);
-  regs->ctrlb  = getreg32(dmach->base + SAM3U_DMACHAN_CTRLB_OFFSET);
-  regs->cfg    = getreg32(dmach->base + SAM3U_DMACHAN_CFG_OFFSET);
+  regs->saddr  = getreg32(dmach->base + SAM_DMACHAN_SADDR_OFFSET);
+  regs->daddr  = getreg32(dmach->base + SAM_DMACHAN_DADDR_OFFSET);
+  regs->dscr   = getreg32(dmach->base + SAM_DMACHAN_DSCR_OFFSET);
+  regs->ctrla  = getreg32(dmach->base + SAM_DMACHAN_CTRLA_OFFSET);
+  regs->ctrlb  = getreg32(dmach->base + SAM_DMACHAN_CTRLB_OFFSET);
+  regs->cfg    = getreg32(dmach->base + SAM_DMACHAN_CFG_OFFSET);
   irqrestore(flags);
 }
 #endif /* CONFIG_DEBUG_DMA */
 
 /****************************************************************************
- * Name: sam3u_dmadump
+ * Name: sam_dmadump
  *
  * Description:
  *   Dump previously sampled DMA register contents
  *
  * Assumptions:
- *   - DMA handle allocated by sam3u_dmachannel()
+ *   - DMA handle allocated by sam_dmachannel()
  *
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_DMA
-void sam3u_dmadump(DMA_HANDLE handle, const struct sam3u_dmaregs_s *regs,
-                   const char *msg)
+void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs,
+                 const char *msg)
 {
-  struct sam3u_dma_s *dmach = (struct sam3u_dma_s *)handle;
+  struct sam_dma_s *dmach = (struct sam_dma_s *)handle;
 
   dmadbg("%s\n", msg);
   dmadbg("  DMA Global Registers:\n");
-  dmadbg("      GCFG[%08x]: %08x\n", SAM3U_DMAC_GCFG, regs->gcfg);
-  dmadbg("        EN[%08x]: %08x\n", SAM3U_DMAC_EN, regs->en);
-  dmadbg("      SREQ[%08x]: %08x\n", SAM3U_DMAC_SREQ, regs->sreq);
-  dmadbg("      CREQ[%08x]: %08x\n", SAM3U_DMAC_CREQ, regs->creq);
-  dmadbg("      LAST[%08x]: %08x\n", SAM3U_DMAC_LAST, regs->last);
-  dmadbg("    EBCIMR[%08x]: %08x\n", SAM3U_DMAC_EBCIMR, regs->ebcimr);
-  dmadbg("    EBCISR[%08x]: %08x\n", SAM3U_DMAC_EBCISR, regs->ebcisr);
-  dmadbg("      CHSR[%08x]: %08x\n", SAM3U_DMAC_CHSR, regs->chsr);
+  dmadbg("      GCFG[%08x]: %08x\n", SAM_DMAC_GCFG, regs->gcfg);
+  dmadbg("        EN[%08x]: %08x\n", SAM_DMAC_EN, regs->en);
+  dmadbg("      SREQ[%08x]: %08x\n", SAM_DMAC_SREQ, regs->sreq);
+  dmadbg("      CREQ[%08x]: %08x\n", SAM_DMAC_CREQ, regs->creq);
+  dmadbg("      LAST[%08x]: %08x\n", SAM_DMAC_LAST, regs->last);
+  dmadbg("    EBCIMR[%08x]: %08x\n", SAM_DMAC_EBCIMR, regs->ebcimr);
+  dmadbg("    EBCISR[%08x]: %08x\n", SAM_DMAC_EBCISR, regs->ebcisr);
+  dmadbg("      CHSR[%08x]: %08x\n", SAM_DMAC_CHSR, regs->chsr);
   dmadbg("  DMA Channel Registers:\n");
-  dmadbg("     SADDR[%08x]: %08x\n", dmach->base + SAM3U_DMACHAN_SADDR_OFFSET, regs->saddr);
-  dmadbg("     DADDR[%08x]: %08x\n", dmach->base + SAM3U_DMACHAN_DADDR_OFFSET, regs->daddr);
-  dmadbg("      DSCR[%08x]: %08x\n", dmach->base + SAM3U_DMACHAN_DSCR_OFFSET, regs->dscr);
-  dmadbg("     CTRLA[%08x]: %08x\n", dmach->base + SAM3U_DMACHAN_CTRLA_OFFSET, regs->ctrla);
-  dmadbg("     CTRLB[%08x]: %08x\n", dmach->base + SAM3U_DMACHAN_CTRLB_OFFSET, regs->ctrlb);
-  dmadbg("       CFG[%08x]: %08x\n", dmach->base + SAM3U_DMACHAN_CFG_OFFSET, regs->cfg);
+  dmadbg("     SADDR[%08x]: %08x\n", dmach->base + SAM_DMACHAN_SADDR_OFFSET, regs->saddr);
+  dmadbg("     DADDR[%08x]: %08x\n", dmach->base + SAM_DMACHAN_DADDR_OFFSET, regs->daddr);
+  dmadbg("      DSCR[%08x]: %08x\n", dmach->base + SAM_DMACHAN_DSCR_OFFSET, regs->dscr);
+  dmadbg("     CTRLA[%08x]: %08x\n", dmach->base + SAM_DMACHAN_CTRLA_OFFSET, regs->ctrla);
+  dmadbg("     CTRLB[%08x]: %08x\n", dmach->base + SAM_DMACHAN_CTRLB_OFFSET, regs->ctrlb);
+  dmadbg("       CFG[%08x]: %08x\n", dmach->base + SAM_DMACHAN_CFG_OFFSET, regs->cfg);
 }
 #endif /* CONFIG_DEBUG_DMA */
-#endif /* CONFIG_SAM3U_DMA */
+#endif /* CONFIG_SAM34_DMA */
diff --git a/nuttx/arch/arm/src/sam34/sam_dmac.h b/nuttx/arch/arm/src/sam34/sam_dmac.h
new file mode 100644
index 000000000..4e34d4694
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/sam_dmac.h
@@ -0,0 +1,297 @@
+/************************************************************************************
+ * arch/arm/src/sam34/sam_dmac.h
+ *
+ *   Copyright (C) 2009-2011, 2013 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_SAM34_SAM_DMAC_H
+#define __ARCH_ARM_SRC_SAM34_SAM_DMAC_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+
+#include "chip.h"
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/* Configuration ********************************************************************/
+
+#ifndef CONFIG_DEBUG
+#  undef CONFIG_DEBUG_DMA
+#endif
+
+/* DMA ******************************************************************************/
+
+/* Flags used to characterize the desired DMA channel.  The naming convention is that
+ * one side is the peripheral and the other is memory (however, the interface could still
+ * be used if, for example, both sides were memory although the naming would be awkward)
+ */
+
+/* Unchange-able properties of the channel */
+
+#define DMACH_FLAG_FLOWCONTROL                (1 << 0)  /* Bit 0: Channel supports flow control */
+#define DMACH_FLAG_FIFOSIZE_SHIFT             (1)       /* Bit 1: Size of DMA FIFO */
+#define DMACH_FLAG_FIFOSIZE_MASK              (1 << DMACH_FLAG_FIFOSIZE_SHIFT)
+#  define DMACH_FLAG_FIFO_8BYTES              (0 << DMACH_FLAG_FIFOSIZE_SHIFT) /* 8 bytes */
+#  define DMACH_FLAG_FIFO_32BYTES             (1 << DMACH_FLAG_FIFOSIZE_SHIFT) /* 32 bytes */
+
+/* Configurable properties of the channel */
+
+#define DMACH_FLAG_BURST_LARGEST              0  /* Largest length AHB burst */
+#define DMACH_FLAG_BURST_HALF                 1  /* Half FIFO size */
+#define DMACH_FLAG_BURST_SINGLE               2  /* Single AHB access */
+
+#define DMACH_FLAG_FIFOCFG_SHIFT              (2)       /* Bits 2-3: FIFO configuration */
+#define DMACH_FLAG_FIFOCFG_MASK               (3 << DMACH_FLAG_FIFOCFG_SHIFT)
+#  define DMACH_FLAG_FIFOCFG_LARGEST          (DMACH_FLAG_BURST_LARGEST << DMACH_FLAG_FIFOCFG_SHIFT)
+#  define DMACH_FLAG_FIFOCFG_HALF             (DMACH_FLAG_BURST_HALF << DMACH_FLAG_FIFOCFG_SHIFT)
+#  define DMACH_FLAG_FIFOCFG_SINGLE           (DMACH_FLAG_BURST_SINGLE << DMACH_FLAG_FIFOCFG_SHIFT)
+
+/* Peripheral endpoint characteristics */
+
+#define DMACH_FLAG_PERIPHPID_SHIFT            (4)       /* Bits 4-7: Peripheral PID */
+#define DMACH_FLAG_PERIPHPID_MASK             (15 << DMACH_FLAG_PERIPHPID_SHIFT)
+#define DMACH_FLAG_PERIPHH2SEL                (1 << 8)  /* Bits 8: HW handshaking */
+#define DMACH_FLAG_PERIPHISPERIPH             (1 << 9)  /* Bits 9: 0=memory; 1=peripheral */
+#define DMACH_FLAG_PERIPHWIDTH_SHIFT          (10)      /* Bits 10-11: Peripheral width */
+#define DMACH_FLAG_PERIPHWIDTH_MASK           (3 << DMACH_FLAG_PERIPHWIDTH_SHIFT)
+#  define DMACH_FLAG_PERIPHWIDTH_8BITS        (0 << DMACH_FLAG_PERIPHWIDTH_SHIFT) /* 8 bits */
+#  define DMACH_FLAG_PERIPHWIDTH_16BITS       (1 << DMACH_FLAG_PERIPHWIDTH_SHIFT) /* 16 bits */
+#  define DMACH_FLAG_PERIPHWIDTH_32BITS       (2 << DMACH_FLAG_PERIPHWIDTH_SHIFT) /* 32 bits */
+#define DMACH_FLAG_PERIPHINCREMENT            (1 << 12) /* Bit 12: Autoincrement peripheral address */
+#define DMACH_FLAG_PERIPHCHUNKSIZE            (1 << 13) /* Bit 13: Peripheral chunk size */
+#  define DMACH_FLAG_PERIPHCHUNKSIZE_1        (0)                        /* Peripheral chunksize = 1 */
+#  define DMACH_FLAG_PERIPHCHUNKSIZE_4        DMACH_FLAG_PERIPHCHUNKSIZE /* Peripheral chunksize = 4 */
+
+/* Memory endpoint characteristics */
+
+#define DMACH_FLAG_MEMPID_SHIFT               (14)      /* Bits 14-17: Memory PID */
+#define DMACH_FLAG_MEMPID_MASK                (15 << DMACH_FLAG_PERIPHPID_SHIFT)
+#define DMACH_FLAG_MEMH2SEL                   (1 << 18) /* Bits 18: HW handshaking */
+#define DMACH_FLAG_MEMISPERIPH                (1 << 19) /* Bits 19: 0=memory; 1=peripheral */
+#define DMACH_FLAG_MEMWIDTH_SHIFT             (20)      /* Bits 20-21: Memory width */
+#define DMACH_FLAG_MEMWIDTH_MASK              (3 << DMACH_FLAG_MEMWIDTH_SHIFT)
+#  define DMACH_FLAG_MEMWIDTH_8BITS           (0 << DMACH_FLAG_MEMWIDTH_SHIFT) /* 8 bits */
+#  define DMACH_FLAG_MEMWIDTH_16BITS          (1 << DMACH_FLAG_MEMWIDTH_SHIFT) /* 16 bits */
+#  define DMACH_FLAG_MEMWIDTH_32BITS          (2 << DMACH_FLAG_MEMWIDTH_SHIFT) /* 32 bits */
+#define DMACH_FLAG_MEMINCREMENT               (1 << 22) /* Bit 22: Autoincrement memory address */
+#define DMACH_FLAG_MEMCHUNKSIZE               (1 << 22) /* Bit 23: Memory chunk size */
+#  define DMACH_FLAG_MEMCHUNKSIZE_1           (0)                     /* Memory chunksize = 1 */
+#  define DMACH_FLAG_MEMCHUNKSIZE_4           DMACH_FLAG_MEMCHUNKSIZE /* Memory chunksize = 4 */
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+typedef FAR void *DMA_HANDLE;
+typedef void (*dma_callback_t)(DMA_HANDLE handle, void *arg, int result);
+
+/* The following is used for sampling DMA registers when CONFIG DEBUG_DMA is selected */
+
+#ifdef CONFIG_DEBUG_DMA
+struct sam_dmaregs_s
+{
+  /* Global Registers */
+
+  uint32_t gcfg;    /* DMAC Global Configuration Register */
+  uint32_t en;      /* DMAC Enable Register */
+  uint32_t sreq;    /* DMAC Software Single Request Register */
+  uint32_t creq;    /* DMAC Software Chunk Transfer Request Register */
+  uint32_t last;    /* DMAC Software Last Transfer Flag Register */
+  uint32_t ebcimr;  /* DMAC Error Mask */
+  uint32_t ebcisr;  /* DMAC Error Status */
+  uint32_t chsr;    /* DMAC Channel Handler Status Register */
+
+  /* Channel Registers */
+
+  uint32_t saddr;   /* DMAC Channel Source Address Register */
+  uint32_t daddr;   /* DMAC Channel Destination Address Register */
+  uint32_t dscr;    /* DMAC Channel Descriptor Address Register */
+  uint32_t ctrla;   /* DMAC Channel Control A Register */
+  uint32_t ctrlb;   /* DMAC Channel Control B Register */
+  uint32_t cfg;     /* DMAC Channel Configuration Register */
+};
+#endif
+
+/************************************************************************************
+ * 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_dmachannel
+ *
+ * Description:
+ *   Allocate a DMA channel.  This function sets aside a DMA channel with
+ *   the required FIFO size and flow control capabilities (determined by
+ *   dma_flags) then  gives the caller exclusive access to the DMA channel.
+ *
+ *   The naming convention in all of the DMA interfaces is that one side is
+ *   the 'peripheral' and the other is 'memory'.  Howerver, the interface
+ *   could still be used if, for example, both sides were memory although
+ *   the naming would be awkward.
+ *
+ * Returned Value:
+ *   If a DMA channel if the required FIFO size is available, this function
+ *   returns a non-NULL, void* DMA channel handle.  NULL is returned on any
+ *   failure.
+ *
+ ****************************************************************************/
+
+DMA_HANDLE sam_dmachannel(uint32_t dmach_flags);
+
+/****************************************************************************
+ * Name: sam_dmafree
+ *
+ * Description:
+ *   Release a DMA channel.  NOTE:  The 'handle' used in this argument must
+ *   NEVER be used again until sam_dmachannel() is called again to re-gain
+ *   a valid handle.
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+void sam_dmafree(DMA_HANDLE handle);
+
+/****************************************************************************
+ * Name: sam_dmatxsetup
+ *
+ * Description:
+ *   Configure DMA for transmit of one buffer (memory to peripheral).  This
+ *   function may be called multiple times to handle large and/or dis-
+ *   continuous transfers.  Calls to sam_dmatxsetup() and sam_dmarxsetup()
+ *   must not be intermixed on the same transfer, however.
+ *
+ ****************************************************************************/
+
+int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
+                   size_t nbytes);
+
+/****************************************************************************
+ * Name: sam_dmarxsetup
+ *
+ * Description:
+ *   Configure DMA for receipt of one buffer (peripheral to memory).  This
+ *   function may be called multiple times to handle large and/or dis-
+ *   continuous transfers.  Calls to sam_dmatxsetup() and sam_dmarxsetup()
+ *   must not be intermixed on the same transfer, however.
+ *
+ ****************************************************************************/
+
+int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
+                   size_t nbytes);
+
+/****************************************************************************
+ * Name: sam_dmastart
+ *
+ * Description:
+ *   Start the DMA transfer
+ *
+ ****************************************************************************/
+
+int sam_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg);
+
+/****************************************************************************
+ * Name: sam_dmastop
+ *
+ * Description:
+ *   Cancel the DMA.  After sam_dmastop() is called, the DMA channel is
+ *   reset and sam_dmarx/txsetup() must be called before sam_dmastart() can be
+ *   called again
+ *
+ ****************************************************************************/
+
+void sam_dmastop(DMA_HANDLE handle);
+
+/****************************************************************************
+ * Name: sam_dmasample
+ *
+ * Description:
+ *   Sample DMA register contents
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_DEBUG_DMA
+void sam_dmasample(DMA_HANDLE handle, struct sam_dmaregs_s *regs);
+#else
+#  define sam_dmasample(handle,regs)
+#endif
+
+/****************************************************************************
+ * Name: sam_dmadump
+ *
+ * Description:
+ *   Dump previously sampled DMA register contents
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_DEBUG_DMA
+void sam_dmadump(DMA_HANDLE handle, const struct sam_dmaregs_s *regs,
+                 const char *msg);
+#else
+#  define sam_dmadump(handle,regs,msg)
+#endif
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_DMAC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_pio.c b/nuttx/arch/arm/src/sam34/sam_gpio.c
index 833ff5e1f..123c3d4b9 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_pio.c
+++ b/nuttx/arch/arm/src/sam34/sam_gpio.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam3u_pio.c
+ * arch/arm/src/sam34/sam_gpio.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,8 +51,8 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "sam3u_internal.h"
-#include "sam3u_pio.h"
+#include "sam_gpio.h"
+#include "chip/sam_pio.h"
 
 /****************************************************************************
  * Definitions
@@ -74,139 +74,139 @@ static const char g_portchar[4]   = { 'A', 'B', 'C', 'D' };
  * Private Function Prototypes
  ****************************************************************************/
 /****************************************************************************
- * Name: sam3u_gpiobase
+ * Name: sam_gpiobase
  *
  * Description:
  *   Return the base address of the GPIO register set
  *
  ****************************************************************************/
 
-static inline uintptr_t sam3u_gpiobase(uint16_t cfgset)
+static inline uintptr_t sam_gpiobase(uint16_t cfgset)
 {
   int port = (cfgset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
-  return SAM3U_PION_BASE(port);
+  return SAM_PION_BASE(port);
 }
 
 /****************************************************************************
- * Name: sam3u_gpiopin
+ * Name: sam_gpiopin
  *
  * Description:
  *   Returun the base address of the GPIO register set
  *
  ****************************************************************************/
 
-static inline int sam3u_gpiopin(uint16_t cfgset)
+static inline int sam_gpiopin(uint16_t cfgset)
 {
   return 1 << ((cfgset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT);
 }
 
 /****************************************************************************
- * Name: sam3u_configinput
+ * Name: sam_configinput
  *
  * Description:
  *   Configure a GPIO input pin based on bit-encoded description of the pin.
  *
  ****************************************************************************/
 
-static inline int sam3u_configinput(uintptr_t base, uint32_t pin,
-                                    uint16_t cfgset)
+static inline int sam_configinput(uintptr_t base, uint32_t pin,
+                                  uint16_t cfgset)
 {
   /* Disable interrupts on the pin */
 
-  putreg32(pin, base+SAM3U_PIO_IDR_OFFSET);
+  putreg32(pin, base + SAM_PIO_IDR_OFFSET);
 
   /* Enable/disable the pull-up as requested */
 
   if ((cfgset & GPIO_CFG_PULLUP) != 0)
     {
-      putreg32(pin, base+SAM3U_PIO_PUER_OFFSET);
+      putreg32(pin, base + SAM_PIO_PUER_OFFSET);
     }
   else
     {
-      putreg32(pin, base+SAM3U_PIO_PUDR_OFFSET);
+      putreg32(pin, base + SAM_PIO_PUDR_OFFSET);
     }
 
   /* Check if filtering should be enabled */
 
   if ((cfgset & GPIO_CFG_DEGLITCH) != 0)
     {
-      putreg32(pin, base+SAM3U_PIO_IFER_OFFSET);
+      putreg32(pin, base + SAM_PIO_IFER_OFFSET);
     }
   else
     {
-      putreg32(pin, base+SAM3U_PIO_IFDR_OFFSET);
+      putreg32(pin, base + SAM_PIO_IFDR_OFFSET);
     }
 
   /* Configure the pin as an input and enable the GPIO function */
 
-  putreg32(pin, base+SAM3U_PIO_ODR_OFFSET);
-  putreg32(pin, base+SAM3U_PIO_PER_OFFSET);
+  putreg32(pin, base + SAM_PIO_ODR_OFFSET);
+  putreg32(pin, base + SAM_PIO_PER_OFFSET);
 
   /* To-Do:  If DEGLITCH is selected, need to configure DIFSR, SCIFSR, and
    *         registers.  This would probably best be done with another, new
-   *         API... perhaps sam3u_configfilter()
+   *         API... perhaps sam_configfilter()
    */
 
  return OK;
 }
 
 /****************************************************************************
- * Name: sam3u_configoutput
+ * Name: sam_configoutput
  *
  * Description:
  *   Configure a GPIO output pin based on bit-encoded description of the pin.
  *
  ****************************************************************************/
 
-static inline int sam3u_configoutput(uintptr_t base, uint32_t pin,
-                                     uint16_t cfgset)
+static inline int sam_configoutput(uintptr_t base, uint32_t pin,
+                                   uint16_t cfgset)
 {
   /* Disable interrupts on the pin */
 
-  putreg32(pin, base+SAM3U_PIO_IDR_OFFSET);
+  putreg32(pin, base + SAM_PIO_IDR_OFFSET);
 
   /* Enable/disable the pull-up as requested */
 
   if ((cfgset & GPIO_CFG_PULLUP) != 0)
     {
-      putreg32(pin, base+SAM3U_PIO_PUER_OFFSET);
+      putreg32(pin, base + SAM_PIO_PUER_OFFSET);
     }
   else
     {
-      putreg32(pin, base+SAM3U_PIO_PUDR_OFFSET);
+      putreg32(pin, base + SAM_PIO_PUDR_OFFSET);
     }
 
   /* Enable the open drain driver if requrested */
 
   if ((cfgset & GPIO_CFG_OPENDRAIN) != 0)
     {
-      putreg32(pin, base+SAM3U_PIO_MDER_OFFSET);
+      putreg32(pin, base + SAM_PIO_MDER_OFFSET);
     }
   else
     {
-      putreg32(pin, base+SAM3U_PIO_MDDR_OFFSET);
+      putreg32(pin, base + SAM_PIO_MDDR_OFFSET);
     }
 
   /* Set default value */
 
   if ((cfgset & GPIO_OUTPUT_SET) != 0)
     {
-      putreg32(pin, base+SAM3U_PIO_SODR_OFFSET);
+      putreg32(pin, base + SAM_PIO_SODR_OFFSET);
     }
   else
     {
-      putreg32(pin, base+SAM3U_PIO_CODR_OFFSET);
+      putreg32(pin, base + SAM_PIO_CODR_OFFSET);
     }
 
   /* Configure the pin as an input and enable the GPIO function */
 
-  putreg32(pin, base+SAM3U_PIO_OER_OFFSET);
-  putreg32(pin, base+SAM3U_PIO_PER_OFFSET);
+  putreg32(pin, base + SAM_PIO_OER_OFFSET);
+  putreg32(pin, base + SAM_PIO_PER_OFFSET);
   return OK;
 }
 
 /****************************************************************************
- * Name: sam3u_configperiph
+ * Name: sam_configperiph
  *
  * Description:
  *   Configure a GPIO pin driven by a peripheral A or B signal based on
@@ -214,29 +214,29 @@ static inline int sam3u_configoutput(uintptr_t base, uint32_t pin,
  *
  ****************************************************************************/
 
-static inline int sam3u_configperiph(uintptr_t base, uint32_t pin,
-                                     uint16_t cfgset)
+static inline int sam_configperiph(uintptr_t base, uint32_t pin,
+                                   uint16_t cfgset)
 {
   uint32_t regval;
 
   /* Disable interrupts on the pin */
 
-  putreg32(pin, base+SAM3U_PIO_IDR_OFFSET);
+  putreg32(pin, base + SAM_PIO_IDR_OFFSET);
 
   /* Enable/disable the pull-up as requested */
 
   if ((cfgset & GPIO_CFG_PULLUP) != 0)
     {
-      putreg32(pin, base+SAM3U_PIO_PUER_OFFSET);
+      putreg32(pin, base + SAM_PIO_PUER_OFFSET);
     }
   else
     {
-      putreg32(pin, base+SAM3U_PIO_PUDR_OFFSET);
+      putreg32(pin, base + SAM_PIO_PUDR_OFFSET);
     }
 
   /* Configure pin, depending upon the peripheral A or B*/
 
-  regval = getreg32(base+SAM3U_PIO_ABSR_OFFSET);
+  regval = getreg32(base + SAM_PIO_ABSR_OFFSET);
   if ((cfgset & GPIO_MODE_MASK) == GPIO_PERIPHA)
     {
       regval &= ~pin;
@@ -245,11 +245,11 @@ static inline int sam3u_configperiph(uintptr_t base, uint32_t pin,
     {
       regval |= pin;
     }
-  putreg32(regval, base+SAM3U_PIO_ABSR_OFFSET);
+  putreg32(regval, base + SAM_PIO_ABSR_OFFSET);
 
   /* Disable PIO functionality */
 
-  putreg32(pin, base+SAM3U_PIO_PDR_OFFSET);
+  putreg32(pin, base + SAM_PIO_PDR_OFFSET);
   return OK;
 }
 
@@ -258,34 +258,34 @@ static inline int sam3u_configperiph(uintptr_t base, uint32_t pin,
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_configgpio
+ * Name: sam_configgpio
  *
  * Description:
  *   Configure a GPIO pin based on bit-encoded description of the pin.
  *
  ****************************************************************************/
 
-int sam3u_configgpio(uint16_t cfgset)
+int sam_configgpio(uint16_t cfgset)
 {
-  uintptr_t base = sam3u_gpiobase(cfgset);
-  uint32_t  pin  = sam3u_gpiopin(cfgset);
+  uintptr_t base = sam_gpiobase(cfgset);
+  uint32_t  pin  = sam_gpiopin(cfgset);
   int       ret;
 
   switch (cfgset & GPIO_MODE_MASK)
-    {    
+    {
       case GPIO_INPUT:
-        ret = sam3u_configinput(base, pin, cfgset);
+        ret = sam_configinput(base, pin, cfgset);
         break;
-    
+
       case GPIO_OUTPUT:
-        ret = sam3u_configoutput(base, pin, cfgset);
+        ret = sam_configoutput(base, pin, cfgset);
         break;
-    
+
       case GPIO_PERIPHA:
       case GPIO_PERIPHB:
-        ret = sam3u_configperiph(base, pin, cfgset);
+        ret = sam_configperiph(base, pin, cfgset);
         break;
-   
+
       default:
         ret = -EINVAL;
         break;
@@ -294,56 +294,56 @@ int sam3u_configgpio(uint16_t cfgset)
 }
 
 /****************************************************************************
- * Name: sam3u_gpiowrite
+ * Name: sam_gpiowrite
  *
  * Description:
  *   Write one or zero to the selected GPIO pin
  *
  ****************************************************************************/
 
-void sam3u_gpiowrite(uint16_t pinset, bool value)
+void sam_gpiowrite(uint16_t pinset, bool value)
 {
-  uintptr_t base = sam3u_gpiobase(pinset);
-  uint32_t  pin  = sam3u_gpiopin(pinset);
+  uintptr_t base = sam_gpiobase(pinset);
+  uint32_t  pin  = sam_gpiopin(pinset);
 
   if (value)
     {
-      putreg32(pin, base+SAM3U_PIO_SODR_OFFSET);
+      putreg32(pin, base + SAM_PIO_SODR_OFFSET);
     }
   else
     {
-      putreg32(pin, base+SAM3U_PIO_CODR_OFFSET);
+      putreg32(pin, base + SAM_PIO_CODR_OFFSET);
     }
 }
 
 /****************************************************************************
- * Name: sam3u_gpioread
+ * Name: sam_gpioread
  *
  * Description:
  *   Read one or zero from the selected GPIO pin
  *
  ****************************************************************************/
 
-bool sam3u_gpioread(uint16_t pinset)
+bool sam_gpioread(uint16_t pinset)
 {
-  uintptr_t base = sam3u_gpiobase(pinset);
-  uint32_t  pin  = sam3u_gpiopin(pinset);
+  uintptr_t base = sam_gpiobase(pinset);
+  uint32_t  pin  = sam_gpiopin(pinset);
   uint32_t  regval;
 
   if ((pinset & GPIO_MODE_MASK) == GPIO_OUTPUT)
     {
-      regval = getreg32(base+SAM3U_PIO_ODSR_OFFSET);
+      regval = getreg32(base + SAM_PIO_ODSR_OFFSET);
     }
   else
     {
-      regval = getreg32(base+SAM3U_PIO_PDSR_OFFSET);
+      regval = getreg32(base + SAM_PIO_PDSR_OFFSET);
     }
 
   return (regval & pin) != 0;
 }
 
 /************************************************************************************
- * Function:  sam3u_dumpgpio
+ * Function:  sam_dumpgpio
  *
  * Description:
  *   Dump all GPIO registers associated with the base address of the provided pinset.
@@ -351,7 +351,7 @@ bool sam3u_gpioread(uint16_t pinset)
  ************************************************************************************/
 
 #ifdef CONFIG_DEBUG_GPIO
-int sam3u_dumpgpio(uint32_t pinset, const char *msg)
+int sam_dumpgpio(uint32_t pinset, const char *msg)
 {
   irqstate_t    flags;
   uintptr_t     base;
@@ -360,9 +360,9 @@ int sam3u_dumpgpio(uint32_t pinset, const char *msg)
 
   /* Get the base address associated with the PIO port */
 
-  pin  = sam3u_gpiopin(pinset);
+  pin  = sam_gpiopin(pinset);
   port = (pinset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
-  base = SAM3U_PION_BASE(port);
+  base = SAM_PION_BASE(port);
 
   /* The following requires exclusive access to the GPIO registers */
 
@@ -370,23 +370,23 @@ int sam3u_dumpgpio(uint32_t pinset, const char *msg)
   lldbg("PIO%c pinset: %08x base: %08x -- %s\n",
         g_portchar[port], pinset, base, msg);
   lldbg("    PSR: %08x    OSR: %08x   IFSR: %08x   ODSR: %08x\n",
-        getreg32(base + SAM3U_PIO_PSR_OFFSET), getreg32(base + SAM3U_PIO_OSR_OFFSET),
-        getreg32(base + SAM3U_PIO_IFSR_OFFSET), getreg32(base + SAM3U_PIO_ODSR_OFFSET));
+        getreg32(base + SAM_PIO_PSR_OFFSET), getreg32(base + SAM_PIO_OSR_OFFSET),
+        getreg32(base + SAM_PIO_IFSR_OFFSET), getreg32(base + SAM_PIO_ODSR_OFFSET));
   lldbg("   PDSR: %08x    IMR: %08x    ISR: %08x   MDSR: %08x\n",
-        getreg32(base + SAM3U_PIO_PDSR_OFFSET), getreg32(base + SAM3U_PIO_IMR_OFFSET),
-        getreg32(base + SAM3U_PIO_ISR_OFFSET), getreg32(base + SAM3U_PIO_MDSR_OFFSET));
+        getreg32(base + SAM_PIO_PDSR_OFFSET), getreg32(base + SAM_PIO_IMR_OFFSET),
+        getreg32(base + SAM_PIO_ISR_OFFSET), getreg32(base + SAM_PIO_MDSR_OFFSET));
   lldbg("   PUSR: %08x   ABSR: %08x SCIFSR: %08x  DIFSR: %08x\n",
-        getreg32(base + SAM3U_PIO_PUSR_OFFSET), getreg32(base + SAM3U_PIO_ABSR_OFFSET),
-        getreg32(base + SAM3U_PIO_SCIFSR_OFFSET), getreg32(base + SAM3U_PIO_DIFSR_OFFSET));
+        getreg32(base + SAM_PIO_PUSR_OFFSET), getreg32(base + SAM_PIO_ABSR_OFFSET),
+        getreg32(base + SAM_PIO_SCIFSR_OFFSET), getreg32(base + SAM_PIO_DIFSR_OFFSET));
   lldbg(" IFDGSR: %08x   SCDR: %08x   OWSR: %08x  AIMMR: %08x\n",
-        getreg32(base + SAM3U_PIO_IFDGSR_OFFSET), getreg32(base + SAM3U_PIO_SCDR_OFFSET),
-        getreg32(base + SAM3U_PIO_OWSR_OFFSET), getreg32(base + SAM3U_PIO_AIMMR_OFFSET));
+        getreg32(base + SAM_PIO_IFDGSR_OFFSET), getreg32(base + SAM_PIO_SCDR_OFFSET),
+        getreg32(base + SAM_PIO_OWSR_OFFSET), getreg32(base + SAM_PIO_AIMMR_OFFSET));
   lldbg("    ESR: %08x    LSR: %08x   ELSR: %08x FELLSR: %08x\n",
-        getreg32(base + SAM3U_PIO_ESR_OFFSET), getreg32(base + SAM3U_PIO_LSR_OFFSET),
-        getreg32(base + SAM3U_PIO_ELSR_OFFSET), getreg32(base + SAM3U_PIO_FELLSR_OFFSET));
+        getreg32(base + SAM_PIO_ESR_OFFSET), getreg32(base + SAM_PIO_LSR_OFFSET),
+        getreg32(base + SAM_PIO_ELSR_OFFSET), getreg32(base + SAM_PIO_FELLSR_OFFSET));
   lldbg(" FRLHSR: %08x LOCKSR: %08x   WPMR: %08x   WPSR: %08x\n",
-        getreg32(base + SAM3U_PIO_FRLHSR_OFFSET), getreg32(base + SAM3U_PIO_LOCKSR_OFFSET),
-        getreg32(base + SAM3U_PIO_WPMR_OFFSET), getreg32(base + SAM3U_PIO_WPSR_OFFSET));
+        getreg32(base + SAM_PIO_FRLHSR_OFFSET), getreg32(base + SAM_PIO_LOCKSR_OFFSET),
+        getreg32(base + SAM_PIO_WPMR_OFFSET), getreg32(base + SAM_PIO_WPSR_OFFSET));
   irqrestore(flags);
   return OK;
 }
diff --git a/nuttx/arch/arm/src/sam34/sam_gpio.h b/nuttx/arch/arm/src/sam34/sam_gpio.h
new file mode 100644
index 000000000..3324cd3b3
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/sam_gpio.h
@@ -0,0 +1,297 @@
+/************************************************************************************
+ * arch/arm/src/sam34/sam_gpio.h
+ *
+ *   Copyright (C) 2009-2011, 2013 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_SAM34_SAM_GPIO_H
+#define __ARCH_ARM_SRC_SAM34_SAM_GPIO_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "chip.h"
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+
+/* Configuration ********************************************************************/
+
+#if defined(CONFIG_GPIOA_IRQ) || defined(CONFIG_GPIOB_IRQ) || defined(CONFIG_GPIOC_IRQ)
+#  define CONFIG_GPIO_IRQ 1
+#else
+#  undef CONFIG_GPIO_IRQ
+#endif
+
+#ifndef CONFIG_DEBUG
+#  undef CONFIG_DEBUG_GPIO
+#endif
+
+/* Bit-encoded input to sam_configgpio() ********************************************/
+
+/* 16-bit Encoding:
+ * MMCC CII. VPPB BBBB
+ */
+
+/* Input/Output mode:
+ *
+ * MM.. .... .... ....
+ */
+
+#define GPIO_MODE_SHIFT            (14)        /* Bits 14-15: GPIO mode */
+#define GPIO_MODE_MASK             (3 << GPIO_MODE_SHIFT)
+#  define GPIO_INPUT               (0 << GPIO_MODE_SHIFT) /* Input */
+#  define GPIO_OUTPUT              (1 << GPIO_MODE_SHIFT) /* Output */
+#  define GPIO_PERIPHA             (2 << GPIO_MODE_SHIFT) /* Controlled by periph A signal */
+#  define GPIO_PERIPHB             (3 << GPIO_MODE_SHIFT) /* Controlled by periph B signal */
+
+/* These bits set the configuration of the pin:
+ * ..CC C... .... ....
+ */
+
+#define GPIO_CFG_SHIFT             (11)        /* Bits 11-13: GPIO configuration bits */
+#define GPIO_CFG_MASK              (7 << GPIO_CFG_SHIFT)
+#  define GPIO_CFG_DEFAULT         (0 << GPIO_CFG_SHIFT) /* Default, no attribute */
+#  define GPIO_CFG_PULLUP          (1 << GPIO_CFG_SHIFT) /* Bit 11: Internal pull-up */
+#  define GPIO_CFG_DEGLITCH        (2 << GPIO_CFG_SHIFT) /* Bit 12: Internal glitch filter */
+#  define GPIO_CFG_OPENDRAIN       (4 << GPIO_CFG_SHIFT) /* Bit 13: Open drain */
+
+/* Additional interrupt modes:
+ * .... .II. .... ....
+ */
+
+#define GPIO_INT_SHIFT             (9)        /* Bits 9-10: GPIO configuration bits */
+#define GPIO_INT_MASK              (3 << GPIO_INT_SHIFT)
+#  define GPIO_INT_LEVEL           (1 << 10)   /* Bit 10: Level detection interrupt */
+#  define GPIO_INT_EDGE            (0)         /*        (vs. Edge detection interrupt) */
+#  define GPIO_INT_HIGHLEVEL       (1 << 9)    /* Bit 9: High level detection interrupt */
+#  define GPIO_INT_LOWLEVEL        (0)         /*        (vs. Low level detection interrupt) */
+#  define GPIO_INT_RISING          (1 << 9)    /* Bit 9: Rising edge detection interrupt */
+#  define GPIO_INT_FALLING         (0)         /*        (vs. Falling edge detection interrupt) */
+
+/* If the pin is an GPIO output, then this identifies the initial output value:
+ * .... .... V... ....
+ */
+
+#define GPIO_OUTPUT_SET            (1 << 7)    /* Bit 7: Inital value of output */
+#define GPIO_OUTPUT_CLEAR          (0)
+
+/* This identifies the GPIO port:
+ * .... .... .PP. ....
+ */
+
+#define GPIO_PORT_SHIFT            (5)         /* Bit 5-6:  Port number */
+#define GPIO_PORT_MASK             (3 << GPIO_PORT_SHIFT)
+#  define GPIO_PORT_PIOA           (0 << GPIO_PORT_SHIFT)
+#  define GPIO_PORT_PIOB           (1 << GPIO_PORT_SHIFT)
+#  define GPIO_PORT_PIOC           (2 << GPIO_PORT_SHIFT)
+
+/* This identifies the bit in the port:
+ * .... .... ...B BBBB
+ */
+
+#define GPIO_PIN_SHIFT             0        /* Bits 0-4: GPIO number: 0-31 */
+#define GPIO_PIN_MASK              (31 << GPIO_PIN_SHIFT)
+#define GPIO_PIN0                  (0  << GPIO_PIN_SHIFT)
+#define GPIO_PIN1                  (1  << GPIO_PIN_SHIFT)
+#define GPIO_PIN2                  (2  << GPIO_PIN_SHIFT)
+#define GPIO_PIN3                  (3  << GPIO_PIN_SHIFT)
+#define GPIO_PIN4                  (4  << GPIO_PIN_SHIFT)
+#define GPIO_PIN5                  (5  << GPIO_PIN_SHIFT)
+#define GPIO_PIN6                  (6  << GPIO_PIN_SHIFT)
+#define GPIO_PIN7                  (7  << GPIO_PIN_SHIFT)
+#define GPIO_PIN8                  (8  << GPIO_PIN_SHIFT)
+#define GPIO_PIN9                  (9  << GPIO_PIN_SHIFT)
+#define GPIO_PIN10                 (10 << GPIO_PIN_SHIFT)
+#define GPIO_PIN11                 (11 << GPIO_PIN_SHIFT)
+#define GPIO_PIN12                 (12 << GPIO_PIN_SHIFT)
+#define GPIO_PIN13                 (13 << GPIO_PIN_SHIFT)
+#define GPIO_PIN14                 (14 << GPIO_PIN_SHIFT)
+#define GPIO_PIN15                 (15 << GPIO_PIN_SHIFT)
+#define GPIO_PIN16                 (16 << GPIO_PIN_SHIFT)
+#define GPIO_PIN17                 (17 << GPIO_PIN_SHIFT)
+#define GPIO_PIN18                 (18 << GPIO_PIN_SHIFT)
+#define GPIO_PIN19                 (19 << GPIO_PIN_SHIFT)
+#define GPIO_PIN20                 (20 << GPIO_PIN_SHIFT)
+#define GPIO_PIN21                 (21 << GPIO_PIN_SHIFT)
+#define GPIO_PIN22                 (22 << GPIO_PIN_SHIFT)
+#define GPIO_PIN23                 (23 << GPIO_PIN_SHIFT)
+#define GPIO_PIN24                 (24 << GPIO_PIN_SHIFT)
+#define GPIO_PIN25                 (25 << GPIO_PIN_SHIFT)
+#define GPIO_PIN26                 (26 << GPIO_PIN_SHIFT)
+#define GPIO_PIN27                 (27 << GPIO_PIN_SHIFT)
+#define GPIO_PIN28                 (28 << GPIO_PIN_SHIFT)
+#define GPIO_PIN29                 (29 << GPIO_PIN_SHIFT)
+#define GPIO_PIN30                 (30 << GPIO_PIN_SHIFT)
+#define GPIO_PIN31                 (31 << GPIO_PIN_SHIFT)
+
+/************************************************************************************
+ * 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_gpioirqinitialize
+ *
+ * Description:
+ *   Initialize logic to support a second level of interrupt decoding for GPIO pins.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_GPIO_IRQ
+void sam_gpioirqinitialize(void);
+#else
+#  define sam_gpioirqinitialize()
+#endif
+
+/************************************************************************************
+ * Name: sam_configgpio
+ *
+ * Description:
+ *   Configure a GPIO pin based on bit-encoded description of the pin.
+ *
+ ************************************************************************************/
+
+int sam_configgpio(uint16_t cfgset);
+
+/************************************************************************************
+ * Name: sam_gpiowrite
+ *
+ * Description:
+ *   Write one or zero to the selected GPIO pin
+ *
+ ************************************************************************************/
+
+void sam_gpiowrite(uint16_t pinset, bool value);
+
+/************************************************************************************
+ * Name: sam_gpioread
+ *
+ * Description:
+ *   Read one or zero from the selected GPIO pin
+ *
+ ************************************************************************************/
+
+bool sam_gpioread(uint16_t pinset);
+
+/************************************************************************************
+ * Name: sam_gpioirq
+ *
+ * Description:
+ *   Configure an interrupt for the specified GPIO pin.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_GPIO_IRQ
+void sam_gpioirq(uint16_t pinset);
+#else
+#  define sam_gpioirq(pinset)
+#endif
+
+/************************************************************************************
+ * Name: sam_gpioirqenable
+ *
+ * Description:
+ *   Enable the interrupt for specified GPIO IRQ
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_GPIO_IRQ
+void sam_gpioirqenable(int irq);
+#else
+#  define sam_gpioirqenable(irq)
+#endif
+
+/************************************************************************************
+ * Name: sam_gpioirqdisable
+ *
+ * Description:
+ *   Disable the interrupt for specified GPIO IRQ
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_GPIO_IRQ
+void sam_gpioirqdisable(int irq);
+#else
+#  define sam_gpioirqdisable(irq)
+#endif
+
+/************************************************************************************
+ * Function:  sam_dumpgpio
+ *
+ * Description:
+ *   Dump all GPIO registers associated with the base address of the provided pinset.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_DEBUG_GPIO
+int sam_dumpgpio(uint32_t pinset, const char *msg);
+#else
+#  define sam_dumpgpio(p,m)
+#endif
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_GPIO_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_gpioirq.c b/nuttx/arch/arm/src/sam34/sam_gpioirq.c
index dc01374a9..e5f0364cd 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_gpioirq.c
+++ b/nuttx/arch/arm/src/sam34/sam_gpioirq.c
@@ -1,8 +1,7 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam3u_gpioirq.c
- * arch/arm/src/chip/sam3u_gpioirq.c
+ * arch/arm/src/sam34/sam_gpioirq.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,9 +53,9 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "sam3u_internal.h"
-#include "sam3u_pio.h"
-#include "sam3u_pmc.h"
+#include "sam_gpio.h"
+#include "chip/sam_pio.h"
+#include "chip/sam_pmc.h"
 
 #ifdef CONFIG_GPIO_IRQ
 
@@ -77,65 +76,65 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_gpiobase
+ * Name: sam_gpiobase
  *
  * Description:
  *   Return the base address of the GPIO register set
  *
  ****************************************************************************/
 
-static inline uint32_t sam3u_gpiobase(uint16_t pinset)
+static inline uint32_t sam_gpiobase(uint16_t pinset)
 {
   int port = (pinset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
-  return SAM3U_PION_BASE(port >> GPIO_PORT_SHIFT);
+  return SAM_PION_BASE(port >> GPIO_PORT_SHIFT);
 }
 
 /****************************************************************************
- * Name: sam3u_gpiopin
+ * Name: sam_gpiopin
  *
  * Description:
  *   Returun the base address of the GPIO register set
  *
  ****************************************************************************/
 
-static inline int sam3u_gpiopin(uint16_t pinset)
+static inline int sam_gpiopin(uint16_t pinset)
 {
   return 1 << ((pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT);
 }
 
 /****************************************************************************
- * Name: sam3u_irqbase
+ * Name: sam_irqbase
  *
  * Description:
  *   Return gpio information associated with this IRQ
  *
  ****************************************************************************/
 
-static int sam3u_irqbase(int irq, uint32_t *base, int *pin)
+static int sam_irqbase(int irq, uint32_t *base, int *pin)
 {
-  if (irq >= SAM3U_IRQ_NIRQS)
+  if (irq >= SAM_IRQ_NIRQS)
     {
 #ifdef CONFIG_GPIOA_IRQ
-      if (irq <= SAM3U_IRQ_PA31)
+      if (irq <= SAM_IRQ_PA31)
         {
-          *base = SAM3U_PIOA_BASE;
-          *pin  = irq - SAM3U_IRQ_PA0;
+          *base = SAM_PIOA_BASE;
+          *pin  = irq - SAM_IRQ_PA0;
           return OK;
         }
 #endif
 #ifdef CONFIG_GPIOB_IRQ
-      if (irq <= SAM3U_IRQ_PB31)
+      if (irq <= SAM_IRQ_PB31)
         {
-          *base = SAM3U_PIOB_BASE;
-          *pin  = irq - SAM3U_IRQ_PB0;
+          *base = SAM_PIOB_BASE;
+          *pin  = irq - SAM_IRQ_PB0;
           return OK;
         }
 #endif
 #ifdef CONFIG_GPIOC_IRQ
-      if (irq <= SAM3U_IRQ_PC31)
+      if (irq <= SAM_IRQ_PC31)
         {
-          *base = SAM3U_PIOC_BASE;
-          *pin  = irq - SAM3U_IRQ_PC0;
+          *base = SAM_PIOC_BASE;
+          *pin  = irq - SAM_IRQ_PC0;
           return OK;
         }
 #endif
@@ -157,7 +156,7 @@ static int up_gpiointerrupt(uint32_t base, int irq0, void *context)
   uint32_t bit;
   int      irq;
 
-  pending = getreg32(base+SAM3U_PIO_ISR_OFFSET) & getreg32(base+SAM3U_PIO_IMR_OFFSET);
+  pending = getreg32(base + SAM_PIO_ISR_OFFSET) & getreg32(base + SAM_PIO_IMR_OFFSET);
   for (bit = 1, irq = irq0; pending != 0; bit <<= 1, irq++)
     {
       if ((pending & bit) != 0)
@@ -177,21 +176,21 @@ static int up_gpiointerrupt(uint32_t base, int irq0, void *context)
 #ifdef CONFIG_GPIOA_IRQ
 static int up_gpioainterrupt(int irq, void *context)
 {
-  return up_gpiointerrupt(SAM3U_PIOA_BASE, SAM3U_IRQ_PA0, context);
+  return up_gpiointerrupt(SAM_PIOA_BASE, SAM_IRQ_PA0, context);
 }
 #endif
 
 #ifdef CONFIG_GPIOB_IRQ
 static int up_gpiobinterrupt(int irq, void *context)
 {
-  return up_gpiointerrupt(SAM3U_PIOB_BASE, SAM3U_IRQ_PB0, context);
+  return up_gpiointerrupt(SAM_PIOB_BASE, SAM_IRQ_PB0, context);
 }
 #endif
 
 #ifdef CONFIG_GPIOC_IRQ
 static int up_gpiocinterrupt(int irq, void *context)
 {
-  return up_gpiointerrupt(SAM3U_PIOC_BASE, SAM3U_IRQ_PC0, context);
+  return up_gpiointerrupt(SAM_PIOC_BASE, SAM_IRQ_PC0, context);
 }
 #endif
 
@@ -200,7 +199,7 @@ static int up_gpiocinterrupt(int irq, void *context)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_gpioirqinitialize
+ * Name: sam_gpioirqinitialize
  *
  * Description:
  *   Initialize logic to support a second level of interrupt decoding for
@@ -208,7 +207,7 @@ static int up_gpiocinterrupt(int irq, void *context)
  *
  ****************************************************************************/
 
-void sam3u_gpioirqinitialize(void)
+void sam_gpioirqinitialize(void)
 {
   uint32_t pcer;
 
@@ -217,18 +216,18 @@ void sam3u_gpioirqinitialize(void)
 #ifdef CONFIG_GPIOA_IRQ
   /* Enable GPIOA clocking */
 
-  pcer |= (1 << SAM3U_PID_PIOA);
-  putreg32(pcer, SAM3U_PMC_PCER);
+  pcer |= (1 << SAM_PID_PIOA);
+  putreg32(pcer, SAM_PMC_PCER);
 
   /* Clear and disable all GPIOA interrupts */
 
-  (void)getreg32(SAM3U_PIOA_ISR);
-  putreg32(0xffffffff, SAM3U_PIOA_IDR);
+  (void)getreg32(SAM_PIOA_ISR);
+  putreg32(0xffffffff, SAM_PIOA_IDR);
 
   /* Attach and enable the GPIOA IRQ */
 
-  (void)irq_attach(SAM3U_IRQ_PIOA, up_gpioainterrupt);
-  up_enable_irq(SAM3U_IRQ_PIOA);
+  (void)irq_attach(SAM_IRQ_PIOA, up_gpioainterrupt);
+  up_enable_irq(SAM_IRQ_PIOA);
 #endif
 
   /* Configure GPIOB interrupts */
@@ -236,18 +235,18 @@ void sam3u_gpioirqinitialize(void)
 #ifdef CONFIG_GPIOB_IRQ
   /* Enable GPIOB clocking */
 
-  pcer |= (1 << SAM3U_PID_PIOB);
-  putreg32(pcer, SAM3U_PMC_PCER);
+  pcer |= (1 << SAM_PID_PIOB);
+  putreg32(pcer, SAM_PMC_PCER);
 
   /* Clear and disable all GPIOB interrupts */
 
-  (void)getreg32(SAM3U_PIOB_ISR);
-  putreg32(0xffffffff, SAM3U_PIOB_IDR);
+  (void)getreg32(SAM_PIOB_ISR);
+  putreg32(0xffffffff, SAM_PIOB_IDR);
 
   /* Attach and enable the GPIOB IRQ */
 
-  (void)irq_attach(SAM3U_IRQ_PIOB, up_gpiobinterrupt);
-  up_enable_irq(SAM3U_IRQ_PIOB);
+  (void)irq_attach(SAM_IRQ_PIOB, up_gpiobinterrupt);
+  up_enable_irq(SAM_IRQ_PIOB);
 #endif
 
   /* Configure GPIOC interrupts */
@@ -255,113 +254,113 @@ void sam3u_gpioirqinitialize(void)
 #ifdef CONFIG_GPIOC_IRQ
   /* Enable GPIOC clocking */
 
-  pcer |= (1 << SAM3U_PID_PIOC);
-  putreg32(pcer, SAM3U_PMC_PCER);
+  pcer |= (1 << SAM_PID_PIOC);
+  putreg32(pcer, SAM_PMC_PCER);
 
   /* Clear and disable all GPIOC interrupts */
 
-  (void)getreg32(SAM3U_PIOC_ISR);
-  putreg32(0xffffffff, SAM3U_PIOC_IDR);
+  (void)getreg32(SAM_PIOC_ISR);
+  putreg32(0xffffffff, SAM_PIOC_IDR);
 
   /* Attach and enable the GPIOC IRQ */
 
-  (void)irq_attach(SAM3U_IRQ_PIOC, up_gpioainterrupt);
-  up_enable_irq(SAM3U_IRQ_PIOC);
+  (void)irq_attach(SAM_IRQ_PIOC, up_gpioainterrupt);
+  up_enable_irq(SAM_IRQ_PIOC);
 #endif
 }
 
 /************************************************************************************
- * Name: sam3u_gpioirq
+ * Name: sam_gpioirq
  *
  * Description:
  *   Configure an interrupt for the specified GPIO pin.
  *
  ************************************************************************************/
 
-void sam3u_gpioirq(uint16_t pinset)
+void sam_gpioirq(uint16_t pinset)
 {
-  uint32_t base = sam3u_gpiobase(pinset);
-  int      pin  = sam3u_gpiopin(pinset);
- 
+  uint32_t base = sam_gpiobase(pinset);
+  int      pin  = sam_gpiopin(pinset);
+
    /* Are any additional interrupt modes selected? */
 
    if ((pinset & GPIO_INT_MASK) != 0)
      {
        /* Yes.. Enable additional interrupt mode */
- 
-       putreg32(pin, base+SAM3U_PIO_AIMER_OFFSET);
+
+       putreg32(pin, base + SAM_PIO_AIMER_OFFSET);
 
        /* Level or edge detected interrupt? */
 
        if ((pinset & GPIO_INT_LEVEL) != 0)
          {
-           putreg32(pin, base+SAM3U_PIO_LSR_OFFSET); /* Level */
+           putreg32(pin, base + SAM_PIO_LSR_OFFSET); /* Level */
          }
        else
          {
-           putreg32(pin, base+SAM3U_PIO_ESR_OFFSET); /* Edge */
+           putreg32(pin, base + SAM_PIO_ESR_OFFSET); /* Edge */
          }
 
       /* High level/rising edge or low level /falling edge? */
 
        if ((pinset & GPIO_INT_HIGHLEVEL) != 0)
          {
-           putreg32(pin, base+SAM3U_PIO_REHLSR_OFFSET); /* High level/Rising edge */
+           putreg32(pin, base + SAM_PIO_REHLSR_OFFSET); /* High level/Rising edge */
          }
        else
          {
-           putreg32(pin, base+SAM3U_PIO_FELLSR_OFFSET); /* Low level/Falling edge */
+           putreg32(pin, base + SAM_PIO_FELLSR_OFFSET); /* Low level/Falling edge */
          }
      }
    else
      {
        /* No.. Disable additional interrupt mode */
- 
-       putreg32(pin, base+SAM3U_PIO_AIMDR_OFFSET);
+
+       putreg32(pin, base + SAM_PIO_AIMDR_OFFSET);
      }
 }
 
 /************************************************************************************
- * Name: sam3u_gpioirqenable
+ * Name: sam_gpioirqenable
  *
  * Description:
  *   Enable the interrupt for specified GPIO IRQ
  *
  ************************************************************************************/
 
-void sam3u_gpioirqenable(int irq)
+void sam_gpioirqenable(int irq)
 {
   uint32_t base;
   int      pin;
 
-  if (sam3u_irqbase(irq, &base, &pin) == OK)
+  if (sam_irqbase(irq, &base, &pin) == OK)
     {
        /* Clear (all) pending interrupts and enable this pin interrupt */
 
-       (void)getreg32(base+SAM3U_PIO_ISR_OFFSET);
-       putreg32((1 << pin), base+SAM3U_PIO_IER_OFFSET);
+       (void)getreg32(base + SAM_PIO_ISR_OFFSET);
+       putreg32((1 << pin), base + SAM_PIO_IER_OFFSET);
     }
 }
 
 /************************************************************************************
- * Name: sam3u_gpioirqdisable
+ * Name: sam_gpioirqdisable
  *
  * Description:
  *   Disable the interrupt for specified GPIO IRQ
  *
  ************************************************************************************/
 
-void sam3u_gpioirqdisable(int irq)
+void sam_gpioirqdisable(int irq)
 {
   uint32_t base;
   int      pin;
 
-  if (sam3u_irqbase(irq, &base, &pin) == OK)
+  if (sam_irqbase(irq, &base, &pin) == OK)
     {
        /* Disable this pin interrupt */
 
-       putreg32((1 << pin), base+SAM3U_PIO_IDR_OFFSET);
+       putreg32((1 << pin), base + SAM_PIO_IDR_OFFSET);
     }
 }
 
-#endif /* CONFIG_GPIO_IRQ */
\ No newline at end of file
+#endif /* CONFIG_GPIO_IRQ */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c b/nuttx/arch/arm/src/sam34/sam_hsmci.c
index 9d7c308ca..f9ee665a8 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c
+++ b/nuttx/arch/arm/src/sam34/sam_hsmci.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam3u_sdio.c
+ * arch/arm/src/sam34/sam_hsmci.c
  *
- *   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,12 +60,15 @@
 #include "chip.h"
 #include "up_arch.h"
 
-#include "sam3u_internal.h"
-#include "sam3u_dmac.h"
-#include "sam3u_pmc.h"
-#include "sam3u_hsmci.h"
+#include "sam_gpio.h"
+#include "sam_dmac.h"
+#include "sam_hsmci.h"
+#include "chip/sam_dmac.h"
+#include "chip/sam_pmc.h"
+#include "chip/sam_hsmci.h"
+#include "chip/sam_pinmap.h"
 
-#if CONFIG_SAM3U_HSMCI
+#if CONFIG_SAM34_HSMCI
 
 /****************************************************************************
  * Pre-Processor Definitions
@@ -73,8 +76,8 @@
 
 /* Configuration ************************************************************/
 
-#ifndef CONFIG_SAM3U_DMA
-#  warning "HSMCI driver requires CONFIG_SAM3U_DMA"
+#ifndef CONFIG_SAM34_DMA
+#  warning "HSMCI driver requires CONFIG_SAM34_DMA"
 #endif
 
 #ifndef CONFIG_SCHED_WORKQUEUE
@@ -94,14 +97,14 @@
 #  undef CONFIG_HSMCI_XFRDEBUG
 #endif
 
-#ifdef CONFIG_SAM3U_HSMCI_RDPROOF
-#  ifdef CONFIG_SAM3U_HSMCI_WRPROOF
+#ifdef CONFIG_SAM34_HSMCI_RDPROOF
+#  ifdef CONFIG_SAM34_HSMCI_WRPROOF
 #    define HSMCU_PROOF_BITS (HSMCI_MR_RDPROOF | HSMCI_MR_WRPROOF)
 #  else
 #    define HSMCU_PROOF_BITS HSMCI_MR_RDPROOF
 #  endif
 #else
-#  ifdef CONFIG_SAM3U_HSMCI_WRPROOF
+#  ifdef CONFIG_SAM34_HSMCI_WRPROOF
 #    define HSMCU_PROOF_BITS HSMCI_MR_WRPROOF
 #  else
 #    define HSMCU_PROOF_BITS (0)
@@ -144,7 +147,7 @@
 #define HSMCI_STATUS_ERRORS \
   ( HSMCI_INT_UNRE  | HSMCI_INT_OVRE  | HSMCI_INT_BLKOVRE | HSMCI_INT_CSTOE | \
     HSMCI_INT_DTOE  | HSMCI_INT_DCRCE | HSMCI_INT_RTOE    | HSMCI_INT_RENDE | \
-    HSMCI_INT_RCRCE | HSMCI_INT_RDIRE | HSMCI_INT_RINDE )  
+    HSMCI_INT_RCRCE | HSMCI_INT_RDIRE | HSMCI_INT_RINDE )
 
 /* Response errors:
  *
@@ -158,10 +161,10 @@
 
 #define HSMCI_RESPONSE_ERRORS \
   ( HSMCI_INT_CSTOE | HSMCI_INT_RTOE  | HSMCI_INT_RENDE   | HSMCI_INT_RCRCE | \
-    HSMCI_INT_RDIRE | HSMCI_INT_RINDE ) 
+    HSMCI_INT_RDIRE | HSMCI_INT_RINDE )
 #define HSMCI_RESPONSE_NOCRC_ERRORS \
   ( HSMCI_INT_CSTOE | HSMCI_INT_RTOE  | HSMCI_INT_RENDE   | HSMCI_INT_RDIRE | \
-    HSMCI_INT_RINDE ) 
+    HSMCI_INT_RINDE )
 #define HSMCI_RESPONSE_TIMEOUT_ERRORS \
   ( HSMCI_INT_CSTOE | HSMCI_INT_RTOE  )
 
@@ -250,13 +253,13 @@
  * Private Types
  ****************************************************************************/
 
-/* This structure defines the state of the SAM3U HSMCI interface */
+/* This structure defines the state of the SAM3/4 HSMCI interface */
 
-struct sam3u_dev_s
+struct sam_dev_s
 {
   struct sdio_dev_s  dev;        /* Standard, base SDIO interface */
-  
-  /* SAM3U-specific extensions */
+
+  /* SAM3/4-specific extensions */
   /* Event support */
 
   sem_t              waitsem;    /* Implements event waiting */
@@ -287,7 +290,7 @@ struct sam3u_dev_s
 /* Register logging support */
 
 #if defined(CONFIG_HSMCI_XFRDEBUG) || defined(CONFIG_HSMCI_CMDDEBUG)
-struct sam3u_hsmciregs_s
+struct sam_hsmciregs_s
 {
   uint32_t mr;    /* Mode Register */
   uint32_t dtor;  /* Data Timeout Register */
@@ -309,11 +312,11 @@ struct sam3u_hsmciregs_s
 #endif
 
 #ifdef CONFIG_HSMCI_XFRDEBUG
-struct sam3u_xfrregs_s
+struct sam_xfrregs_s
 {
-  struct sam3u_hsmciregs_s hsmci;
+  struct sam_hsmciregs_s hsmci;
 #ifdef CONFIG_DEBUG_DMA
-  struct sam3u_dmaregs_s  dma;
+  struct sam_dmaregs_s  dma;
 #endif
 };
 #endif
@@ -324,147 +327,147 @@ struct sam3u_xfrregs_s
 
 /* Low-level helpers ********************************************************/
 
-static void sam3u_takesem(struct sam3u_dev_s *priv);
-#define     sam3u_givesem(priv) (sem_post(&priv->waitsem))
-static void sam3u_enablewaitints(struct sam3u_dev_s *priv, uint32_t waitmask,
+static void sam_takesem(struct sam_dev_s *priv);
+#define     sam_givesem(priv) (sem_post(&priv->waitsem))
+static void sam_enablewaitints(struct sam_dev_s *priv, uint32_t waitmask,
               sdio_eventset_t waitevents);
-static void sam3u_disablewaitints(struct sam3u_dev_s *priv, sdio_eventset_t wkupevents);
-static void sam3u_enablexfrints(struct sam3u_dev_s *priv, uint32_t xfrmask);
-static void sam3u_disablexfrints(struct sam3u_dev_s *priv);
-static inline void sam3u_disable(void);
-static inline void sam3u_enable(void);
+static void sam_disablewaitints(struct sam_dev_s *priv, sdio_eventset_t wkupevents);
+static void sam_enablexfrints(struct sam_dev_s *priv, uint32_t xfrmask);
+static void sam_disablexfrints(struct sam_dev_s *priv);
+static inline void sam_disable(void);
+static inline void sam_enable(void);
 
 /* Register Sampling ********************************************************/
 
 #if defined(CONFIG_HSMCI_XFRDEBUG) || defined(CONFIG_HSMCI_CMDDEBUG)
-static void sam3u_hsmcisample(struct sam3u_hsmciregs_s *regs);
-static void sam3u_hsmcidump(struct sam3u_hsmciregs_s *regs, const char *msg);
+static void sam_hsmcisample(struct sam_hsmciregs_s *regs);
+static void sam_hsmcidump(struct sam_hsmciregs_s *regs, const char *msg);
 #endif
 
 #ifdef CONFIG_HSMCI_XFRDEBUG
-static void sam3u_xfrsampleinit(void);
-static void sam3u_xfrsample(struct sam3u_dev_s *priv, int index);
-static void sam3u_xfrdumpone(struct sam3u_dev_s *priv,
-              struct sam3u_xfrregs_s *regs, const char *msg);
-static void sam3u_xfrdump(struct sam3u_dev_s *priv);
+static void sam_xfrsampleinit(void);
+static void sam_xfrsample(struct sam_dev_s *priv, int index);
+static void sam_xfrdumpone(struct sam_dev_s *priv,
+              struct sam_xfrregs_s *regs, const char *msg);
+static void sam_xfrdump(struct sam_dev_s *priv);
 #else
-#  define   sam3u_xfrsampleinit()
-#  define   sam3u_xfrsample(priv,index)
-#  define   sam3u_xfrdump(priv)
+#  define   sam_xfrsampleinit()
+#  define   sam_xfrsample(priv,index)
+#  define   sam_xfrdump(priv)
 #endif
 
 #ifdef CONFIG_HSMCI_CMDDEBUG
-static void sam3u_cmdsampleinit(void);
-static inline void sam3u_cmdsample1(int index3);
-static inline void sam3u_cmdsample2(int index, uint32_t sr);
-static void sam3u_cmddump(void);
+static void sam_cmdsampleinit(void);
+static inline void sam_cmdsample1(int index3);
+static inline void sam_cmdsample2(int index, uint32_t sr);
+static void sam_cmddump(void);
 #else
-#  define   sam3u_cmdsampleinit()
-#  define   sam3u_cmdsample1(index)
-#  define   sam3u_cmdsample2(index,sr)
-#  define   sam3u_cmddump()
+#  define   sam_cmdsampleinit()
+#  define   sam_cmdsample1(index)
+#  define   sam_cmdsample2(index,sr)
+#  define   sam_cmddump()
 #endif
 
 /* DMA Helpers **************************************************************/
 
-static void sam3u_dmacallback(DMA_HANDLE handle, void *arg, int result);
+static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result);
 
 /* Data Transfer Helpers ****************************************************/
 
-static void sam3u_eventtimeout(int argc, uint32_t arg);
-static void sam3u_endwait(struct sam3u_dev_s *priv, sdio_eventset_t wkupevent);
-static void sam3u_endtransfer(struct sam3u_dev_s *priv, sdio_eventset_t wkupevent);
-static void sam3u_notransfer(struct sam3u_dev_s *priv);
+static void sam_eventtimeout(int argc, uint32_t arg);
+static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent);
+static void sam_endtransfer(struct sam_dev_s *priv, sdio_eventset_t wkupevent);
+static void sam_notransfer(struct sam_dev_s *priv);
 
 /* Interrupt Handling *******************************************************/
 
-static int  sam3u_interrupt(int irq, void *context);
+static int  sam_interrupt(int irq, void *context);
 
 /* SDIO interface methods ***************************************************/
 
 /* Initialization/setup */
 
-static void sam3u_reset(FAR struct sdio_dev_s *dev);
-static uint8_t sam3u_status(FAR struct sdio_dev_s *dev);
-static void sam3u_widebus(FAR struct sdio_dev_s *dev, bool enable);
-static void sam3u_clock(FAR struct sdio_dev_s *dev,
+static void sam_reset(FAR struct sdio_dev_s *dev);
+static uint8_t sam_status(FAR struct sdio_dev_s *dev);
+static void sam_widebus(FAR struct sdio_dev_s *dev, bool enable);
+static void sam_clock(FAR struct sdio_dev_s *dev,
               enum sdio_clock_e rate);
-static int  sam3u_attach(FAR struct sdio_dev_s *dev);
+static int  sam_attach(FAR struct sdio_dev_s *dev);
 
 /* Command/Status/Data Transfer */
 
-static int  sam3u_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd,
+static int  sam_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd,
               uint32_t arg);
-static void sam3u_blocksetup(FAR struct sdio_dev_s *dev, unsigned int blocklen,
+static void sam_blocksetup(FAR struct sdio_dev_s *dev, unsigned int blocklen,
               unsigned int nblocks);
-static int  sam3u_cancel(FAR struct sdio_dev_s *dev);
-static int  sam3u_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd);
-static int  sam3u_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd,
+static int  sam_cancel(FAR struct sdio_dev_s *dev);
+static int  sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd);
+static int  sam_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd,
               uint32_t *rshort);
-static int  sam3u_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
+static int  sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
               uint32_t rlong[4]);
-static int  sam3u_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd,
+static int  sam_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd,
               uint32_t *rnotimpl);
 
 /* EVENT handler */
 
-static void sam3u_waitenable(FAR struct sdio_dev_s *dev,
+static void sam_waitenable(FAR struct sdio_dev_s *dev,
               sdio_eventset_t eventset);
 static sdio_eventset_t
-            sam3u_eventwait(FAR struct sdio_dev_s *dev, uint32_t timeout);
-static void sam3u_callbackenable(FAR struct sdio_dev_s *dev,
+            sam_eventwait(FAR struct sdio_dev_s *dev, uint32_t timeout);
+static void sam_callbackenable(FAR struct sdio_dev_s *dev,
               sdio_eventset_t eventset);
-static int  sam3u_registercallback(FAR struct sdio_dev_s *dev,
+static int  sam_registercallback(FAR struct sdio_dev_s *dev,
               worker_t callback, void *arg);
 
 /* DMA */
 
 #ifdef CONFIG_SDIO_DMA
-static bool sam3u_dmasupported(FAR struct sdio_dev_s *dev);
+static bool sam_dmasupported(FAR struct sdio_dev_s *dev);
 #endif
-static int  sam3u_dmarecvsetup(FAR struct sdio_dev_s *dev,
+static int  sam_dmarecvsetup(FAR struct sdio_dev_s *dev,
               FAR uint8_t *buffer, size_t buflen);
-static int  sam3u_dmasendsetup(FAR struct sdio_dev_s *dev,
+static int  sam_dmasendsetup(FAR struct sdio_dev_s *dev,
               FAR const uint8_t *buffer, size_t buflen);
 
 /* Initialization/uninitialization/reset ************************************/
 
-static void sam3u_callback(void *arg);
+static void sam_callback(void *arg);
 
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
-struct sam3u_dev_s g_sdiodev =
+struct sam_dev_s g_sdiodev =
 {
   .dev =
   {
-    .reset            = sam3u_reset,
-    .status           = sam3u_status,
-    .widebus          = sam3u_widebus,
-    .clock            = sam3u_clock,
-    .attach           = sam3u_attach,
-    .sendcmd          = sam3u_sendcmd,
-    .blocksetup       = sam3u_blocksetup,
-    .recvsetup        = sam3u_dmarecvsetup,
-    .sendsetup        = sam3u_dmasendsetup,
-    .cancel           = sam3u_cancel,
-    .waitresponse     = sam3u_waitresponse,
-    .recvR1           = sam3u_recvshort,
-    .recvR2           = sam3u_recvlong,
-    .recvR3           = sam3u_recvshort,
-    .recvR4           = sam3u_recvnotimpl,
-    .recvR5           = sam3u_recvnotimpl,
-    .recvR6           = sam3u_recvshort,
-    .recvR7           = sam3u_recvshort,
-    .waitenable       = sam3u_waitenable,
-    .eventwait        = sam3u_eventwait,
-    .callbackenable   = sam3u_callbackenable,
-    .registercallback = sam3u_registercallback,
+    .reset            = sam_reset,
+    .status           = sam_status,
+    .widebus          = sam_widebus,
+    .clock            = sam_clock,
+    .attach           = sam_attach,
+    .sendcmd          = sam_sendcmd,
+    .blocksetup       = sam_blocksetup,
+    .recvsetup        = sam_dmarecvsetup,
+    .sendsetup        = sam_dmasendsetup,
+    .cancel           = sam_cancel,
+    .waitresponse     = sam_waitresponse,
+    .recvR1           = sam_recvshort,
+    .recvR2           = sam_recvlong,
+    .recvR3           = sam_recvshort,
+    .recvR4           = sam_recvnotimpl,
+    .recvR5           = sam_recvnotimpl,
+    .recvR6           = sam_recvshort,
+    .recvR7           = sam_recvshort,
+    .waitenable       = sam_waitenable,
+    .eventwait        = sam_eventwait,
+    .callbackenable   = sam_callbackenable,
+    .registercallback = sam_registercallback,
 #ifdef CONFIG_SDIO_DMA
-    .dmasupported     = sam3u_dmasupported,
-    .dmarecvsetup     = sam3u_dmarecvsetup,
-    .dmasendsetup     = sam3u_dmasendsetup,
+    .dmasupported     = sam_dmasupported,
+    .dmarecvsetup     = sam_dmarecvsetup,
+    .dmasendsetup     = sam_dmasendsetup,
 #endif
   },
 };
@@ -472,10 +475,10 @@ struct sam3u_dev_s g_sdiodev =
 /* Register logging support */
 
 #ifdef CONFIG_HSMCI_XFRDEBUG
-static struct sam3u_xfrregs_s   g_xfrsamples[DEBUG_NDMASAMPLES];
+static struct sam_xfrregs_s   g_xfrsamples[DEBUG_NDMASAMPLES];
 #endif
 #ifdef CONFIG_HSMCI_CMDDEBUG
-static struct sam3u_hsmciregs_s g_cmdsamples[DEBUG_NCMDSAMPLES];
+static struct sam_hsmciregs_s g_cmdsamples[DEBUG_NCMDSAMPLES];
 #endif
 #if defined(CONFIG_HSMCI_XFRDEBUG) && defined(CONFIG_HSMCI_CMDDEBUG)
 static bool                     g_xfrinitialized;
@@ -490,7 +493,7 @@ static bool                     g_cmdinitialized;
  * Low-level Helpers
  ****************************************************************************/
 /****************************************************************************
- * Name: sam3u_takesem
+ * Name: sam_takesem
  *
  * Description:
  *   Take the wait semaphore (handling false alarm wakeups due to the receipt
@@ -504,7 +507,7 @@ static bool                     g_cmdinitialized;
  *
  ****************************************************************************/
 
-static void sam3u_takesem(struct sam3u_dev_s *priv)
+static void sam_takesem(struct sam_dev_s *priv)
 {
   /* Take the semaphore (perhaps waiting) */
 
@@ -519,7 +522,7 @@ static void sam3u_takesem(struct sam3u_dev_s *priv)
 }
 
 /****************************************************************************
- * Name: sam3u_enablewaitints
+ * Name: sam_enablewaitints
  *
  * Description:
  *   Enable HSMCI interrupts needed to suport the wait function
@@ -534,8 +537,8 @@ static void sam3u_takesem(struct sam3u_dev_s *priv)
  *
  ****************************************************************************/
 
-static void sam3u_enablewaitints(struct sam3u_dev_s *priv, uint32_t waitmask,
-                                 sdio_eventset_t waitevents)
+static void sam_enablewaitints(struct sam_dev_s *priv, uint32_t waitmask,
+                               sdio_eventset_t waitevents)
 {
   irqstate_t flags;
 
@@ -547,12 +550,12 @@ static void sam3u_enablewaitints(struct sam3u_dev_s *priv, uint32_t waitmask,
   priv->waitevents = waitevents;
   priv->wkupevent  = 0;
   priv->waitmask   = waitmask;
-  putreg32(priv->xfrmask | priv->waitmask, SAM3U_HSMCI_IER);
+  putreg32(priv->xfrmask | priv->waitmask, SAM_HSMCI_IER);
   irqrestore(flags);
 }
 
 /****************************************************************************
- * Name: sam3u_disablewaitints
+ * Name: sam_disablewaitints
  *
  * Description:
  *   Disable HSMCI interrupts and save wakeup event.  Called
@@ -566,8 +569,8 @@ static void sam3u_enablewaitints(struct sam3u_dev_s *priv, uint32_t waitmask,
  *
  ****************************************************************************/
 
-static void sam3u_disablewaitints(struct sam3u_dev_s *priv,
-                                  sdio_eventset_t wkupevent)
+static void sam_disablewaitints(struct sam_dev_s *priv,
+                                sdio_eventset_t wkupevent)
 {
   irqstate_t flags;
 
@@ -579,12 +582,12 @@ static void sam3u_disablewaitints(struct sam3u_dev_s *priv,
   priv->waitevents = 0;
   priv->wkupevent  = wkupevent;
   priv->waitmask   = 0;
-  putreg32(~priv->xfrmask, SAM3U_HSMCI_IDR);
+  putreg32(~priv->xfrmask, SAM_HSMCI_IDR);
   irqrestore(flags);
 }
 
 /****************************************************************************
- * Name: sam3u_enablexfrints
+ * Name: sam_enablexfrints
  *
  * Description:
  *   Enable HSMCI interrupts needed to support the data transfer event
@@ -598,16 +601,16 @@ static void sam3u_disablewaitints(struct sam3u_dev_s *priv,
  *
  ****************************************************************************/
 
-static void sam3u_enablexfrints(struct sam3u_dev_s *priv, uint32_t xfrmask)
+static void sam_enablexfrints(struct sam_dev_s *priv, uint32_t xfrmask)
 {
   irqstate_t flags = irqsave();
   priv->xfrmask = xfrmask;
-  putreg32(priv->xfrmask | priv->waitmask, SAM3U_HSMCI_IER);
+  putreg32(priv->xfrmask | priv->waitmask, SAM_HSMCI_IER);
   irqrestore(flags);
 }
 
 /****************************************************************************
- * Name: sam3u_disablexfrints
+ * Name: sam_disablexfrints
  *
  * Description:
  *   Disable HSMCI interrupts needed to support the data transfer event
@@ -621,54 +624,54 @@ static void sam3u_enablexfrints(struct sam3u_dev_s *priv, uint32_t xfrmask)
  *
  ****************************************************************************/
 
-static void sam3u_disablexfrints(struct sam3u_dev_s *priv)
+static void sam_disablexfrints(struct sam_dev_s *priv)
 {
   irqstate_t flags = irqsave();
   priv->xfrmask = 0;
-  putreg32(~priv->waitmask, SAM3U_HSMCI_IDR);
+  putreg32(~priv->waitmask, SAM_HSMCI_IDR);
   irqrestore(flags);
 }
 
 /****************************************************************************
- * Name: sam3u_disable
+ * Name: sam_disable
  *
  * Description:
  *   Disable the HSMCI
  *
  ****************************************************************************/
 
-static inline void sam3u_disable(void) 
+static inline void sam_disable(void)
 {
   /* Disable the MCI peripheral clock */
 
-  putreg32((1 << SAM3U_PID_HSMCI), SAM3U_PMC_PCDR);
-  
+  putreg32((1 << SAM_PID_HSMCI), SAM_PMC_PCDR);
+
   /* Disable the MCI */
 
-  putreg32(HSMCI_CR_MCIDIS, SAM3U_HSMCI_CR);
+  putreg32(HSMCI_CR_MCIDIS, SAM_HSMCI_CR);
 
   /* Disable all the interrupts */
 
-  putreg32(0xffffffff, SAM3U_HSMCI_IDR);
+  putreg32(0xffffffff, SAM_HSMCI_IDR);
 }
 
 /****************************************************************************
- * Name: sam3u_enable
+ * Name: sam_enable
  *
  * Description:
  *   Enable the HSMCI
  *
  ****************************************************************************/
 
-static inline void sam3u_enable(void)
+static inline void sam_enable(void)
 {
   /* Enable the MCI peripheral clock */
 
-  putreg32((1 << SAM3U_PID_HSMCI), SAM3U_PMC_PCER);
+  putreg32((1 << SAM_PID_HSMCI), SAM_PMC_PCER);
 
   /* Enable the MCI and the Power Saving */
 
-  putreg32(HSMCI_CR_MCIEN, SAM3U_HSMCI_CR);
+  putreg32(HSMCI_CR_MCIEN, SAM_HSMCI_CR);
 }
 
 /****************************************************************************
@@ -676,7 +679,7 @@ static inline void sam3u_enable(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_hsmcisample
+ * Name: sam_hsmcisample
  *
  * Description:
  *   Sample HSMCI registers
@@ -684,29 +687,29 @@ static inline void sam3u_enable(void)
  ****************************************************************************/
 
 #if defined(CONFIG_HSMCI_XFRDEBUG) || defined(CONFIG_HSMCI_CMDDEBUG)
-static void sam3u_hsmcisample(struct sam3u_hsmciregs_s *regs)
+static void sam_hsmcisample(struct sam_hsmciregs_s *regs)
 {
-  regs->mr    = getreg32(SAM3U_HSMCI_MR);
-  regs->dtor  = getreg32(SAM3U_HSMCI_DTOR);
-  regs->sdcr  = getreg32(SAM3U_HSMCI_SDCR);
-  regs->argr  = getreg32(SAM3U_HSMCI_ARGR);
-  regs->blkr  = getreg32(SAM3U_HSMCI_BLKR);
-  regs->cstor = getreg32(SAM3U_HSMCI_CSTOR);
-  regs->rsp0  = getreg32(SAM3U_HSMCI_RSPR0);
-  regs->rsp1  = getreg32(SAM3U_HSMCI_RSPR1);
-  regs->rsp2  = getreg32(SAM3U_HSMCI_RSPR2);
-  regs->rsp3  = getreg32(SAM3U_HSMCI_RSPR3);
-  regs->sr    = getreg32(SAM3U_HSMCI_SR);
-  regs->imr   = getreg32(SAM3U_HSMCI_IMR);
-  regs->dma   = getreg32(SAM3U_HSMCI_DMA);
-  regs->cfg   = getreg32(SAM3U_HSMCI_CFG);
-  regs->wpmr  = getreg32(SAM3U_HSMCI_WPMR);
-  regs->wpsr  = getreg32(SAM3U_HSMCI_WPSR);
+  regs->mr    = getreg32(SAM_HSMCI_MR);
+  regs->dtor  = getreg32(SAM_HSMCI_DTOR);
+  regs->sdcr  = getreg32(SAM_HSMCI_SDCR);
+  regs->argr  = getreg32(SAM_HSMCI_ARGR);
+  regs->blkr  = getreg32(SAM_HSMCI_BLKR);
+  regs->cstor = getreg32(SAM_HSMCI_CSTOR);
+  regs->rsp0  = getreg32(SAM_HSMCI_RSPR0);
+  regs->rsp1  = getreg32(SAM_HSMCI_RSPR1);
+  regs->rsp2  = getreg32(SAM_HSMCI_RSPR2);
+  regs->rsp3  = getreg32(SAM_HSMCI_RSPR3);
+  regs->sr    = getreg32(SAM_HSMCI_SR);
+  regs->imr   = getreg32(SAM_HSMCI_IMR);
+  regs->dma   = getreg32(SAM_HSMCI_DMA);
+  regs->cfg   = getreg32(SAM_HSMCI_CFG);
+  regs->wpmr  = getreg32(SAM_HSMCI_WPMR);
+  regs->wpsr  = getreg32(SAM_HSMCI_WPSR);
 }
 #endif
 
 /****************************************************************************
- * Name: sam3u_hsmcidump
+ * Name: sam_hsmcidump
  *
  * Description:
  *   Dump one register sample
@@ -714,30 +717,30 @@ static void sam3u_hsmcisample(struct sam3u_hsmciregs_s *regs)
  ****************************************************************************/
 
 #if defined(CONFIG_HSMCI_XFRDEBUG) || defined(CONFIG_HSMCI_CMDDEBUG)
-static void sam3u_hsmcidump(struct sam3u_hsmciregs_s *regs, const char *msg)
+static void sam_hsmcidump(struct sam_hsmciregs_s *regs, const char *msg)
 {
   fdbg("HSMCI Registers: %s\n", msg);
-  fdbg("     MR[%08x]: %08x\n", SAM3U_HSMCI_MR,    regs->mr);
-  fdbg("   DTOR[%08x]: %08x\n", SAM3U_HSMCI_DTOR,  regs->dtor);
-  fdbg("   SDCR[%08x]: %08x\n", SAM3U_HSMCI_SDCR,  regs->sdcr);
-  fdbg("   ARGR[%08x]: %08x\n", SAM3U_HSMCI_ARGR,  regs->argr);
-  fdbg("   BLKR[%08x]: %08x\n", SAM3U_HSMCI_BLKR,  regs->blkr);
-  fdbg("  CSTOR[%08x]: %08x\n", SAM3U_HSMCI_CSTOR, regs->cstor);
-  fdbg("  RSPR0[%08x]: %08x\n", SAM3U_HSMCI_RSPR0, regs->rsp0);
-  fdbg("  RSPR1[%08x]: %08x\n", SAM3U_HSMCI_RSPR1, regs->rsp1);
-  fdbg("  RSPR2[%08x]: %08x\n", SAM3U_HSMCI_RSPR2, regs->rsp2);
-  fdbg("  RSPR3[%08x]: %08x\n", SAM3U_HSMCI_RSPR3, regs->rsp3);
-  fdbg("     SR[%08x]: %08x\n", SAM3U_HSMCI_SR,    regs->sr);
-  fdbg("    IMR[%08x]: %08x\n", SAM3U_HSMCI_IMR,   regs->imr);
-  fdbg("    DMA[%08x]: %08x\n", SAM3U_HSMCI_DMA,   regs->dma);
-  fdbg("    CFG[%08x]: %08x\n", SAM3U_HSMCI_CFG,   regs->cfg);
-  fdbg("   WPMR[%08x]: %08x\n", SAM3U_HSMCI_WPMR,  regs->wpmr);
-  fdbg("   WPSR[%08x]: %08x\n", SAM3U_HSMCI_WPSR,  regs->wpsr);
+  fdbg("     MR[%08x]: %08x\n", SAM_HSMCI_MR,    regs->mr);
+  fdbg("   DTOR[%08x]: %08x\n", SAM_HSMCI_DTOR,  regs->dtor);
+  fdbg("   SDCR[%08x]: %08x\n", SAM_HSMCI_SDCR,  regs->sdcr);
+  fdbg("   ARGR[%08x]: %08x\n", SAM_HSMCI_ARGR,  regs->argr);
+  fdbg("   BLKR[%08x]: %08x\n", SAM_HSMCI_BLKR,  regs->blkr);
+  fdbg("  CSTOR[%08x]: %08x\n", SAM_HSMCI_CSTOR, regs->cstor);
+  fdbg("  RSPR0[%08x]: %08x\n", SAM_HSMCI_RSPR0, regs->rsp0);
+  fdbg("  RSPR1[%08x]: %08x\n", SAM_HSMCI_RSPR1, regs->rsp1);
+  fdbg("  RSPR2[%08x]: %08x\n", SAM_HSMCI_RSPR2, regs->rsp2);
+  fdbg("  RSPR3[%08x]: %08x\n", SAM_HSMCI_RSPR3, regs->rsp3);
+  fdbg("     SR[%08x]: %08x\n", SAM_HSMCI_SR,    regs->sr);
+  fdbg("    IMR[%08x]: %08x\n", SAM_HSMCI_IMR,   regs->imr);
+  fdbg("    DMA[%08x]: %08x\n", SAM_HSMCI_DMA,   regs->dma);
+  fdbg("    CFG[%08x]: %08x\n", SAM_HSMCI_CFG,   regs->cfg);
+  fdbg("   WPMR[%08x]: %08x\n", SAM_HSMCI_WPMR,  regs->wpmr);
+  fdbg("   WPSR[%08x]: %08x\n", SAM_HSMCI_WPSR,  regs->wpsr);
 }
 #endif
 
 /****************************************************************************
- * Name: sam3u_xfrsample
+ * Name: sam_xfrsample
  *
  * Description:
  *   Sample HSMCI/DMA registers
@@ -745,18 +748,18 @@ static void sam3u_hsmcidump(struct sam3u_hsmciregs_s *regs, const char *msg)
  ****************************************************************************/
 
 #ifdef CONFIG_HSMCI_XFRDEBUG
-static void sam3u_xfrsample(struct sam3u_dev_s *priv, int index)
+static void sam_xfrsample(struct sam_dev_s *priv, int index)
 {
-  struct sam3u_xfrregs_s *regs = &g_xfrsamples[index];
+  struct sam_xfrregs_s *regs = &g_xfrsamples[index];
 #ifdef CONFIG_DEBUG_DMA
-  sam3u_dmasample(priv->dma, &regs->dma);
+  sam_dmasample(priv->dma, &regs->dma);
 #endif
-  sam3u_hsmcisample(&regs->hsmci);
+  sam_hsmcisample(&regs->hsmci);
 }
 #endif
 
 /****************************************************************************
- * Name: sam3u_xfrsampleinit
+ * Name: sam_xfrsampleinit
  *
  * Description:
  *   Setup prior to collecting transfer samples
@@ -764,9 +767,9 @@ static void sam3u_xfrsample(struct sam3u_dev_s *priv, int index)
  ****************************************************************************/
 
 #ifdef CONFIG_HSMCI_XFRDEBUG
-static void sam3u_xfrsampleinit(void)
+static void sam_xfrsampleinit(void)
 {
-  memset(g_xfrsamples, 0xff, DEBUG_NDMASAMPLES * sizeof(struct sam3u_xfrregs_s));
+  memset(g_xfrsamples, 0xff, DEBUG_NDMASAMPLES * sizeof(struct sam_xfrregs_s));
 #ifdef CONFIG_HSMCI_CMDDEBUG
   g_xfrinitialized = true;
 #endif
@@ -774,7 +777,7 @@ static void sam3u_xfrsampleinit(void)
 #endif
 
 /****************************************************************************
- * Name: sam3u_xfrdumpone
+ * Name: sam_xfrdumpone
  *
  * Description:
  *   Dump one transfer register sample
@@ -782,18 +785,18 @@ static void sam3u_xfrsampleinit(void)
  ****************************************************************************/
 
 #ifdef CONFIG_HSMCI_XFRDEBUG
-static void sam3u_xfrdumpone(struct sam3u_dev_s *priv,
-                             struct sam3u_xfrregs_s *regs, const char *msg)
+static void sam_xfrdumpone(struct sam_dev_s *priv,
+                           struct sam_xfrregs_s *regs, const char *msg)
 {
 #ifdef CONFIG_DEBUG_DMA
-  sam3u_dmadump(priv->dma, &regs->dma, msg);
+  sam_dmadump(priv->dma, &regs->dma, msg);
 #endif
-  sam3u_hsmcidump(&regs->hsmci, msg);
+  sam_hsmcidump(&regs->hsmci, msg);
 }
 #endif
 
 /****************************************************************************
- * Name: sam3u_xfrdump
+ * Name: sam_xfrdump
  *
  * Description:
  *   Dump all transfer-related, sampled register data
@@ -801,20 +804,20 @@ static void sam3u_xfrdumpone(struct sam3u_dev_s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_HSMCI_XFRDEBUG
-static void  sam3u_xfrdump(struct sam3u_dev_s *priv)
+static void  sam_xfrdump(struct sam_dev_s *priv)
 {
 #ifdef CONFIG_HSMCI_CMDDEBUG
   if (g_xfrinitialized)
 #endif
     {
-      sam3u_xfrdumpone(priv, &g_xfrsamples[SAMPLENDX_BEFORE_SETUP], "Before setup");
+      sam_xfrdumpone(priv, &g_xfrsamples[SAMPLENDX_BEFORE_SETUP], "Before setup");
 #ifdef CONFIG_DEBUG_DMA
-      sam3u_xfrdumpone(priv, &g_xfrsamples[SAMPLENDX_BEFORE_ENABLE], "Before DMA enable");
+      sam_xfrdumpone(priv, &g_xfrsamples[SAMPLENDX_BEFORE_ENABLE], "Before DMA enable");
 #endif
-      sam3u_xfrdumpone(priv, &g_xfrsamples[SAMPLENDX_AFTER_SETUP], "After setup");
-      sam3u_xfrdumpone(priv, &g_xfrsamples[SAMPLENDX_END_TRANSFER], "End of transfer");
+      sam_xfrdumpone(priv, &g_xfrsamples[SAMPLENDX_AFTER_SETUP], "After setup");
+      sam_xfrdumpone(priv, &g_xfrsamples[SAMPLENDX_END_TRANSFER], "End of transfer");
 #ifdef CONFIG_DEBUG_DMA
-      sam3u_xfrdumpone(priv, &g_xfrsamples[SAMPLENDX_DMA_CALLBACK], "DMA Callback");
+      sam_xfrdumpone(priv, &g_xfrsamples[SAMPLENDX_DMA_CALLBACK], "DMA Callback");
 #endif
 #ifdef CONFIG_HSMCI_CMDDEBUG
       g_xfrinitialized = false;
@@ -824,7 +827,7 @@ static void  sam3u_xfrdump(struct sam3u_dev_s *priv)
 #endif
 
 /****************************************************************************
- * Name: sam3u_cmdsampleinit
+ * Name: sam_cmdsampleinit
  *
  * Description:
  *   Setup prior to collecting command/response samples
@@ -832,9 +835,9 @@ static void  sam3u_xfrdump(struct sam3u_dev_s *priv)
  ****************************************************************************/
 
 #ifdef CONFIG_HSMCI_CMDDEBUG
-static void sam3u_cmdsampleinit(void)
+static void sam_cmdsampleinit(void)
 {
-  memset(g_cmdsamples, 0xff, DEBUG_NCMDSAMPLES * sizeof(struct sam3u_hsmciregs_s));
+  memset(g_cmdsamples, 0xff, DEBUG_NCMDSAMPLES * sizeof(struct sam_hsmciregs_s));
 #ifdef CONFIG_HSMCI_XFRDEBUG
   g_cmdinitialized = true;
 #endif
@@ -842,7 +845,7 @@ static void sam3u_cmdsampleinit(void)
 #endif
 
 /****************************************************************************
- * Name: sam3u_cmdsample1 & 2
+ * Name: sam_cmdsample1 & 2
  *
  * Description:
  *   Sample command/response registers
@@ -850,20 +853,20 @@ static void sam3u_cmdsampleinit(void)
  ****************************************************************************/
 
 #ifdef CONFIG_HSMCI_CMDDEBUG
-static inline void sam3u_cmdsample1(int index)
+static inline void sam_cmdsample1(int index)
 {
-  sam3u_hsmcisample(&g_cmdsamples[index]);
+  sam_hsmcisample(&g_cmdsamples[index]);
 }
 
-static inline void sam3u_cmdsample2(int index, uint32_t sr)
+static inline void sam_cmdsample2(int index, uint32_t sr)
 {
-  sam3u_hsmcisample(&g_cmdsamples[index]);
+  sam_hsmcisample(&g_cmdsamples[index]);
   g_cmdsamples[index].sr = sr;
 }
 #endif
 
 /****************************************************************************
- * Name: sam3u_cmddump
+ * Name: sam_cmddump
  *
  * Description:
  *   Dump all comand/response register data
@@ -871,14 +874,14 @@ static inline void sam3u_cmdsample2(int index, uint32_t sr)
  ****************************************************************************/
 
 #ifdef CONFIG_HSMCI_CMDDEBUG
-static void sam3u_cmddump(void)
+static void sam_cmddump(void)
 {
 #ifdef CONFIG_HSMCI_XFRDEBUG
   if (g_cmdinitialized)
 #endif
     {
-      sam3u_hsmcidump(&g_cmdsamples[SAMPLENDX_AFTER_CMDR], "After command setup");
-      sam3u_hsmcidump(&g_cmdsamples[SAMPLENDX_AT_WAKEUP],  "After wakeup");
+      sam_hsmcidump(&g_cmdsamples[SAMPLENDX_AFTER_CMDR], "After command setup");
+      sam_hsmcidump(&g_cmdsamples[SAMPLENDX_AT_WAKEUP],  "After wakeup");
 #ifdef CONFIG_HSMCI_XFRDEBUG
       g_cmdinitialized = false;
 #endif
@@ -891,20 +894,20 @@ static void sam3u_cmddump(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_dmacallback
+ * Name: sam_dmacallback
  *
  * Description:
  *   Called when HSMCI DMA completes
  *
  ****************************************************************************/
 
-static void sam3u_dmacallback(DMA_HANDLE handle, void *arg, int result)
+static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result)
 {
   /* We don't really do anything at the completion of DMA.  The termination
    * of the transfer is driven by the HSMCI interrupts.
    */
 
-  sam3u_xfrsample((struct sam3u_dev_s*)arg, SAMPLENDX_DMA_CALLBACK);
+  sam_xfrsample((struct sam_dev_s*)arg, SAMPLENDX_DMA_CALLBACK);
 }
 
 /****************************************************************************
@@ -912,7 +915,7 @@ static void sam3u_dmacallback(DMA_HANDLE handle, void *arg, int result)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_eventtimeout
+ * Name: sam_eventtimeout
  *
  * Description:
  *   The watchdog timeout setup when the event wait start has expired without
@@ -930,9 +933,9 @@ static void sam3u_dmacallback(DMA_HANDLE handle, void *arg, int result)
  *
  ****************************************************************************/
 
-static void sam3u_eventtimeout(int argc, uint32_t arg)
+static void sam_eventtimeout(int argc, uint32_t arg)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s *)arg;
+  struct sam_dev_s *priv = (struct sam_dev_s *)arg;
 
   DEBUGASSERT(argc == 1 && priv != NULL);
   DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) != 0);
@@ -943,13 +946,13 @@ static void sam3u_eventtimeout(int argc, uint32_t arg)
     {
       /* Yes.. wake up any waiting threads */
 
-      sam3u_endwait(priv, SDIOWAIT_TIMEOUT);
+      sam_endwait(priv, SDIOWAIT_TIMEOUT);
       flldbg("Timeout\n");
     }
 }
 
 /****************************************************************************
- * Name: sam3u_endwait
+ * Name: sam_endwait
  *
  * Description:
  *   Wake up a waiting thread if the waited-for event has occurred.
@@ -966,7 +969,7 @@ static void sam3u_eventtimeout(int argc, uint32_t arg)
  *
  ****************************************************************************/
 
-static void sam3u_endwait(struct sam3u_dev_s *priv, sdio_eventset_t wkupevent)
+static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent)
 {
   /* Cancel the watchdog timeout */
 
@@ -974,15 +977,15 @@ static void sam3u_endwait(struct sam3u_dev_s *priv, sdio_eventset_t wkupevent)
 
   /* Disable event-related interrupts and save wakeup event */
 
-  sam3u_disablewaitints(priv, wkupevent);
+  sam_disablewaitints(priv, wkupevent);
 
   /* Wake up the waiting thread */
 
-  sam3u_givesem(priv);
+  sam_givesem(priv);
 }
 
 /****************************************************************************
- * Name: sam3u_endtransfer
+ * Name: sam_endtransfer
  *
  * Description:
  *   Terminate a transfer with the provided status.  This function is called
@@ -1001,47 +1004,48 @@ static void sam3u_endwait(struct sam3u_dev_s *priv, sdio_eventset_t wkupevent)
  *
  ****************************************************************************/
 
-static void sam3u_endtransfer(struct sam3u_dev_s *priv, sdio_eventset_t wkupevent)
+static void sam_endtransfer(struct sam_dev_s *priv,
+                            sdio_eventset_t wkupevent)
 {
   /* Disable all transfer related interrupts */
 
-  sam3u_disablexfrints(priv);
+  sam_disablexfrints(priv);
 
   /* No data transfer */
 
-  sam3u_notransfer(priv);
+  sam_notransfer(priv);
 
   /* DMA debug instrumentation */
 
-  sam3u_xfrsample(priv, SAMPLENDX_END_TRANSFER);
+  sam_xfrsample(priv, SAMPLENDX_END_TRANSFER);
 
   /* Make sure that the DMA is stopped (it will be stopped automatically
    * on normal transfers, but not necessarily when the transfer terminates
    * on an error condition.
    */
 
-  sam3u_dmastop(priv->dma);
+  sam_dmastop(priv->dma);
 
   /* Disable the DMA handshaking */
 
-  putreg32(0, SAM3U_HSMCI_DMA);
-  
+  putreg32(0, SAM_HSMCI_DMA);
+
   /* Is a thread wait for these data transfer complete events? */
 
   if ((priv->waitevents & wkupevent) != 0)
     {
       /* Yes.. wake up any waiting threads */
 
-      sam3u_endwait(priv, wkupevent);
+      sam_endwait(priv, wkupevent);
     }
 }
 
 /****************************************************************************
- * Name: sam3u_notransfer
+ * Name: sam_notransfer
  *
  * Description:
  *   Setup for no transfer.  This is the default setup that is overriddden
- *   by sam3u_dmarecvsetup or sam3u_dmasendsetup
+ *   by sam_dmarecvsetup or sam_dmasendsetup
  *
  * Input Parameters:
  *   priv   - An instance of the HSMCI device interface
@@ -1051,11 +1055,11 @@ static void sam3u_endtransfer(struct sam3u_dev_s *priv, sdio_eventset_t wkupeven
  *
  ****************************************************************************/
 
-static void sam3u_notransfer(struct sam3u_dev_s *priv)
+static void sam_notransfer(struct sam_dev_s *priv)
 {
-  uint32_t regval = getreg32(SAM3U_HSMCI_MR);
+  uint32_t regval = getreg32(SAM_HSMCI_MR);
   regval &= ~(HSMCI_MR_RDPROOF | HSMCI_MR_WRPROOF | HSMCI_MR_BLKLEN_MASK);
-  putreg32(regval, SAM3U_HSMCI_MR);
+  putreg32(regval, SAM_HSMCI_MR);
 }
 
 /****************************************************************************
@@ -1063,7 +1067,7 @@ static void sam3u_notransfer(struct sam3u_dev_s *priv)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_interrupt
+ * Name: sam_interrupt
  *
  * Description:
  *   HSMCI interrupt handler
@@ -1077,9 +1081,9 @@ static void sam3u_notransfer(struct sam3u_dev_s *priv)
  *
  ****************************************************************************/
 
-static int sam3u_interrupt(int irq, void *context)
+static int sam_interrupt(int irq, void *context)
 {
-  struct sam3u_dev_s *priv = &g_sdiodev;
+  struct sam_dev_s *priv = &g_sdiodev;
   uint32_t sr;
   uint32_t enabled;
   uint32_t pending;
@@ -1094,8 +1098,8 @@ static int sam3u_interrupt(int irq, void *context)
        * there are non-zero bits remaining, then we have work to do here.
        */
 
-      sr      = getreg32(SAM3U_HSMCI_SR);
-      enabled = sr & getreg32(SAM3U_HSMCI_IMR);
+      sr      = getreg32(SAM_HSMCI_SR);
+      enabled = sr & getreg32(SAM_HSMCI_IMR);
       if (enabled == 0)
         {
           break;
@@ -1118,20 +1122,20 @@ static int sam3u_interrupt(int irq, void *context)
                 {
                   /* Yes.. Terminate with a timeout. */
 
-                  sam3u_endtransfer(priv, SDIOWAIT_TRANSFERDONE|SDIOWAIT_TIMEOUT);          
+                  sam_endtransfer(priv, SDIOWAIT_TRANSFERDONE|SDIOWAIT_TIMEOUT);
                 }
               else
                 {
                   /* No..  Terminate with an I/O error. */
 
-                  sam3u_endtransfer(priv, SDIOWAIT_TRANSFERDONE|SDIOWAIT_ERROR);
+                  sam_endtransfer(priv, SDIOWAIT_TRANSFERDONE|SDIOWAIT_ERROR);
                 }
             }
           else
             {
               /* No.. Then the transfer must have completed successfully */
 
-              sam3u_endtransfer(priv, SDIOWAIT_TRANSFERDONE);
+              sam_endtransfer(priv, SDIOWAIT_TRANSFERDONE);
             }
         }
 
@@ -1147,7 +1151,7 @@ static int sam3u_interrupt(int irq, void *context)
 
           if ((pending & priv->cmdrmask) != 0)
             {
-              sam3u_cmdsample2(SAMPLENDX_AT_WAKEUP, sr);
+              sam_cmdsample2(SAMPLENDX_AT_WAKEUP, sr);
 
               /* Yes.. Did the Command-Response sequence end with an error? */
 
@@ -1177,7 +1181,7 @@ static int sam3u_interrupt(int irq, void *context)
 
                       wkupevent = SDIOWAIT_CMDDONE|SDIOWAIT_RESPONSEDONE;
                 }
- 
+
              /* Yes.. Is there a thread waiting for this event set? */
 
              wkupevent &= priv->waitevents;
@@ -1185,7 +1189,7 @@ static int sam3u_interrupt(int irq, void *context)
                 {
                   /* Yes.. wake the thread up */
 
-                  sam3u_endwait(priv, wkupevent);
+                  sam_endwait(priv, wkupevent);
                 }
             }
         }
@@ -1198,7 +1202,7 @@ static int sam3u_interrupt(int irq, void *context)
  * SDIO Interface Methods
  ****************************************************************************/
 /****************************************************************************
- * Name: sam3u_reset
+ * Name: sam_reset
  *
  * Description:
  *   Reset the HSMCI controller.  Undo all setup and initialization.
@@ -1211,56 +1215,56 @@ static int sam3u_interrupt(int irq, void *context)
  *
  ****************************************************************************/
 
-static void sam3u_reset(FAR struct sdio_dev_s *dev)
+static void sam_reset(FAR struct sdio_dev_s *dev)
 {
-  FAR struct sam3u_dev_s *priv = (FAR struct sam3u_dev_s *)dev;
+  FAR struct sam_dev_s *priv = (FAR struct sam_dev_s *)dev;
   irqstate_t flags;
 
   /* Enable the MCI clock */
 
   flags = irqsave();
-  putreg32((1 << SAM3U_PID_HSMCI), SAM3U_PMC_PCER);
-  fdbg("PCSR: %08x\n", getreg32(SAM3U_PMC_PCSR));
-  
+  putreg32((1 << SAM_PID_HSMCI), SAM_PMC_PCER);
+  fdbg("PCSR: %08x\n", getreg32(SAM_PMC_PCSR));
+
   /* Reset the MCI */
 
-  putreg32(HSMCI_CR_SWRST, SAM3U_HSMCI_CR);
-  
+  putreg32(HSMCI_CR_SWRST, SAM_HSMCI_CR);
+
   /* Disable the MCI */
 
-  putreg32(HSMCI_CR_MCIDIS | HSMCI_CR_PWSDIS, SAM3U_HSMCI_CR);
-  
+  putreg32(HSMCI_CR_MCIDIS | HSMCI_CR_PWSDIS, SAM_HSMCI_CR);
+
   /* Disable all the interrupts */
 
-  putreg32(0xffffffff, SAM3U_HSMCI_IDR);
-  
+  putreg32(0xffffffff, SAM_HSMCI_IDR);
+
   /* Set the Data Timeout Register */
 
-  putreg32(HSMCI_DTOR_DTOCYC_MAX | HSMCI_DTOR_DTOMUL_MAX, SAM3U_HSMCI_DTOR);
-  
+  putreg32(HSMCI_DTOR_DTOCYC_MAX | HSMCI_DTOR_DTOMUL_MAX, SAM_HSMCI_DTOR);
+
   /* Set the Mode Register for ID mode frequency (probably 400KHz) */
 
-  sam3u_clock(dev, CLOCK_IDMODE);
+  sam_clock(dev, CLOCK_IDMODE);
 
   /* Set the SDCard Register */
 
-  putreg32(HSMCI_SDCR_SDCSEL_SLOTA | HSMCI_SDCR_SDCBUS_4BIT, SAM3U_HSMCI_SDCR);
+  putreg32(HSMCI_SDCR_SDCSEL_SLOTA | HSMCI_SDCR_SDCBUS_4BIT, SAM_HSMCI_SDCR);
 
   /* Enable the MCI controller */
 
-  putreg32(HSMCI_CR_MCIEN, SAM3U_HSMCI_CR);
+  putreg32(HSMCI_CR_MCIEN, SAM_HSMCI_CR);
 
   /* Disable the DMA interface */
 
-  putreg32(0, SAM3U_HSMCI_DMA);
-  
+  putreg32(0, SAM_HSMCI_DMA);
+
   /* Configure MCI */
 
-  putreg32(HSMCI_CFG_FIFOMODE, SAM3U_HSMCI_CFG);
+  putreg32(HSMCI_CFG_FIFOMODE, SAM_HSMCI_CFG);
 
   /* No data transfer */
 
-  sam3u_notransfer(priv);
+  sam_notransfer(priv);
 
   /* Reset data */
 
@@ -1280,7 +1284,7 @@ static void sam3u_reset(FAR struct sdio_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: sam3u_status
+ * Name: sam_status
  *
  * Description:
  *   Get SDIO status.
@@ -1289,18 +1293,18 @@ static void sam3u_reset(FAR struct sdio_dev_s *dev)
  *   dev   - Device-specific state data
  *
  * Returned Value:
- *   Returns a bitset of status values (see sam3u_status_* defines)
+ *   Returns a bitset of status values (see sam_status_* defines)
  *
  ****************************************************************************/
 
-static uint8_t sam3u_status(FAR struct sdio_dev_s *dev)
+static uint8_t sam_status(FAR struct sdio_dev_s *dev)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s *)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s *)dev;
   return priv->cdstatus;
 }
 
 /****************************************************************************
- * Name: sam3u_widebus
+ * Name: sam_widebus
  *
  * Description:
  *   Called after change in Bus width has been selected (via ACMD6).  Most
@@ -1316,17 +1320,17 @@ static uint8_t sam3u_status(FAR struct sdio_dev_s *dev)
  *
  ****************************************************************************/
 
-static void sam3u_widebus(FAR struct sdio_dev_s *dev, bool wide)
+static void sam_widebus(FAR struct sdio_dev_s *dev, bool wide)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s *)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s *)dev;
   uint32_t regval;
 
   /* Set 1-bit or 4-bit bus by configuring the SDCBUS field of the SDCR register */
 
-  regval  = getreg32(SAM3U_HSMCI_SDCR);
+  regval  = getreg32(SAM_HSMCI_SDCR);
   regval &= ~HSMCI_SDCR_SDCBUS_MASK;
   regval |= wide ? HSMCI_SDCR_SDCBUS_4BIT : HSMCI_SDCR_SDCBUS_1BIT;
-  putreg32(regval, SAM3U_HSMCI_SDCR);
+  putreg32(regval, SAM_HSMCI_SDCR);
 
   /* Remember the setting */
 
@@ -1334,7 +1338,7 @@ static void sam3u_widebus(FAR struct sdio_dev_s *dev, bool wide)
 }
 
 /****************************************************************************
- * Name: sam3u_clock
+ * Name: sam_clock
  *
  * Description:
  *   Enable/disable SDIO clocking
@@ -1348,21 +1352,21 @@ static void sam3u_widebus(FAR struct sdio_dev_s *dev, bool wide)
  *
  ****************************************************************************/
 
-static void sam3u_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
+static void sam_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
 {
   uint32_t regval;
   bool enable = true;
 
   /* Fetch the current mode register and mask out the clkdiv (and pwsdiv) */
 
-  regval = getreg32(SAM3U_HSMCI_MR);
+  regval = getreg32(SAM_HSMCI_MR);
   regval &= ~(HSMCI_MR_CLKDIV_MASK | HSMCI_MR_PWSDIV_MASK);
 
  /* These clock devisor values that must be defined in the board-specific
   * board.h header file: HSMCI_INIT_CLKDIV, HSMCI_MMCXFR_CLKDIV,
   * HSMCI_SDXFR_CLKDIV, and HSMCI_SDWIDEXFR_CLKDIV.
   */
-  
+
   switch (rate)
     {
     default:
@@ -1392,19 +1396,19 @@ static void sam3u_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
    * disabled, whichever the case.
    */
 
-  putreg32(regval, SAM3U_HSMCI_MR);
+  putreg32(regval, SAM_HSMCI_MR);
   if (enable)
     {
-      sam3u_enable();
+      sam_enable();
     }
   else
     {
-      sam3u_disable();
+      sam_disable();
     }
 }
 
 /****************************************************************************
- * Name: sam3u_attach
+ * Name: sam_attach
  *
  * Description:
  *   Attach and prepare interrupts
@@ -1417,13 +1421,13 @@ static void sam3u_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
  *
  ****************************************************************************/
 
-static int sam3u_attach(FAR struct sdio_dev_s *dev)
+static int sam_attach(FAR struct sdio_dev_s *dev)
 {
   int ret;
 
   /* Attach the HSMCI interrupt handler */
 
-  ret = irq_attach(SAM3U_IRQ_HSMCI, sam3u_interrupt);
+  ret = irq_attach(SAM_IRQ_HSMCI, sam_interrupt);
   if (ret == OK)
     {
 
@@ -1431,25 +1435,25 @@ static int sam3u_attach(FAR struct sdio_dev_s *dev)
        * interrupt flags by reading the status register.
        */
 
-      putreg32(0xffffffff, SAM3U_HSMCI_IDR);
-      (void)getreg32(SAM3U_HSMCI_SR);
+      putreg32(0xffffffff, SAM_HSMCI_IDR);
+      (void)getreg32(SAM_HSMCI_SR);
 
       /* Enable HSMCI interrupts at the NVIC.  They can now be enabled at
        * the HSMCI controller as needed.
        */
 
-      up_enable_irq(SAM3U_IRQ_HSMCI);
+      up_enable_irq(SAM_IRQ_HSMCI);
 
       /* Set the interrrupt priority */
 
-      up_prioritize_irq(SAM3U_IRQ_HSMCI, CONFIG_HSMCI_PRI);
+      up_prioritize_irq(SAM_IRQ_HSMCI, CONFIG_HSMCI_PRI);
     }
 
   return ret;
 }
 
 /****************************************************************************
- * Name: sam3u_sendcmd
+ * Name: sam_sendcmd
  *
  * Description:
  *   Send the SDIO command
@@ -1464,17 +1468,18 @@ static int sam3u_attach(FAR struct sdio_dev_s *dev)
  *
  ****************************************************************************/
 
-static int sam3u_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
+static int sam_sendcmd(FAR struct sdio_dev_s *dev,
+                       uint32_t cmd, uint32_t arg)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s*)dev;
   uint32_t regval;
   uint32_t cmdidx;
 
-  sam3u_cmdsampleinit();
+  sam_cmdsampleinit();
 
     /* Set the HSMCI Argument value */
 
-  putreg32(arg, SAM3U_HSMCI_ARGR);
+  putreg32(arg, SAM_HSMCI_ARGR);
 
   /* Construct the command valid, starting with the command index */
 
@@ -1490,7 +1495,7 @@ static int sam3u_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
     case MMCSD_NO_RESPONSE:
       priv->cmdrmask = HSMCI_CMDRESP_INTS;
       regval |= HSMCI_CMDR_RSPTYP_NONE;
-      
+
       break;
 
     /* 48-bit response with CRC */
@@ -1509,7 +1514,7 @@ static int sam3u_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
       break;
 
     /* 48-bit response without CRC */
- 
+
     case MMCSD_R3_RESPONSE:
     case MMCSD_R7_RESPONSE:
       priv->cmdrmask = HSMCI_CMDRESP_NOCRC_INTS;
@@ -1517,7 +1522,7 @@ static int sam3u_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
       break;
 
     /* 136-bit response with CRC */
-      
+
     case MMCSD_R2_RESPONSE:
       priv->cmdrmask = HSMCI_CMDRESP_INTS;
       regval |= (HSMCI_CMDR_RSPTYP_136BIT | HSMCI_CMDR_MAXLAT);
@@ -1532,7 +1537,7 @@ static int sam3u_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
     case MMCSD_RDSTREAM: /* MMC Read stream */
       regval |= (HSMCI_CMDR_TRCMD_START | HSMCI_CMDR_TRTYP_STREAM | HSMCI_CMDR_TRDIR_READ);
       break;
- 
+
     case MMCSD_WRSTREAM: /* MMC Write stream */
       regval |= (HSMCI_CMDR_TRCMD_START | HSMCI_CMDR_TRTYP_STREAM | HSMCI_CMDR_TRDIR_WRITE);
       break;
@@ -1542,12 +1547,12 @@ static int sam3u_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
       regval |= (HSMCI_CMDR_TRCMD_START | HSMCI_CMDR_TRDIR_READ);
       regval |= (cmd & MMCSD_MULTIBLOCK) ? HSMCI_CMDR_TRTYP_MULTI : HSMCI_CMDR_TRTYP_SINGLE;
       break;
- 
-    case MMCSD_WRDATAXFR: /* Write block transfer */   
+
+    case MMCSD_WRDATAXFR: /* Write block transfer */
       regval |= (HSMCI_CMDR_TRCMD_START | HSMCI_CMDR_TRDIR_WRITE);
       regval |= (cmd & MMCSD_MULTIBLOCK) ? HSMCI_CMDR_TRTYP_MULTI : HSMCI_CMDR_TRTYP_SINGLE;
       break;
- 
+
     case MMCSD_NODATAXFR:
     default:
       if ((cmd & MMCSD_STOPXFR) != 0)
@@ -1569,13 +1574,13 @@ static int sam3u_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
   /* Write the fully decorated command to CMDR */
 
   fvdbg("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
-  putreg32(regval, SAM3U_HSMCI_CMDR);
-  sam3u_cmdsample1(SAMPLENDX_AFTER_CMDR);
+  putreg32(regval, SAM_HSMCI_CMDR);
+  sam_cmdsample1(SAMPLENDX_AFTER_CMDR);
   return OK;
 }
 
 /****************************************************************************
- * Name: sam3u_blocksetup
+ * Name: sam_blocksetup
  *
  * Description:
  *   Some hardward needs to be informed of the selected blocksize.
@@ -1589,8 +1594,8 @@ static int sam3u_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
  *
  ****************************************************************************/
 
-static void sam3u_blocksetup(FAR struct sdio_dev_s *dev, unsigned int blocklen,
-                             unsigned int nblocks)
+static void sam_blocksetup(FAR struct sdio_dev_s *dev, unsigned int blocklen,
+                           unsigned int nblocks)
 {
   uint32_t regval;
 
@@ -1598,22 +1603,22 @@ static void sam3u_blocksetup(FAR struct sdio_dev_s *dev, unsigned int blocklen,
 
   /* Set the block size */
 
-  regval = getreg32(SAM3U_HSMCI_MR);
+  regval = getreg32(SAM_HSMCI_MR);
   regval &= ~(HSMCI_MR_RDPROOF | HSMCI_MR_WRPROOF | HSMCI_MR_BLKLEN_MASK);
   regval |= HSMCU_PROOF_BITS;
   regval |= (blocklen << HSMCI_MR_BLKLEN_SHIFT);
-  putreg32(regval, SAM3U_HSMCI_MR);
+  putreg32(regval, SAM_HSMCI_MR);
 
   /* Set the block count */
 
-  regval  = getreg32(SAM3U_HSMCI_BLKR);
+  regval  = getreg32(SAM_HSMCI_BLKR);
   regval &= ~HSMCI_BLKR_BCNT_MASK;
   regval |= (nblocks << HSMCI_BLKR_BCNT_SHIFT);
-  putreg32(regval, SAM3U_HSMCI_BLKR);
+  putreg32(regval, SAM_HSMCI_BLKR);
 }
 
 /****************************************************************************
- * Name: sam3u_cancel
+ * Name: sam_cancel
  *
  * Description:
  *   Cancel the data transfer setup of HSMCI_RECVSETUP, HSMCI_SENDSETUP,
@@ -1629,22 +1634,22 @@ static void sam3u_blocksetup(FAR struct sdio_dev_s *dev, unsigned int blocklen,
  *
  ****************************************************************************/
 
-static int sam3u_cancel(FAR struct sdio_dev_s *dev)
+static int sam_cancel(FAR struct sdio_dev_s *dev)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s*)dev;
 
   /* Disable all transfer- and event- related interrupts */
 
-  sam3u_disablexfrints(priv);
-  sam3u_disablewaitints(priv, 0);
+  sam_disablexfrints(priv);
+  sam_disablewaitints(priv, 0);
 
   /* No data transfer */
 
-  sam3u_notransfer(priv);
+  sam_notransfer(priv);
 
   /* Clearing (most) pending interrupt status by reading the status register */
- 
-  (void)getreg32(SAM3U_HSMCI_SR);
+
+  (void)getreg32(SAM_HSMCI_SR);
 
   /* Cancel any watchdog timeout */
 
@@ -1655,17 +1660,17 @@ static int sam3u_cancel(FAR struct sdio_dev_s *dev)
    * on an error condition.
    */
 
-  sam3u_dmastop(priv->dma);
+  sam_dmastop(priv->dma);
 
   /* Disable the DMA handshaking */
 
-  putreg32(0, SAM3U_HSMCI_DMA);
-  
+  putreg32(0, SAM_HSMCI_DMA);
+
   return OK;
 }
 
 /****************************************************************************
- * Name: sam3u_waitresponse
+ * Name: sam_waitresponse
  *
  * Description:
  *   Poll-wait for the response to the last command to be ready.
@@ -1679,9 +1684,9 @@ static int sam3u_cancel(FAR struct sdio_dev_s *dev)
  *
  ****************************************************************************/
 
-static int sam3u_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
+static int sam_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s*)dev;
   uint32_t sr;
   int32_t  timeout;
 
@@ -1714,11 +1719,11 @@ static int sam3u_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
     {
       /* Did a Command-Response sequence termination evernt occur? */
 
-      sr = getreg32(SAM3U_HSMCI_SR);
+      sr = getreg32(SAM_HSMCI_SR);
       if ((sr & priv->cmdrmask) != 0)
         {
-          sam3u_cmdsample2(SAMPLENDX_AT_WAKEUP, sr);
-          sam3u_cmddump();
+          sam_cmdsample2(SAMPLENDX_AT_WAKEUP, sr);
+          sam_cmddump();
 
           /* Yes.. Did the Command-Response sequence end with an error? */
 
@@ -1764,7 +1769,7 @@ static int sam3u_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
 }
 
 /****************************************************************************
- * Name: sam3u_recvRx
+ * Name: sam_recvRx
  *
  * Description:
  *   Receive response to SDIO command.  Only the critical payload is
@@ -1785,9 +1790,10 @@ static int sam3u_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
  *
  ****************************************************************************/
 
-static int sam3u_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort)
+static int sam_recvshort(FAR struct sdio_dev_s *dev,
+                         uint32_t cmd, uint32_t *rshort)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s*)dev;
   int ret = OK;
 
   /* These responses could have CRC errors:
@@ -1864,16 +1870,16 @@ static int sam3u_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
 
   else if (rshort)
     {
-      *rshort = getreg32(SAM3U_HSMCI_RSPR0);
+      *rshort = getreg32(SAM_HSMCI_RSPR0);
     }
 
   priv->wkupevent = 0;
   return ret;
 }
 
-static int sam3u_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4])
+static int sam_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4])
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s*)dev;
   int ret = OK;
 
  /* R2  CID, CSD register (136-bit)
@@ -1895,7 +1901,7 @@ static int sam3u_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
     }
   else
 #endif
-    
+
   /* Check for timeout errors */
 
   if ((priv->wkupevent & SDIOWAIT_TIMEOUT) != 0)
@@ -1914,10 +1920,10 @@ static int sam3u_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
 
   else if (rlong)
     {
-      rlong[0] = getreg32(SAM3U_HSMCI_RSPR0);
-      rlong[1] = getreg32(SAM3U_HSMCI_RSPR1);
-      rlong[2] = getreg32(SAM3U_HSMCI_RSPR2);
-      rlong[3] = getreg32(SAM3U_HSMCI_RSPR3);
+      rlong[0] = getreg32(SAM_HSMCI_RSPR0);
+      rlong[1] = getreg32(SAM_HSMCI_RSPR1);
+      rlong[2] = getreg32(SAM_HSMCI_RSPR2);
+      rlong[3] = getreg32(SAM_HSMCI_RSPR3);
     }
 
   priv->wkupevent = 0;
@@ -1926,20 +1932,21 @@ static int sam3u_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
 
 /* MMC responses not supported */
 
-static int sam3u_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl)
+static int sam_recvnotimpl(FAR struct sdio_dev_s *dev,
+                           uint32_t cmd, uint32_t *rnotimpl)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s*)dev;
   priv->wkupevent = 0;
   return -ENOSYS;
 }
 
 /****************************************************************************
- * Name: sam3u_waitenable
+ * Name: sam_waitenable
  *
  * Description:
  *   Enable/disable of a set of SDIO wait events.  This is part of the
  *   the HSMCI_WAITEVENT sequence.  The set of to-be-waited-for events is
- *   configured before calling sam3u_eventwait.  This is done in this way
+ *   configured before calling sam_eventwait.  This is done in this way
  *   to help the driver to eliminate race conditions between the command
  *   setup and the subsequent events.
  *
@@ -1957,17 +1964,17 @@ static int sam3u_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
  *
  ****************************************************************************/
 
-static void sam3u_waitenable(FAR struct sdio_dev_s *dev,
-                             sdio_eventset_t eventset)
+static void sam_waitenable(FAR struct sdio_dev_s *dev,
+                           sdio_eventset_t eventset)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s*)dev;
   uint32_t waitmask;
- 
+
   DEBUGASSERT(priv != NULL);
 
   /* Disable event-related interrupts */
 
-  sam3u_disablewaitints(priv, 0);
+  sam_disablewaitints(priv, 0);
 
   /* Select the interrupt mask that will give us the appropriate wakeup
    * interrupts.
@@ -1981,17 +1988,17 @@ static void sam3u_waitenable(FAR struct sdio_dev_s *dev,
 
   /* Enable event-related interrupts */
 
-  (void)getreg32(SAM3U_HSMCI_SR);
-  sam3u_enablewaitints(priv, waitmask, eventset);
+  (void)getreg32(SAM_HSMCI_SR);
+  sam_enablewaitints(priv, waitmask, eventset);
 }
 
 /****************************************************************************
- * Name: sam3u_eventwait
+ * Name: sam_eventwait
  *
  * Description:
  *   Wait for one of the enabled events to occur (or a timeout).  Note that
- *   all events enabled by HSMCI_WAITEVENTS are disabled when sam3u_eventwait
- *   returns.  HSMCI_WAITEVENTS must be called again before sam3u_eventwait
+ *   all events enabled by HSMCI_WAITEVENTS are disabled when sam_eventwait
+ *   returns.  HSMCI_WAITEVENTS must be called again before sam_eventwait
  *   can be used again.
  *
  * Input Parameters:
@@ -2006,10 +2013,10 @@ static void sam3u_waitenable(FAR struct sdio_dev_s *dev,
  *
  ****************************************************************************/
 
-static sdio_eventset_t sam3u_eventwait(FAR struct sdio_dev_s *dev,
-                                       uint32_t timeout)
+static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
+                                     uint32_t timeout)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s*)dev;
   sdio_eventset_t wkupevent = 0;
   int ret;
 
@@ -2037,7 +2044,7 @@ static sdio_eventset_t sam3u_eventwait(FAR struct sdio_dev_s *dev,
       /* Start the watchdog timer */
 
       delay = (timeout + (MSEC_PER_TICK-1)) / MSEC_PER_TICK;
-      ret   = wd_start(priv->waitwdog, delay, (wdentry_t)sam3u_eventtimeout,
+      ret   = wd_start(priv->waitwdog, delay, (wdentry_t)sam_eventtimeout,
                        1, (uint32_t)priv);
       if (ret != OK)
         {
@@ -2046,7 +2053,7 @@ static sdio_eventset_t sam3u_eventwait(FAR struct sdio_dev_s *dev,
     }
 
   /* Loop until the event (or the timeout occurs). Race conditions are avoided
-   * by calling sam3u_waitenable prior to triggering the logic that will cause
+   * by calling sam_waitenable prior to triggering the logic that will cause
    * the wait to terminate.  Under certain race conditions, the waited-for
    * may have already occurred before this function was called!
    */
@@ -2058,9 +2065,9 @@ static sdio_eventset_t sam3u_eventwait(FAR struct sdio_dev_s *dev,
        * there will be no wait.
        */
 
-      sam3u_takesem(priv);
+      sam_takesem(priv);
       wkupevent = priv->wkupevent;
- 
+
       /* Check if the event has occurred.  When the event has occurred, then
        * evenset will be set to 0 and wkupevent will be set to a nonzero value.
        * When wkupevent becomes non-zero, further interrupts will have already
@@ -2075,18 +2082,18 @@ static sdio_eventset_t sam3u_eventwait(FAR struct sdio_dev_s *dev,
         }
     }
 
-  sam3u_cmddump();
-  sam3u_xfrdump(priv);
+  sam_cmddump();
+  sam_xfrdump(priv);
   return wkupevent;
 }
 
 /****************************************************************************
- * Name: sam3u_callbackenable
+ * Name: sam_callbackenable
  *
  * Description:
  *   Enable/disable of a set of SDIO callback events.  This is part of the
  *   the SDIO callback sequence.  The set of events is configured to enabled
- *   callbacks to the function provided in sam3u_registercallback.
+ *   callbacks to the function provided in sam_registercallback.
  *
  *   Events are automatically disabled once the callback is performed and no
  *   further callback events will occur until they are again enabled by
@@ -2102,20 +2109,20 @@ static sdio_eventset_t sam3u_eventwait(FAR struct sdio_dev_s *dev,
  *
  ****************************************************************************/
 
-static void sam3u_callbackenable(FAR struct sdio_dev_s *dev,
-                                 sdio_eventset_t eventset)
+static void sam_callbackenable(FAR struct sdio_dev_s *dev,
+                               sdio_eventset_t eventset)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s*)dev;
 
   fvdbg("eventset: %02x\n", eventset);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = eventset;
-  sam3u_callback(priv);
+  sam_callback(priv);
 }
 
 /****************************************************************************
- * Name: sam3u_registercallback
+ * Name: sam_registercallback
  *
  * Description:
  *   Register a callback that that will be invoked on any media status
@@ -2136,10 +2143,10 @@ static void sam3u_callbackenable(FAR struct sdio_dev_s *dev,
  *
  ****************************************************************************/
 
-static int sam3u_registercallback(FAR struct sdio_dev_s *dev,
-                                  worker_t callback, void *arg)
+static int sam_registercallback(FAR struct sdio_dev_s *dev,
+                                worker_t callback, void *arg)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s*)dev;
 
   /* Disable callbacks and register this callback and is argument */
 
@@ -2153,7 +2160,7 @@ static int sam3u_registercallback(FAR struct sdio_dev_s *dev,
 }
 
 /****************************************************************************
- * Name: sam3u_dmasupported
+ * Name: sam_dmasupported
  *
  * Description:
  *   Return true if the hardware can support DMA
@@ -2167,14 +2174,14 @@ static int sam3u_registercallback(FAR struct sdio_dev_s *dev,
  ****************************************************************************/
 
 #ifdef CONFIG_SDIO_DMA
-static bool sam3u_dmasupported(FAR struct sdio_dev_s *dev)
+static bool sam_dmasupported(FAR struct sdio_dev_s *dev)
 {
   return true;
 }
 #endif
 
 /****************************************************************************
- * Name: sam3u_dmarecvsetup
+ * Name: sam_dmarecvsetup
  *
  * Description:
  *   Setup to perform a read DMA.  If the processor supports a data cache,
@@ -2192,38 +2199,38 @@ static bool sam3u_dmasupported(FAR struct sdio_dev_s *dev)
  *
  ****************************************************************************/
 
-static int sam3u_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
-                              size_t buflen)
+static int sam_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
+                          size_t buflen)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s *)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s *)dev;
 
   DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
   DEBUGASSERT(((uint32_t)buffer & 3) == 0);
 
   /* Setup register sampling */
 
-  sam3u_xfrsampleinit();
-  sam3u_xfrsample(priv, SAMPLENDX_BEFORE_SETUP);
+  sam_xfrsampleinit();
+  sam_xfrsample(priv, SAMPLENDX_BEFORE_SETUP);
 
   /* Configure the RX DMA */
 
-  sam3u_enablexfrints(priv, HSMCI_DMARECV_INTS);
-  sam3u_dmarxsetup(priv->dma, SAM3U_HSMCI_FIFO, (uint32_t)buffer, buflen);
+  sam_enablexfrints(priv, HSMCI_DMARECV_INTS);
+  sam_dmarxsetup(priv->dma, SAM_HSMCI_FIFO, (uint32_t)buffer, buflen);
 
   /* Enable DMA handshaking */
 
-  putreg32(HSMCI_DMA_DMAEN, SAM3U_HSMCI_DMA);
-  sam3u_xfrsample(priv, SAMPLENDX_BEFORE_ENABLE);
+  putreg32(HSMCI_DMA_DMAEN, SAM_HSMCI_DMA);
+  sam_xfrsample(priv, SAMPLENDX_BEFORE_ENABLE);
 
   /* Start the DMA */
 
-  sam3u_dmastart(priv->dma, sam3u_dmacallback, priv);
-  sam3u_xfrsample(priv, SAMPLENDX_AFTER_SETUP);
+  sam_dmastart(priv->dma, sam_dmacallback, priv);
+  sam_xfrsample(priv, SAMPLENDX_AFTER_SETUP);
   return OK;
 }
 
 /****************************************************************************
- * Name: sam3u_dmasendsetup
+ * Name: sam_dmasendsetup
  *
  * Description:
  *   Setup to perform a write DMA.  If the processor supports a data cache,
@@ -2241,36 +2248,36 @@ static int sam3u_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
  *
  ****************************************************************************/
 
-static int sam3u_dmasendsetup(FAR struct sdio_dev_s *dev,
-                              FAR const uint8_t *buffer, size_t buflen)
+static int sam_dmasendsetup(FAR struct sdio_dev_s *dev,
+                          FAR const uint8_t *buffer, size_t buflen)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s *)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s *)dev;
 
   DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
   DEBUGASSERT(((uint32_t)buffer & 3) == 0);
 
   /* Setup register sampling */
 
-  sam3u_xfrsampleinit();
-  sam3u_xfrsample(priv, SAMPLENDX_BEFORE_SETUP);
+  sam_xfrsampleinit();
+  sam_xfrsample(priv, SAMPLENDX_BEFORE_SETUP);
 
   /* Configure the TX DMA */
 
-  sam3u_dmatxsetup(priv->dma, SAM3U_HSMCI_FIFO, (uint32_t)buffer, buflen);
+  sam_dmatxsetup(priv->dma, SAM_HSMCI_FIFO, (uint32_t)buffer, buflen);
 
   /* Enable DMA handshaking */
 
-  putreg32(HSMCI_DMA_DMAEN, SAM3U_HSMCI_DMA);
-  sam3u_xfrsample(priv, SAMPLENDX_BEFORE_ENABLE);
+  putreg32(HSMCI_DMA_DMAEN, SAM_HSMCI_DMA);
+  sam_xfrsample(priv, SAMPLENDX_BEFORE_ENABLE);
 
   /* Start the DMA */
 
-  sam3u_dmastart(priv->dma, sam3u_dmacallback, priv);
-  sam3u_xfrsample(priv, SAMPLENDX_AFTER_SETUP);
+  sam_dmastart(priv->dma, sam_dmacallback, priv);
+  sam_xfrsample(priv, SAMPLENDX_AFTER_SETUP);
 
   /* Enable TX interrrupts */
 
-  sam3u_enablexfrints(priv, HSMCI_DMASEND_INTS);
+  sam_enablexfrints(priv, HSMCI_DMASEND_INTS);
   return OK;
 }
 
@@ -2278,7 +2285,7 @@ static int sam3u_dmasendsetup(FAR struct sdio_dev_s *dev,
  * Initialization/uninitialization/reset
  ****************************************************************************/
 /****************************************************************************
- * Name: sam3u_callback
+ * Name: sam_callback
  *
  * Description:
  *   Perform callback.
@@ -2290,9 +2297,9 @@ static int sam3u_dmasendsetup(FAR struct sdio_dev_s *dev,
  *
  ****************************************************************************/
 
-static void sam3u_callback(void *arg)
+static void sam_callback(void *arg)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s*)arg;
+  struct sam_dev_s *priv = (struct sam_dev_s*)arg;
 
   /* Is a callback registered? */
 
@@ -2377,7 +2384,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
 {
   /* There is only one slot */
 
-  struct sam3u_dev_s *priv = &g_sdiodev;
+  struct sam_dev_s *priv = &g_sdiodev;
 
   fdbg("slotno: %d\n", slotno);
 
@@ -2389,7 +2396,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
 
   /* Allocate a DMA channel.  A FIFO size of 8 is sufficient. */
 
-  priv->dma = sam3u_dmachannel(DMA_FLAGS);
+  priv->dma = sam_dmachannel(DMA_FLAGS);
   DEBUGASSERT(priv->dma);
 
   /* Configure GPIOs for 4-bit, wide-bus operation.  NOTE: (1) the chip is capable of
@@ -2397,23 +2404,23 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
    * GPIOs must be set up in board-specific logic.
    */
 
-  sam3u_configgpio(GPIO_MCI_DAT0);   /* Data 0 of Slot A */
-  sam3u_configgpio(GPIO_MCI_DAT1);   /* Data 1 of Slot A */
-  sam3u_configgpio(GPIO_MCI_DAT2);   /* Data 2 of Slot A */
-  sam3u_configgpio(GPIO_MCI_DAT3);   /* Data 3 of Slot A */
-  sam3u_configgpio(GPIO_MCI_CK);     /* SD clock */
-  sam3u_configgpio(GPIO_MCI_DA);     /* Command/Response */
+  sam_configgpio(GPIO_MCI_DAT0);   /* Data 0 of Slot A */
+  sam_configgpio(GPIO_MCI_DAT1);   /* Data 1 of Slot A */
+  sam_configgpio(GPIO_MCI_DAT2);   /* Data 2 of Slot A */
+  sam_configgpio(GPIO_MCI_DAT3);   /* Data 3 of Slot A */
+  sam_configgpio(GPIO_MCI_CK);     /* SD clock */
+  sam_configgpio(GPIO_MCI_DA);     /* Command/Response */
 
 #ifdef CONFIG_DEBUG_FS
-  sam3u_dumpgpio(GPIO_PORT_PIOA, "Pins: 3-8");
-  sam3u_dumpgpio(GPIO_PORT_PIOB, "Pins: 28-31");
+  sam_dumpgpio(GPIO_PORT_PIOA, "Pins: 3-8");
+  sam_dumpgpio(GPIO_PORT_PIOB, "Pins: 28-31");
 #endif
 
   /* Reset the card and assure that it is in the initial, unconfigured
    * state.
    */
 
-  sam3u_reset(&priv->dev);
+  sam_reset(&priv->dev);
   return &g_sdiodev.dev;
 }
 
@@ -2427,7 +2434,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
  *
  * Input Parameters:
  *   dev        - An instance of the SDIO driver device state structure.
- *   cardinslot - true is a card has been detected in the slot; false if a 
+ *   cardinslot - true is a card has been detected in the slot; false if a
  *                card has been removed from the slot.  Only transitions
  *                (inserted->removed or removed->inserted should be reported)
  *
@@ -2438,7 +2445,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
 
 void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s *)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s *)dev;
   uint8_t cdstatus;
   irqstate_t flags;
 
@@ -2454,14 +2461,16 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
     {
       priv->cdstatus &= ~SDIO_STATUS_PRESENT;
     }
+
   fvdbg("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
 
   /* Perform any requested callback if the status has changed */
 
   if (cdstatus != priv->cdstatus)
     {
-      sam3u_callback(priv);
+      sam_callback(priv);
     }
+
   irqrestore(flags);
 }
 
@@ -2483,7 +2492,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
 
 void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s *)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s *)dev;
   irqstate_t flags;
 
   /* Update card status */
@@ -2497,7 +2506,8 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect)
     {
       priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED;
     }
+
   fvdbg("cdstatus: %02x\n", priv->cdstatus);
   irqrestore(flags);
 }
-#endif /* CONFIG_SAM3U_HSMCI */
+#endif /* CONFIG_SAM34_HSMCI */
diff --git a/nuttx/arch/arm/src/sam34/sam_hsmci.h b/nuttx/arch/arm/src/sam34/sam_hsmci.h
new file mode 100644
index 000000000..841ef3742
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/sam_hsmci.h
@@ -0,0 +1,143 @@
+/************************************************************************************
+ * arch/arm/src/sam34/sam_hsmci.h
+ *
+ *   Copyright (C) 2009-2011, 2013 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_SAM34_SAM_HSMCI_H
+#define __ARCH_ARM_SRC_SAM34_SAM_HSMCI_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "chip.h"
+
+/************************************************************************************
+ * 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: sdio_initialize
+ *
+ * Description:
+ *   Initialize SDIO for operation.
+ *
+ * Input Parameters:
+ *   slotno - Not used.
+ *
+ * Returned Values:
+ *   A reference to an SDIO interface structure.  NULL is returned on failures.
+ *
+ ****************************************************************************/
+
+struct sdio_dev_s; /* See include/nuttx/sdio.h */
+FAR struct sdio_dev_s *sdio_initialize(int slotno);
+
+/****************************************************************************
+ * Name: sdio_mediachange
+ *
+ * Description:
+ *   Called by board-specific logic -- posssible from an interrupt handler --
+ *   in order to signal to the driver that a card has been inserted or
+ *   removed from the slot
+ *
+ * Input Parameters:
+ *   dev        - An instance of the SDIO driver device state structure.
+ *   cardinslot - true is a card has been detected in the slot; false if a
+ *                card has been removed from the slot.  Only transitions
+ *                (inserted->removed or removed->inserted should be reported)
+ *
+ * Returned Values:
+ *   None
+ *
+ ****************************************************************************/
+
+void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot);
+
+/****************************************************************************
+ * Name: sdio_wrprotect
+ *
+ * Description:
+ *   Called by board-specific logic to report if the card in the slot is
+ *   mechanically write protected.
+ *
+ * Input Parameters:
+ *   dev       - An instance of the SDIO driver device state structure.
+ *   wrprotect - true is a card is writeprotected.
+ *
+ * Returned Values:
+ *   None
+ *
+ ****************************************************************************/
+
+void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_HSMCI_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_irq.c b/nuttx/arch/arm/src/sam34/sam_irq.c
index 29c9908c9..f21274211 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_irq.c
+++ b/nuttx/arch/arm/src/sam34/sam_irq.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam3u_irq.c
- * arch/arm/src/chip/sam3u_irq.c
+ * arch/arm/src/sam34/sam_irq.c
  *
  *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +51,10 @@
 #include "up_arch.h"
 #include "os_internal.h"
 #include "up_internal.h"
-#include "sam3u_internal.h"
+
+#ifdef CONFIG_GPIO_IRQ
+#  include "sam_gpio.h"
+#endif
 
 /****************************************************************************
  * Definitions
@@ -62,7 +64,7 @@
  * bringup
  */
 
-#undef SAM3U_IRQ_DEBUG
+#undef SAM_IRQ_DEBUG
 
 /* Get a 32-bit version of the default priority */
 
@@ -87,15 +89,15 @@ volatile uint32_t *current_regs;
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_dumpnvic
+ * Name: sam_dumpnvic
  *
  * Description:
  *   Dump some interesting NVIC registers
  *
  ****************************************************************************/
 
-#if defined(SAM3U_IRQ_DEBUG) && defined (CONFIG_DEBUG)
-static void sam3u_dumpnvic(const char *msg, int irq)
+#if defined(SAM_IRQ_DEBUG) && defined (CONFIG_DEBUG)
+static void sam_dumpnvic(const char *msg, int irq)
 {
   irqstate_t flags;
 
@@ -112,21 +114,21 @@ static void sam3u_dumpnvic(const char *msg, int irq)
   slldbg("  SYSH_PRIO:  %08x %08x %08x\n",
          getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
          getreg32(NVIC_SYSH12_15_PRIORITY));
-  slldbg("  IRQ PRIO:   %08x %08x %08x %08x\n", 
+  slldbg("  IRQ PRIO:   %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
         getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
-  slldbg("              %08x %08x %08x %08x\n", 
+  slldbg("              %08x %08x %08x %08x\n",
         getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
         getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
   irqrestore(flags);
 }
 #else
-#  define sam3u_dumpnvic(msg, irq)
+#  define sam_dumpnvic(msg, irq)
 #endif
 
 /****************************************************************************
- * Name: sam3u_nmi, sam3u_busfault, sam3u_usagefault, sam3u_pendsv,
- *       sam3u_dbgmonitor, sam3u_pendsv, sam3u_reserved
+ * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor,
+ *       sam_pendsv, sam_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -136,7 +138,7 @@ static void sam3u_dumpnvic(const char *msg, int irq)
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG
-static int sam3u_nmi(int irq, FAR void *context)
+static int sam_nmi(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! NMI received\n");
@@ -144,7 +146,7 @@ static int sam3u_nmi(int irq, FAR void *context)
   return 0;
 }
 
-static int sam3u_busfault(int irq, FAR void *context)
+static int sam_busfault(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Bus fault recived\n");
@@ -152,7 +154,7 @@ static int sam3u_busfault(int irq, FAR void *context)
   return 0;
 }
 
-static int sam3u_usagefault(int irq, FAR void *context)
+static int sam_usagefault(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Usage fault received\n");
@@ -160,7 +162,7 @@ static int sam3u_usagefault(int irq, FAR void *context)
   return 0;
 }
 
-static int sam3u_pendsv(int irq, FAR void *context)
+static int sam_pendsv(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! PendSV received\n");
@@ -168,7 +170,7 @@ static int sam3u_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int sam3u_dbgmonitor(int irq, FAR void *context)
+static int sam_dbgmonitor(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Debug Monitor receieved\n");
@@ -176,7 +178,7 @@ static int sam3u_dbgmonitor(int irq, FAR void *context)
   return 0;
 }
 
-static int sam3u_reserved(int irq, FAR void *context)
+static int sam_reserved(int irq, FAR void *context)
 {
   (void)irqsave();
   dbg("PANIC!!! Reserved interrupt\n");
@@ -186,7 +188,7 @@ static int sam3u_reserved(int irq, FAR void *context)
 #endif
 
 /****************************************************************************
- * Name: sam3u_prioritize_syscall
+ * Name: sam_prioritize_syscall
  *
  * Description:
  *   Set the priority of an exception.  This function may be needed
@@ -195,7 +197,7 @@ static int sam3u_reserved(int irq, FAR void *context)
  ****************************************************************************/
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-static inline void sam3u_prioritize_syscall(int priority)
+static inline void sam_prioritize_syscall(int priority)
 {
   uint32_t regval;
 
@@ -209,7 +211,7 @@ static inline void sam3u_prioritize_syscall(int priority)
 #endif
 
 /****************************************************************************
- * Name: sam3u_irqinfo
+ * Name: sam_irqinfo
  *
  * Description:
  *   Given an IRQ number, provide the register and bit setting to enable or
@@ -217,18 +219,18 @@ static inline void sam3u_prioritize_syscall(int priority)
  *
  ****************************************************************************/
 
-static int sam3u_irqinfo(int irq, uint32_t *regaddr, uint32_t *bit)
+static int sam_irqinfo(int irq, uint32_t *regaddr, uint32_t *bit)
 {
-  DEBUGASSERT(irq >= SAM3U_IRQ_NMI && irq < NR_IRQS);
+  DEBUGASSERT(irq >= SAM_IRQ_NMI && irq < NR_IRQS);
 
   /* Check for external interrupt */
 
-  if (irq >= SAM3U_IRQ_EXTINT)
+  if (irq >= SAM_IRQ_EXTINT)
     {
-      if (irq < SAM3U_IRQ_NIRQS)
+      if (irq < SAM_IRQ_NIRQS)
         {
            *regaddr = NVIC_IRQ0_31_ENABLE;
-           *bit     = 1 << (irq - SAM3U_IRQ_EXTINT);
+           *bit     = 1 << (irq - SAM_IRQ_EXTINT);
         }
       else
         {
@@ -241,19 +243,19 @@ static int sam3u_irqinfo(int irq, uint32_t *regaddr, uint32_t *bit)
   else
     {
        *regaddr = NVIC_SYSHCON;
-       if (irq == SAM3U_IRQ_MEMFAULT)
+       if (irq == SAM_IRQ_MEMFAULT)
         {
           *bit = NVIC_SYSHCON_MEMFAULTENA;
         }
-      else if (irq == SAM3U_IRQ_BUSFAULT)
+      else if (irq == SAM_IRQ_BUSFAULT)
         {
           *bit = NVIC_SYSHCON_BUSFAULTENA;
         }
-      else if (irq == SAM3U_IRQ_USAGEFAULT)
+      else if (irq == SAM_IRQ_USAGEFAULT)
         {
           *bit = NVIC_SYSHCON_USGFAULTENA;
         }
-      else if (irq == SAM3U_IRQ_SYSTICK)
+      else if (irq == SAM_IRQ_SYSTICK)
         {
           *regaddr = NVIC_SYSTICK_CTRL;
           *bit = NVIC_SYSTICK_CTRL_ENABLE;
@@ -290,7 +292,7 @@ void up_irqinitialize(void)
 #if defined(CONFIG_ARCH_RAMVECTORS)
   up_ramvec_initialize();
 #elif defined(CONFIG_STM32_DFU)
-  putreg32((uint32_t)sam3u_vectors, NVIC_VECTAB);
+  putreg32((uint32_t)sam_vectors, NVIC_VECTAB);
 #endif
 
   /* Set all interrrupts (and exceptions) to the default priority */
@@ -318,16 +320,16 @@ void up_irqinitialize(void)
    * under certain conditions.
    */
 
-  irq_attach(SAM3U_IRQ_SVCALL, up_svcall);
-  irq_attach(SAM3U_IRQ_HARDFAULT, up_hardfault);
+  irq_attach(SAM_IRQ_SVCALL, up_svcall);
+  irq_attach(SAM_IRQ_HARDFAULT, up_hardfault);
 
   /* Set the priority of the SVCall interrupt */
 
 #ifdef CONFIG_ARCH_IRQPRIO
-/* up_prioritize_irq(SAM3U_IRQ_PENDSV, NVIC_SYSH_PRIORITY_MIN); */
+/* up_prioritize_irq(SAM_IRQ_PENDSV, NVIC_SYSH_PRIORITY_MIN); */
 #endif
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-   sam3u_prioritize_syscall(NVIC_SYSH_SVCALL_PRIORITY);
+   sam_prioritize_syscall(NVIC_SYSH_SVCALL_PRIORITY);
 #endif
 
   /* If the MPU is enabled, then attach and enable the Memory Management
@@ -335,34 +337,34 @@ void up_irqinitialize(void)
    */
 
 #ifdef CONFIG_ARMV7M_MPU
-  irq_attach(SAM3U_IRQ_MEMFAULT, up_memfault);
-  up_enable_irq(SAM3U_IRQ_MEMFAULT);
+  irq_attach(SAM_IRQ_MEMFAULT, up_memfault);
+  up_enable_irq(SAM_IRQ_MEMFAULT);
 #endif
 
   /* Attach all other processor exceptions (except reset and sys tick) */
 
 #ifdef CONFIG_DEBUG
-  irq_attach(SAM3U_IRQ_NMI, sam3u_nmi);
+  irq_attach(SAM_IRQ_NMI, sam_nmi);
 #ifndef CONFIG_ARMV7M_MPU
-  irq_attach(SAM3U_IRQ_MEMFAULT, up_memfault);
+  irq_attach(SAM_IRQ_MEMFAULT, up_memfault);
 #endif
-  irq_attach(SAM3U_IRQ_BUSFAULT, sam3u_busfault);
-  irq_attach(SAM3U_IRQ_USAGEFAULT, sam3u_usagefault);
-  irq_attach(SAM3U_IRQ_PENDSV, sam3u_pendsv);
-  irq_attach(SAM3U_IRQ_DBGMONITOR, sam3u_dbgmonitor);
-  irq_attach(SAM3U_IRQ_RESERVED, sam3u_reserved);
+  irq_attach(SAM_IRQ_BUSFAULT, sam_busfault);
+  irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault);
+  irq_attach(SAM_IRQ_PENDSV, sam_pendsv);
+  irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor);
+  irq_attach(SAM_IRQ_RESERVED, sam_reserved);
 #endif
 
-  sam3u_dumpnvic("initial", SAM3U_IRQ_NIRQS);
+  sam_dumpnvic("initial", SAM_IRQ_NIRQS);
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
 
   /* Initialize logic to support a second level of interrupt decoding for
    * GPIO pins.
    */
- 
+
 #ifdef CONFIG_GPIO_IRQ
-  sam3u_gpioirqinitialize();
+  sam_gpioirqinitialize();
 #endif
 
   /* And finally, enable interrupts */
@@ -385,7 +387,7 @@ void up_disable_irq(int irq)
   uint32_t regval;
   uint32_t bit;
 
-  if (sam3u_irqinfo(irq, &regaddr, &bit) == 0)
+  if (sam_irqinfo(irq, &regaddr, &bit) == 0)
     {
       /* Clear the appropriate bit in the register to enable the interrupt */
 
@@ -398,10 +400,10 @@ void up_disable_irq(int irq)
     {
       /* Maybe it is a (derived) GPIO IRQ */
 
-      sam3u_gpioirqdisable(irq);
+      sam_gpioirqdisable(irq);
     }
 #endif
-  sam3u_dumpnvic("disable", irq);
+  sam_dumpnvic("disable", irq);
 }
 
 /****************************************************************************
@@ -418,7 +420,7 @@ void up_enable_irq(int irq)
   uint32_t regval;
   uint32_t bit;
 
-  if (sam3u_irqinfo(irq, &regaddr, &bit) == 0)
+  if (sam_irqinfo(irq, &regaddr, &bit) == 0)
     {
       /* Set the appropriate bit in the register to enable the interrupt */
 
@@ -431,10 +433,10 @@ void up_enable_irq(int irq)
     {
       /* Maybe it is a (derived) GPIO IRQ */
 
-      sam3u_gpioirqenable(irq);
+      sam_gpioirqenable(irq);
     }
 #endif
-  sam3u_dumpnvic("enable", irq);
+  sam_dumpnvic("enable", irq);
 }
 
 /****************************************************************************
@@ -469,15 +471,15 @@ int up_prioritize_irq(int irq, int priority)
   int shift;
 
 #ifdef CONFIG_ARMV7M_USEBASEPRI
-  DEBUGASSERT(irq >= SAM3U_IRQ_MEMFAULT && irq < SAM3U_IRQ_NIRQS &&
+  DEBUGASSERT(irq >= SAM_IRQ_MEMFAULT && irq < SAM_IRQ_NIRQS &&
               priority >= NVIC_SYSH_DISABLE_PRIORITY &&
               priority <= NVIC_SYSH_PRIORITY_MIN);
 #else
-  DEBUGASSERT(irq >= SAM3U_IRQ_MEMFAULT && irq < SAM3U_IRQ_NIRQS &&
+  DEBUGASSERT(irq >= SAM_IRQ_MEMFAULT && irq < SAM_IRQ_NIRQS &&
               (unsigned)priority <= NVIC_SYSH_PRIORITY_MIN);
 #endif
 
-  if (irq < SAM3U_IRQ_EXTINT)
+  if (irq < SAM_IRQ_EXTINT)
     {
       /* NVIC_SYSH_PRIORITY() maps {0..15} to one of three priority
        * registers (0-3 are invalid)
@@ -490,7 +492,7 @@ int up_prioritize_irq(int irq, int priority)
     {
       /* NVIC_IRQ_PRIORITY() maps {0..} to one of many priority registers */
 
-      irq    -= SAM3U_IRQ_EXTINT;
+      irq    -= SAM_IRQ_EXTINT;
       regaddr = NVIC_IRQ_PRIORITY(irq);
     }
 
@@ -500,7 +502,7 @@ int up_prioritize_irq(int irq, int priority)
   regval     |= (priority << shift);
   putreg32(regval, regaddr);
 
-  sam3u_dumpnvic("prioritize", irq);
+  sam_dumpnvic("prioritize", irq);
   return OK;
 }
 #endif
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_lowputc.c b/nuttx/arch/arm/src/sam34/sam_lowputc.c
index 7a1e74248..00a3d3a89 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_lowputc.c
+++ b/nuttx/arch/arm/src/sam34/sam_lowputc.c
@@ -1,7 +1,7 @@
 /**************************************************************************
- * arch/arm/src/sam3u/sam3u_lowputc.c
+ * arch/arm/src/sam34/sam_lowputc.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,9 +47,11 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "sam3u_internal.h"
-#include "sam3u_pmc.h"
-#include "sam3u_uart.h"
+#include "sam_gpio.h"
+#include "sam_lowputc.h"
+#include "chip/sam_pmc.h"
+#include "chip/sam_uart.h"
+#include "chip/sam_pinmap.h"
 
 /**************************************************************************
  * Private Definitions
@@ -62,45 +64,45 @@
  */
 
 #ifndef CONFIG_USART0_ISUART
-#  undef CONFIG_SAM3U_USART0
+#  undef CONFIG_SAM34_USART0
 #endif
 #ifndef CONFIG_USART1_ISUART
-#  undef CONFIG_SAM3U_USART1
+#  undef CONFIG_SAM34_USART1
 #endif
 #ifndef CONFIG_USART2_ISUART
-#  undef CONFIG_SAM3U_USART2
+#  undef CONFIG_SAM34_USART2
 #endif
 #ifndef CONFIG_USART3_ISUART
-#  undef CONFIG_SAM3U_USART3
+#  undef CONFIG_SAM34_USART3
 #endif
 
 /* Is there a serial console? It could be on the UART, or USARTn */
 
-#if defined(CONFIG_UART_SERIAL_CONSOLE) && defined(CONFIG_SAM3U_UART)
+#if defined(CONFIG_UART_SERIAL_CONSOLE) && defined(CONFIG_SAM34_UART)
 #  undef CONFIG_USART0_SERIAL_CONSOLE
 #  undef CONFIG_USART1_SERIAL_CONSOLE
 #  undef CONFIG_USART2_SERIAL_CONSOLE
 #  undef CONFIG_USART3_SERIAL_CONSOLE
 #  define HAVE_CONSOLE 1
-#elif defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_SAM3U_USART0)
+#elif defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_SAM34_USART0)
 #  undef CONFIG_USART_SERIAL_CONSOLE
 #  undef CONFIG_USART1_SERIAL_CONSOLE
 #  undef CONFIG_USART2_SERIAL_CONSOLE
 #  undef CONFIG_USART3_SERIAL_CONSOLE
 #  define HAVE_CONSOLE 1
-#elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_SAM3U_USART1)
+#elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_SAM34_USART1)
 #  undef CONFIG_USART_SERIAL_CONSOLE
 #  undef CONFIG_USART0_SERIAL_CONSOLE
 #  undef CONFIG_USART2_SERIAL_CONSOLE
 #  undef CONFIG_USART3_SERIAL_CONSOLE
 #  define HAVE_CONSOLE 1
-#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_SAM3U_USART2)
+#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_SAM34_USART2)
 #  undef CONFIG_USART_SERIAL_CONSOLE
 #  undef CONFIG_USART0_SERIAL_CONSOLE
 #  undef CONFIG_USART1_SERIAL_CONSOLE
 #  undef CONFIG_USART3_SERIAL_CONSOLE
 #  define HAVE_CONSOLE 1
-#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_SAM3U_USART3)
+#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_SAM34_USART3)
 #  undef CONFIG_USART_SERIAL_CONSOLE
 #  undef CONFIG_USART0_SERIAL_CONSOLE
 #  undef CONFIG_USART1_SERIAL_CONSOLE
@@ -118,70 +120,71 @@
 /* Select USART parameters for the selected console */
 
 #if defined(CONFIG_UART_SERIAL_CONSOLE)
-#  define SAM3U_CONSOLE_BASE     SAM3U_UART_BASE
-#  define SAM3U_CONSOLE_BAUD     CONFIG_UART_BAUD
-#  define SAM3U_CONSOLE_BITS     CONFIG_UART_BITS
-#  define SAM3U_CONSOLE_PARITY   CONFIG_UART_PARITY
-#  define SAM3U_CONSOLE_2STOP    CONFIG_UART_2STOP
+#  define SAM_CONSOLE_BASE     SAM_UART_BASE
+#  define SAM_CONSOLE_BAUD     CONFIG_UART_BAUD
+#  define SAM_CONSOLE_BITS     CONFIG_UART_BITS
+#  define SAM_CONSOLE_PARITY   CONFIG_UART_PARITY
+#  define SAM_CONSOLE_2STOP    CONFIG_UART_2STOP
 #elif defined(CONFIG_USART0_SERIAL_CONSOLE)
-#  define SAM3U_CONSOLE_BASE     SAM3U_USART0_BASE
-#  define SAM3U_CONSOLE_BAUD     CONFIG_USART0_BAUD
-#  define SAM3U_CONSOLE_BITS     CONFIG_USART0_BITS
-#  define SAM3U_CONSOLE_PARITY   CONFIG_USART0_PARITY
-#  define SAM3U_CONSOLE_2STOP    CONFIG_USART0_2STOP
+#  define SAM_CONSOLE_BASE     SAM_USART0_BASE
+#  define SAM_CONSOLE_BAUD     CONFIG_USART0_BAUD
+#  define SAM_CONSOLE_BITS     CONFIG_USART0_BITS
+#  define SAM_CONSOLE_PARITY   CONFIG_USART0_PARITY
+#  define SAM_CONSOLE_2STOP    CONFIG_USART0_2STOP
 #elif defined(CONFIG_USART1_SERIAL_CONSOLE)
-#  define SAM3U_CONSOLE_BASE     SAM3U_USART1_BASE
-#  define SAM3U_CONSOLE_BAUD     CONFIG_USART1_BAUD
-#  define SAM3U_CONSOLE_BITS     CONFIG_USART1_BITS
-#  define SAM3U_CONSOLE_PARITY   CONFIG_USART1_PARITY
-#  define SAM3U_CONSOLE_2STOP    CONFIG_USART1_2STOP
+#  define SAM_CONSOLE_BASE     SAM_USART1_BASE
+#  define SAM_CONSOLE_BAUD     CONFIG_USART1_BAUD
+#  define SAM_CONSOLE_BITS     CONFIG_USART1_BITS
+#  define SAM_CONSOLE_PARITY   CONFIG_USART1_PARITY
+#  define SAM_CONSOLE_2STOP    CONFIG_USART1_2STOP
 #elif defined(CONFIG_USART2_SERIAL_CONSOLE)
-#  define SAM3U_CONSOLE_BASE     SAM3U_USART2_BASE
-#  define SAM3U_CONSOLE_BAUD     CONFIG_USART2_BAUD
-#  define SAM3U_CONSOLE_BITS     CONFIG_USART2_BITS
-#  define SAM3U_CONSOLE_PARITY   CONFIG_USART2_PARITY
-#  define SAM3U_CONSOLE_2STOP    CONFIG_USART2_2STOP
+#  define SAM_CONSOLE_BASE     SAM_USART2_BASE
+#  define SAM_CONSOLE_BAUD     CONFIG_USART2_BAUD
+#  define SAM_CONSOLE_BITS     CONFIG_USART2_BITS
+#  define SAM_CONSOLE_PARITY   CONFIG_USART2_PARITY
+#  define SAM_CONSOLE_2STOP    CONFIG_USART2_2STOP
 #elif defined(CONFIG_USART3_SERIAL_CONSOLE)
-#  define SAM3U_CONSOLE_BASE     SAM3U_USART3_BASE
-#  define SAM3U_CONSOLE_BAUD     CONFIG_USART3_BAUD
-#  define SAM3U_CONSOLE_BITS     CONFIG_USART3_BITS
-#  define SAM3U_CONSOLE_PARITY   CONFIG_USART3_PARITY
-#  define SAM3U_CONSOLE_2STOP    CONFIG_USART3_2STOP
+#  define SAM_CONSOLE_BASE     SAM_USART3_BASE
+#  define SAM_CONSOLE_BAUD     CONFIG_USART3_BAUD
+#  define SAM_CONSOLE_BITS     CONFIG_USART3_BITS
+#  define SAM_CONSOLE_PARITY   CONFIG_USART3_PARITY
+#  define SAM_CONSOLE_2STOP    CONFIG_USART3_2STOP
 #else
 #  error "No CONFIG_U[S]ARTn_SERIAL_CONSOLE Setting"
 #endif
 
 /* Select the settings for the mode register */
 
-#if SAM3U_CONSOLE_BITS == 5
+#if SAM_CONSOLE_BITS == 5
 #  define MR_CHRL_VALUE USART_MR_CHRL_5BITS /* 5 bits */
-#elif SAM3U_CONSOLE_BITS == 6
+#elif SAM_CONSOLE_BITS == 6
 #  define MR_CHRL_VALUE USART_MR_CHRL_6BITS  /* 6 bits */
-#elif SAM3U_CONSOLE_BITS == 7
+#elif SAM_CONSOLE_BITS == 7
 #  define MR_CHRL_VALUE USART_MR_CHRL_7BITS /* 7 bits */
-#elif SAM3U_CONSOLE_BITS == 8
+#elif SAM_CONSOLE_BITS == 8
 #  define MR_CHRL_VALUE USART_MR_CHRL_8BITS /* 8 bits */
-#elif SAM3U_CONSOLE_BITS == 9 && !defined(CONFIG_UART_SERIAL_CONSOLE)
+#elif SAM_CONSOLE_BITS == 9 && !defined(CONFIG_UART_SERIAL_CONSOLE)
 #  define MR_CHRL_VALUE USART_MR_MODE9
 #else
 #  error "Invlaid number of bits"
 #endif
 
-#if SAM3U_CONSOLE_PARITY == 1
+#if SAM_CONSOLE_PARITY == 1
 #  define MR_PAR_VALUE UART_MR_PAR_ODD
-#elif SAM3U_CONSOLE_PARITY == 2
+#elif SAM_CONSOLE_PARITY == 2
 #  define MR_PAR_VALUE UART_MR_PAR_EVEN
 #else
 #  define MR_PAR_VALUE UART_MR_PAR_NONE
 #endif
 
-#if SAM3U_CONSOLE_2STOP != 0
+#if SAM_CONSOLE_2STOP != 0
 #  define MR_NBSTOP_VALUE USART_MR_NBSTOP_2
 #else
 #  define MR_NBSTOP_VALUE USART_MR_NBSTOP_1
 #endif
 
-#define MR_VALUE (USART_MR_MODE_NORMAL|USART_MR_USCLKS_MCK|MR_CHRL_VALUE|MR_PAR_VALUE|MR_NBSTOP_VALUE)
+#define MR_VALUE (USART_MR_MODE_NORMAL | USART_MR_USCLKS_MCK | \
+                  MR_CHRL_VALUE | MR_PAR_VALUE | MR_NBSTOP_VALUE)
 
 /**************************************************************************
  * Private Types
@@ -219,15 +222,15 @@ void up_lowputc(char ch)
 {
   /* Wait for the transmitter to be available */
 
-  while ((getreg32(SAM3U_CONSOLE_BASE+SAM3U_UART_SR_OFFSET) & UART_INT_TXEMPTY) == 0);
+  while ((getreg32(SAM_CONSOLE_BASE + SAM_UART_SR_OFFSET) & UART_INT_TXEMPTY) == 0);
 
   /* Send the character */
 
-  putreg32((uint32_t)ch, SAM3U_CONSOLE_BASE+SAM3U_UART_THR_OFFSET);
+  putreg32((uint32_t)ch, SAM_CONSOLE_BASE + SAM_UART_THR_OFFSET);
 }
 
 /**************************************************************************
- * Name: sam3u_lowsetup
+ * Name: sam_lowsetup
  *
  * Description:
  *   This performs basic initialization of the USART used for the serial
@@ -236,97 +239,97 @@ void up_lowputc(char ch)
  *
  **************************************************************************/
 
-void sam3u_lowsetup(void)
+void sam_lowsetup(void)
 {
   uint32_t regval;
 
   /* Enable clocking for all selected UART/USARTs */
 
   regval = 0;
-#ifdef CONFIG_SAM3U_UART
-  regval |= (1 << SAM3U_PID_UART);
+#ifdef CONFIG_SAM34_UART
+  regval |= (1 << SAM_PID_UART);
 #endif
-#ifdef CONFIG_SAM3U_USART0
-  regval |= (1 << SAM3U_PID_USART0);
+#ifdef CONFIG_SAM34_USART0
+  regval |= (1 << SAM_PID_USART0);
 #endif
-#ifdef CONFIG_SAM3U_USART1
-  regval |= (1 << SAM3U_PID_USART1);
+#ifdef CONFIG_SAM34_USART1
+  regval |= (1 << SAM_PID_USART1);
 #endif
-#ifdef CONFIG_SAM3U_USART2
-  regval |= (1 << SAM3U_PID_USART2);
+#ifdef CONFIG_SAM34_USART2
+  regval |= (1 << SAM_PID_USART2);
 #endif
-#ifdef CONFIG_SAM3U_USART3
-  regval |= (1 << SAM3U_PID_USART3);
+#ifdef CONFIG_SAM34_USART3
+  regval |= (1 << SAM_PID_USART3);
 #endif
-  putreg32(regval, SAM3U_PMC_PCER);
+  putreg32(regval, SAM_PMC_PCER);
 
   /* Configure UART pins for all selected UART/USARTs */
- 
-#ifdef CONFIG_SAM3U_UART
-  (void)sam3u_configgpio(GPIO_UART_RXD);
-  (void)sam3u_configgpio(GPIO_UART_TXD);
+
+#ifdef CONFIG_SAM34_UART
+  (void)sam_configgpio(GPIO_UART_RXD);
+  (void)sam_configgpio(GPIO_UART_TXD);
 #endif
-#ifdef CONFIG_SAM3U_USART0
-  (void)sam3u_configgpio(GPIO_USART0_RXD);
-  (void)sam3u_configgpio(GPIO_USART0_TXD);
-  (void)sam3u_configgpio(GPIO_USART0_CTS);
-  (void)sam3u_configgpio(GPIO_USART0_RTS);
+#ifdef CONFIG_SAM34_USART0
+  (void)sam_configgpio(GPIO_USART0_RXD);
+  (void)sam_configgpio(GPIO_USART0_TXD);
+  (void)sam_configgpio(GPIO_USART0_CTS);
+  (void)sam_configgpio(GPIO_USART0_RTS);
 #endif
-#ifdef CONFIG_SAM3U_USART1
-  (void)sam3u_configgpio(GPIO_USART1_RXD);
-  (void)sam3u_configgpio(GPIO_USART1_TXD);
-  (void)sam3u_configgpio(GPIO_USART1_CTS);
-  (void)sam3u_configgpio(GPIO_USART1_RTS);
+#ifdef CONFIG_SAM34_USART1
+  (void)sam_configgpio(GPIO_USART1_RXD);
+  (void)sam_configgpio(GPIO_USART1_TXD);
+  (void)sam_configgpio(GPIO_USART1_CTS);
+  (void)sam_configgpio(GPIO_USART1_RTS);
 #endif
-#ifdef CONFIG_SAM3U_USART2
-  (void)sam3u_configgpio(GPIO_USART2_RXD);
-  (void)sam3u_configgpio(GPIO_USART2_TXD);
-  (void)sam3u_configgpio(GPIO_USART2_CTS);
-  (void)sam3u_configgpio(GPIO_USART2_RTS);
+#ifdef CONFIG_SAM34_USART2
+  (void)sam_configgpio(GPIO_USART2_RXD);
+  (void)sam_configgpio(GPIO_USART2_TXD);
+  (void)sam_configgpio(GPIO_USART2_CTS);
+  (void)sam_configgpio(GPIO_USART2_RTS);
 #endif
-#ifdef CONFIG_SAM3U_USART3
-  (void)sam3u_configgpio(GPIO_USART3_RXD);
-  (void)sam3u_configgpio(GPIO_USART3_TXD);
-  (void)sam3u_configgpio(GPIO_USART3_CTS);
-  (void)sam3u_configgpio(GPIO_USART3_RTS);
+#ifdef CONFIG_SAM34_USART3
+  (void)sam_configgpio(GPIO_USART3_RXD);
+  (void)sam_configgpio(GPIO_USART3_TXD);
+  (void)sam_configgpio(GPIO_USART3_CTS);
+  (void)sam_configgpio(GPIO_USART3_RTS);
 #endif
 
 #ifdef GPIO_CONSOLE_RXD
 #endif
 #ifdef GPIO_CONSOLE_TXD
-  (void)sam3u_configgpio(GPIO_CONSOLE_TXD);
+  (void)sam_configgpio(GPIO_CONSOLE_TXD);
 #endif
 #ifdef GPIO_CONSOLE_CTS
-  (void)sam3u_configgpio(GPIO_CONSOLE_CTS);
+  (void)sam_configgpio(GPIO_CONSOLE_CTS);
 #endif
 #ifdef GPIO_CONSOLE_RTS
-  (void)sam3u_configgpio(GPIO_CONSOLE_RTS);
+  (void)sam_configgpio(GPIO_CONSOLE_RTS);
 #endif
 
   /* Configure the console (only) */
 #if defined(HAVE_CONSOLE) && !defined(CONFIG_SUPPRESS_UART_CONFIG)
   /* Reset and disable receiver and transmitter */
 
-  putreg32((UART_CR_RSTRX|UART_CR_RSTTX|UART_CR_RXDIS|UART_CR_TXDIS),
-           SAM3U_CONSOLE_BASE+SAM3U_UART_CR_OFFSET);
+  putreg32((UART_CR_RSTRX | UART_CR_RSTTX | UART_CR_RXDIS | UART_CR_TXDIS),
+           SAM_CONSOLE_BASE + SAM_UART_CR_OFFSET);
 
   /* Disable all interrupts */
 
-  putreg32(0xffffffff, SAM3U_CONSOLE_BASE+SAM3U_UART_IDR_OFFSET);
+  putreg32(0xffffffff, SAM_CONSOLE_BASE + SAM_UART_IDR_OFFSET);
 
   /* Set up the mode register */
 
-  putreg32(MR_VALUE, SAM3U_CONSOLE_BASE+SAM3U_UART_MR_OFFSET);
+  putreg32(MR_VALUE, SAM_CONSOLE_BASE + SAM_UART_MR_OFFSET);
 
   /* Configure the console baud */
 
-  putreg32(((SAM3U_MCK_FREQUENCY + (SAM3U_CONSOLE_BAUD << 3))/(SAM3U_CONSOLE_BAUD << 4)),
-           SAM3U_CONSOLE_BASE+SAM3U_UART_BRGR_OFFSET);
+  putreg32(((SAM_MCK_FREQUENCY + (SAM_CONSOLE_BAUD << 3))/(SAM_CONSOLE_BAUD << 4)),
+           SAM_CONSOLE_BASE + SAM_UART_BRGR_OFFSET);
 
   /* Enable receiver & transmitter */
 
-  putreg32((UART_CR_RXEN|UART_CR_TXEN),
-           SAM3U_CONSOLE_BASE+SAM3U_UART_CR_OFFSET);
+  putreg32((UART_CR_RXEN | UART_CR_TXEN),
+           SAM_CONSOLE_BASE + SAM_UART_CR_OFFSET);
 #endif
 }
 
diff --git a/nuttx/arch/arm/src/sam34/sam_lowputc.h b/nuttx/arch/arm/src/sam34/sam_lowputc.h
new file mode 100644
index 000000000..ecfb14cb7
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/sam_lowputc.h
@@ -0,0 +1,102 @@
+/************************************************************************************
+ * arch/arm/src/sam34/sam_lowputc.h
+ *
+ *   Copyright (C) 2009-2011, 2013 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_SAM34_SAM_LOWPUTC_H
+#define __ARCH_ARM_SRC_SAM34_SAM_LOWPUTC_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/compiler.h>
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "up_internal.h"
+#include "chip.h"
+
+/************************************************************************************
+ * 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_lowsetup
+ *
+ * Description:
+ *   Called at the very beginning of _start.  Performs low level initialization
+ *   including setup of the console UART.  This UART done early so that the serial
+ *   console is available for debugging very early in the boot sequence.
+ *
+ ************************************************************************************/
+
+void sam_lowsetup(void);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_LOWPUTC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_mpuinit.c b/nuttx/arch/arm/src/sam34/sam_mpuinit.c
index f3e18ad05..3b49f9d97 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_mpuinit.c
+++ b/nuttx/arch/arm/src/sam34/sam_mpuinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/common/sam3u_mpuinit.c
+ * arch/arm/src/common/sam_mpuinit.c
  *
  *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,6 +44,7 @@
 #include <nuttx/userspace.h>
 
 #include "mpu.h"
+#include "sam_mpuinit.h"
 
 #if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_ARMV7M_MPU)
 
@@ -72,15 +73,15 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_mpuinitialize
+ * Name: sam_mpuinitialize
  *
  * Description:
- *   Configure the MPU to permit user-space access to only restricted SAM3U
+ *   Configure the MPU to permit user-space access to only restricted SAM3/4
  *   resources.
  *
  ****************************************************************************/
 
-void sam3u_mpuinitialize(void)
+void sam_mpuinitialize(void)
 {
   uintptr_t datastart = MIN(USERSPACE->us_datastart, USERSPACE->us_bssstart);
   uintptr_t dataend   = MAX(USERSPACE->us_dataend,   USERSPACE->us_bssend);
@@ -105,7 +106,7 @@ void sam3u_mpuinitialize(void)
 }
 
 /****************************************************************************
- * Name: sam3u_mpu_uheap
+ * Name: sam_mpu_uheap
  *
  * Description:
  *  Map the user-heap region.
@@ -114,7 +115,7 @@ void sam3u_mpuinitialize(void)
  *
  ****************************************************************************/
 
-void sam3u_mpu_uheap(uintptr_t start, size_t size)
+void sam_mpu_uheap(uintptr_t start, size_t size)
 {
   mpu_userintsram(start, size);
 }
diff --git a/nuttx/arch/arm/src/sam34/sam_mpuinit.h b/nuttx/arch/arm/src/sam34/sam_mpuinit.h
new file mode 100644
index 000000000..d047447ac
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/sam_mpuinit.h
@@ -0,0 +1,114 @@
+/************************************************************************************
+ * arch/arm/src/sam34/sam_mpuinit.h
+ *
+ *   Copyright (C) 2009-2011, 2013 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_SAM34_SAM_MPUINIT_H
+#define __ARCH_ARM_SRC_SAM34_SAM_MPUINIT_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <stdint.h>
+
+/************************************************************************************
+ * 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_mpuinitialize
+ *
+ * Description:
+ *   Configure the MPU to permit user-space access to only unrestricted SAM3/4
+ *   resources.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NUTTX_KERNEL
+void sam_mpuinitialize(void);
+#else
+#  define sam_mpuinitialize()
+#endif
+
+/****************************************************************************
+ * Name: sam_mpu_uheap
+ *
+ * Description:
+ *  Map the user heap region.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NUTTX_KERNEL
+void sam_mpu_uheap(uintptr_t start, size_t size);
+#else
+#  define sam_mpu_uheap(start,size)
+#endif
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_MPUINIT_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_serial.c b/nuttx/arch/arm/src/sam34/sam_serial.c
index ef1345f8e..fb7d69cba 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_serial.c
+++ b/nuttx/arch/arm/src/sam34/sam_serial.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam3u_serial.c
+ * arch/arm/src/sam34/sam_serial.c
  *
  *   Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -55,12 +55,13 @@
 #include <arch/serial.h>
 #include <arch/board/board.h>
 
-#include "chip.h"
-#include "sam3u_uart.h"
 #include "up_arch.h"
 #include "up_internal.h"
 #include "os_internal.h"
 
+#include "chip.h"
+#include "chip/sam_uart.h"
+
 /****************************************************************************
  * Definitions
  ****************************************************************************/
@@ -72,58 +73,58 @@
  */
 
 #ifndef CONFIG_USART0_ISUART
-#  undef CONFIG_SAM3U_USART0
+#  undef CONFIG_SAM34_USART0
 #endif
 #ifndef CONFIG_USART1_ISUART
-#  undef CONFIG_SAM3U_USART1
+#  undef CONFIG_SAM34_USART1
 #endif
 #ifndef CONFIG_USART2_ISUART
-#  undef CONFIG_SAM3U_USART2
+#  undef CONFIG_SAM34_USART2
 #endif
 #ifndef CONFIG_USART3_ISUART
-#  undef CONFIG_SAM3U_USART3
+#  undef CONFIG_SAM34_USART3
 #endif
 
 /* Is there a USART/USART enabled? */
 
-#if !defined(CONFIG_SAM3U_UART)   && !defined(CONFIG_SAM3U_USART0) && \
-    !defined(CONFIG_SAM3U_USART1) && !defined(CONFIG_SAM3U_USART2) && \
-    !defined(CONFIG_SAM3U_USART3)
+#if !defined(CONFIG_SAM34_UART)   && !defined(CONFIG_SAM34_USART0) && \
+    !defined(CONFIG_SAM34_USART1) && !defined(CONFIG_SAM34_USART2) && \
+    !defined(CONFIG_SAM34_USART3)
 #  error "No USARTs enabled"
 #endif
 
-#if defined(CONFIG_SAM3U_USART0) || defined(CONFIG_SAM3U_USART1) ||\
-    defined(CONFIG_SAM3U_USART2) || defined(CONFIG_SAM3U_USART3)
+#if defined(CONFIG_SAM34_USART0) || defined(CONFIG_SAM34_USART1) ||\
+    defined(CONFIG_SAM34_USART2) || defined(CONFIG_SAM34_USART3)
 #  define HAVE_USART
 #endif
 
 /* Is there a serial console? */
 
-#if defined(CONFIG_UART_SERIAL_CONSOLE) && defined(CONFIG_SAM3U_UART)
+#if defined(CONFIG_UART_SERIAL_CONSOLE) && defined(CONFIG_SAM34_UART)
 #  undef CONFIG_USART0_SERIAL_CONSOLE
 #  undef CONFIG_USART1_SERIAL_CONSOLE
 #  undef CONFIG_USART2_SERIAL_CONSOLE
 #  undef CONFIG_USART3_SERIAL_CONSOLE
 #  define HAVE_CONSOLE 1
-#elif defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_SAM3U_USART0)
+#elif defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_SAM34_USART0)
 #  undef CONFIG_UART_SERIAL_CONSOLE
 #  undef CONFIG_USART1_SERIAL_CONSOLE
 #  undef CONFIG_USART2_SERIAL_CONSOLE
 #  undef CONFIG_USART3_SERIAL_CONSOLE
 #  define HAVE_CONSOLE 1
-#elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_SAM3U_USART1)
+#elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_SAM34_USART1)
 #  undef CONFIG_UART_SERIAL_CONSOLE
 #  undef CONFIG_USART0_SERIAL_CONSOLE
 #  undef CONFIG_USART2_SERIAL_CONSOLE
 #  undef CONFIG_USART3_SERIAL_CONSOLE
 #  define HAVE_CONSOLE 1
-#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_SAM3U_USART2)
+#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_SAM34_USART2)
 #  undef CONFIG_UART_SERIAL_CONSOLE
 #  undef CONFIG_USART0_SERIAL_CONSOLE
 #  undef CONFIG_USART1_SERIAL_CONSOLE
 #  undef CONFIG_USART3_SERIAL_CONSOLE
 #  define HAVE_CONSOLE 1
-#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_SAM3U_USART3)
+#elif defined(CONFIG_USART3_SERIAL_CONSOLE) && defined(CONFIG_SAM34_USART3)
 #  undef CONFIG_UART_SERIAL_CONSOLE
 #  undef CONFIG_USART0_SERIAL_CONSOLE
 #  undef CONFIG_USART1_SERIAL_CONSOLE
@@ -150,19 +151,19 @@
 #if defined(CONFIG_UART_SERIAL_CONSOLE)
 #  define CONSOLE_DEV     g_uartport      /* UART=console */
 #  define TTYS0_DEV       g_uartport      /* UART=ttyS0 */
-#  ifdef CONFIG_SAM3U_USART0
+#  ifdef CONFIG_SAM34_USART0
 #    define TTYS1_DEV     g_usart0port    /* UART=ttyS0;USART0=ttyS1 */
-#    ifdef CONFIG_SAM3U_USART1
+#    ifdef CONFIG_SAM34_USART1
 #      define TTYS2_DEV   g_usart1port    /* UART=ttyS0;USART0=ttyS1;USART1=ttyS2 */
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS3_DEV   g_usart2port  /* UART=ttyS0;USART0=ttyS1;USART1=ttyS2;USART2=ttyS3 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS4_DEV g_usart3port  /* UART=ttyS0;USART0=ttyS1;USART1=ttyS2;USART2=ttyS3;USART3=ttyS4 */
 #        else
 #          undef TTYS4_DEV                /* UART=ttyS0;USART0=ttyS1;USART1=ttyS2;USART2=ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* UART=ttyS0;USART0=ttyS1;USART1=ttyS;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* UART=ttyS0;USART0=ttyS1;USART1=ttyS;No ttyS3;No ttyS4 */
@@ -170,16 +171,16 @@
 #        undef TTYS4_DEV                  /* No ttyS4 */
 #      endif
 #    else
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS2_DEV g_usart2port    /* UART=ttyS0;USART0=ttyS1;USART2=ttys2;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* UART=ttyS0;USART0=ttyS1;USART2=ttys2;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* UART=ttyS0;USART0=ttyS1;USART2=ttys2;No ttyS3;No ttyS4 */
 #        endif
 #        undef TTYS4_DEV                  /* No ttyS4 */
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* UART=ttyS0;USART0=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* UART=ttyS0;USART0=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -189,17 +190,17 @@
 #      endif
 #    endif
 #  else
-#    ifdef CONFIG_SAM3U_USART1
+#    ifdef CONFIG_SAM34_USART1
 #      define TTYS1_DEV   g_usart1port    /* UART=ttyS0;USART1=ttyS1;No ttyS4 */
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS2_DEV   g_usart2port  /* UART=ttyS0;USART1=ttyS1;USART2=ttyS2;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* UART=ttyS0;USART1=ttyS1;USART2=ttyS2;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* UART=ttyS0;USART1=ttyS1;USART2=ttyS2;No ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* UART=ttyS0;USART1=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* UART=ttyS0;USART1=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -207,15 +208,15 @@
 #        undef TTYS3_DEV                  /* No ttyS3 */
 #      endif
 #    else
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS1_DEV   g_usart2port  /* UART=ttyS0;USART2=ttyS1;No ttyS3;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* UART=ttyS0;USART2=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* UART=ttyS0;USART2=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS1_DEV g_usart3port  /* UART=ttyS0;USART3=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS1_DEV                /* UART=ttyS0;No ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -229,19 +230,19 @@
 #elif defined(CONFIG_USART0_SERIAL_CONSOLE)
 #  define CONSOLE_DEV     g_usart0port    /* USART0=console */
 #  define TTYS0_DEV       g_usart0port    /* USART0=ttyS0 */
-#  ifdef CONFIG_SAM3U_UART
+#  ifdef CONFIG_SAM34_UART
 #    define TTYS1_DEV     g_uartport      /* USART0=ttyS0;UART=ttyS1 */
-#    ifdef CONFIG_SAM3U_USART1
+#    ifdef CONFIG_SAM34_USART1
 #      define TTYS2_DEV   g_usart1port    /* USART0=ttyS0;UART=ttyS1;USART1=ttyS2 */
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS3_DEV   g_usart2port  /* USART0=ttyS0;UART=ttyS1;USART1=ttyS2;USART2=ttyS3 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS4_DEV g_usart3port  /* USART0=ttyS0;UART=ttyS1;USART1=ttyS2;USART2=ttyS3;USART3=ttyS4 */
 #        else
 #          undef TTYS4_DEV                /* USART0=ttyS0;UART=ttyS1;USART1=ttyS2;USART2=ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* USART0=ttyS0;UART=ttyS1;USART1=ttyS;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART0=ttyS0;UART=ttyS1;USART1=ttyS;No ttyS3;No ttyS4 */
@@ -249,16 +250,16 @@
 #        undef TTYS4_DEV                  /* No ttyS4 */
 #      endif
 #    else
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS2_DEV g_usart2port    /* USART0=ttyS0;UART=ttyS1;USART2=ttys2;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* USART0=ttyS0;UART=ttyS1;USART2=ttys2;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART0=ttyS0;UART=ttyS1;USART2=ttys2;No ttyS3;No ttyS4 */
 #        endif
 #        undef TTYS4_DEV                  /* No ttyS4 */
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* USART0=ttyS0;UART=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* USART0=ttyS0;UART=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -268,17 +269,17 @@
 #      endif
 #    endif
 #  else
-#    ifdef CONFIG_SAM3U_USART1
+#    ifdef CONFIG_SAM34_USART1
 #      define TTYS1_DEV   g_usart1port    /* USART0=ttyS0;USART1=ttyS1;No ttyS4 */
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS2_DEV   g_usart2port  /* USART0=ttyS0;USART1=ttyS1;USART2=ttyS2;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* USART0=ttyS0;USART1=ttyS1;USART2=ttyS2;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART0=ttyS0;USART1=ttyS1;USART2=ttyS2;No ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* USART0=ttyS0;USART1=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* USART0=ttyS0;USART1=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -286,15 +287,15 @@
 #        undef TTYS3_DEV                  /* No ttyS3 */
 #      endif
 #    else
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS1_DEV   g_usart2port  /* USART0=ttyS0;USART2=ttyS1;No ttyS3;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* USART0=ttyS0;USART2=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART0=ttyS0;USART2=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS1_DEV g_usart3port  /* USART0=ttyS0;USART3=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS1_DEV                /* USART0=ttyS0;No ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -308,19 +309,19 @@
 #elif defined(CONFIG_USART1_SERIAL_CONSOLE)
 #  define CONSOLE_DEV     g_usart1port    /* USART1=console */
 #  define TTYS0_DEV       g_usart1port    /* USART1=ttyS0 */
-#  ifdef CONFIG_SAM3U_UART
+#  ifdef CONFIG_SAM34_UART
 #    define TTYS1_DEV     g_uartport      /* USART1=ttyS0;UART=ttyS1 */
-#    ifdef CONFIG_SAM3U_USART0
+#    ifdef CONFIG_SAM34_USART0
 #      define TTYS2_DEV   g_usart0port    /* USART1=ttyS0;UART=ttyS1;USART0=ttyS2 */
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS3_DEV   g_usart2port  /* USART1=ttyS0;UART=ttyS1;USART0=ttyS2;USART2=ttyS3 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS4_DEV g_usart3port  /* USART1=ttyS0;UART=ttyS1;USART0=ttyS2;USART2=ttyS3;USART3=ttyS4 */
 #        else
 #          undef TTYS4_DEV                /* USART1=ttyS0;UART=ttyS1;USART0=ttyS2;USART2=ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* USART1=ttyS0;UART=ttyS1;USART0=ttyS;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART1=ttyS0;UART=ttyS1;USART0=ttyS;No ttyS3;No ttyS4 */
@@ -328,16 +329,16 @@
 #        undef TTYS4_DEV                  /* No ttyS4 */
 #      endif
 #    else
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS2_DEV g_usart2port    /* USART1=ttyS0;UART=ttyS1;USART2=ttys2;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* USART1=ttyS0;UART=ttyS1;USART2=ttys2;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART1=ttyS0;UART=ttyS1;USART2=ttys2;No ttyS3;No ttyS4 */
 #        endif
 #        undef TTYS4_DEV                  /* No ttyS4 */
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* USART1=ttyS0;UART=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* USART1=ttyS0;UART=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -347,17 +348,17 @@
 #      endif
 #    endif
 #  else
-#    ifdef CONFIG_SAM3U_USART0
+#    ifdef CONFIG_SAM34_USART0
 #      define TTYS1_DEV   g_usart0port    /* USART1=ttyS0;USART0=ttyS1;No ttyS4 */
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS2_DEV   g_usart2port  /* USART1=ttyS0;USART0=ttyS1;USART2=ttyS2;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* USART1=ttyS0;USART0=ttyS1;USART2=ttyS2;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART1=ttyS0;USART0=ttyS1;USART2=ttyS2;No ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* USART1=ttyS0;USART0=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* USART1=ttyS0;USART0=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -365,15 +366,15 @@
 #        undef TTYS3_DEV                  /* No ttyS3 */
 #      endif
 #    else
-#      ifdef CONFIG_SAM3U_USART2
+#      ifdef CONFIG_SAM34_USART2
 #        define TTYS1_DEV   g_usart2port  /* USART1=ttyS0;USART2=ttyS1;No ttyS3;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* USART1=ttyS0;USART2=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART1=ttyS0;USART2=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS1_DEV g_usart3port  /* USART1=ttyS0;USART3=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS1_DEV                /* USART1=ttyS0;No ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -387,19 +388,19 @@
 #elif defined(CONFIG_USART2_SERIAL_CONSOLE)
 #  define CONSOLE_DEV     g_usart2port    /* USART2=console */
 #  define TTYS0_DEV       g_usart2port    /* USART2=ttyS0 */
-#  ifdef CONFIG_SAM3U_UART
+#  ifdef CONFIG_SAM34_UART
 #    define TTYS1_DEV     g_uartport      /* USART2=ttyS0;UART=ttyS1 */
-#    ifdef CONFIG_SAM3U_USART0
+#    ifdef CONFIG_SAM34_USART0
 #      define TTYS2_DEV   g_usart0port    /* USART2=ttyS0;UART=ttyS1;USART0=ttyS2 */
-#      ifdef CONFIG_SAM3U_USART1
+#      ifdef CONFIG_SAM34_USART1
 #        define TTYS3_DEV   g_usart1port  /* USART2=ttyS0;UART=ttyS1;USART0=ttyS2;USART1=ttyS3 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS4_DEV g_usart3port  /* USART2=ttyS0;UART=ttyS1;USART0=ttyS2;USART1=ttyS3;USART3=ttyS4 */
 #        else
 #          undef TTYS4_DEV                /* USART2=ttyS0;UART=ttyS1;USART0=ttyS2;USART1=ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* USART2=ttyS0;UART=ttyS1;USART0=ttyS;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART2=ttyS0;UART=ttyS1;USART0=ttyS;No ttyS3;No ttyS4 */
@@ -407,16 +408,16 @@
 #        undef TTYS4_DEV                  /* No ttyS4 */
 #      endif
 #    else
-#      ifdef CONFIG_SAM3U_USART1
+#      ifdef CONFIG_SAM34_USART1
 #        define TTYS2_DEV g_usart1port    /* USART2=ttyS0;UART=ttyS1;USART1=ttys2;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* USART2=ttyS0;UART=ttyS1;USART1=ttys2;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART2=ttyS0;UART=ttyS1;USART1=ttys2;No ttyS3;No ttyS4 */
 #        endif
 #        undef TTYS4_DEV                  /* No ttyS4 */
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* USART2=ttyS0;UART=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* USART2=ttyS0;UART=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -426,17 +427,17 @@
 #      endif
 #    endif
 #  else
-#    ifdef CONFIG_SAM3U_USART0
+#    ifdef CONFIG_SAM34_USART0
 #      define TTYS1_DEV   g_usart0port    /* USART2=ttyS0;USART0=ttyS1;No ttyS4 */
-#      ifdef CONFIG_SAM3U_USART1
+#      ifdef CONFIG_SAM34_USART1
 #        define TTYS2_DEV   g_usart1port  /* USART2=ttyS0;USART0=ttyS1;USART1=ttyS2;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS3_DEV g_usart3port  /* USART2=ttyS0;USART0=ttyS1;USART1=ttyS2;USART3=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART2=ttyS0;USART0=ttyS1;USART1=ttyS2;No ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* USART2=ttyS0;USART0=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* USART2=ttyS0;USART0=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -444,15 +445,15 @@
 #        undef TTYS3_DEV                  /* No ttyS3 */
 #      endif
 #    else
-#      ifdef CONFIG_SAM3U_USART1
+#      ifdef CONFIG_SAM34_USART1
 #        define TTYS1_DEV   g_usart1port  /* USART2=ttyS0;USART1=ttyS1;No ttyS3;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS2_DEV g_usart3port  /* USART2=ttyS0;USART1=ttyS1;USART3=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* USART2=ttyS0;USART1=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART3
+#        ifdef CONFIG_SAM34_USART3
 #          define TTYS1_DEV g_usart3port  /* USART2=ttyS0;USART3=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS1_DEV                /* USART2=ttyS0;No ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -466,19 +467,19 @@
 #elif defined(CONFIG_USART3_SERIAL_CONSOLE)
 #  define CONSOLE_DEV     g_usart3port    /* USART3=console */
 #  define TTYS0_DEV       g_usart3port    /* USART3=ttyS0 */
-#  ifdef CONFIG_SAM3U_UART
+#  ifdef CONFIG_SAM34_UART
 #    define TTYS1_DEV     g_uartport      /* USART3=ttyS0;UART=ttyS1 */
-#    ifdef CONFIG_SAM3U_USART0
+#    ifdef CONFIG_SAM34_USART0
 #      define TTYS2_DEV   g_usart0port    /* USART3=ttyS0;UART=ttyS1;USART0=ttyS2 */
-#      ifdef CONFIG_SAM3U_USART1
+#      ifdef CONFIG_SAM34_USART1
 #        define TTYS3_DEV   g_usart1port  /* USART3=ttyS0;UART=ttyS1;USART0=ttyS2;USART1=ttyS3 */
-#        ifdef CONFIG_SAM3U_USART2
+#        ifdef CONFIG_SAM34_USART2
 #          define TTYS4_DEV g_usart2port  /* USART3=ttyS0;UART=ttyS1;USART0=ttyS2;USART1=ttyS3;USART2=ttyS4 */
 #        else
 #          undef TTYS4_DEV                /* USART3=ttyS0;UART=ttyS1;USART0=ttyS2;USART1=ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART2
+#        ifdef CONFIG_SAM34_USART2
 #          define TTYS3_DEV g_usart2port  /* USART3=ttyS0;UART=ttyS1;USART0=ttyS;USART2=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART3=ttyS0;UART=ttyS1;USART0=ttyS;No ttyS3;No ttyS4 */
@@ -486,16 +487,16 @@
 #        undef TTYS4_DEV                  /* No ttyS4 */
 #      endif
 #    else
-#      ifdef CONFIG_SAM3U_USART1
+#      ifdef CONFIG_SAM34_USART1
 #        define TTYS2_DEV g_usart1port    /* USART3=ttyS0;UART=ttyS1;USART1=ttys2;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART2
+#        ifdef CONFIG_SAM34_USART2
 #          define TTYS3_DEV g_usart2port  /* USART3=ttyS0;UART=ttyS1;USART1=ttys2;USART2=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART3=ttyS0;UART=ttyS1;USART1=ttys2;No ttyS3;No ttyS4 */
 #        endif
 #        undef TTYS4_DEV                  /* No ttyS4 */
 #      else
-#        ifdef CONFIG_SAM3U_USART2
+#        ifdef CONFIG_SAM34_USART2
 #          define TTYS2_DEV g_usart2port  /* USART3=ttyS0;UART=ttyS1;USART2=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* USART3=ttyS0;UART=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -505,17 +506,17 @@
 #      endif
 #    endif
 #  else
-#    ifdef CONFIG_SAM3U_USART0
+#    ifdef CONFIG_SAM34_USART0
 #      define TTYS1_DEV   g_usart0port    /* USART3=ttyS0;USART0=ttyS1;No ttyS4 */
-#      ifdef CONFIG_SAM3U_USART1
+#      ifdef CONFIG_SAM34_USART1
 #        define TTYS2_DEV   g_usart1port  /* USART3=ttyS0;USART0=ttyS1;USART1=ttyS2;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART2
+#        ifdef CONFIG_SAM34_USART2
 #          define TTYS3_DEV g_usart2port  /* USART3=ttyS0;USART0=ttyS1;USART1=ttyS2;USART2=ttyS3;No ttyS4 */
 #        else
 #          undef TTYS3_DEV                /* USART3=ttyS0;USART0=ttyS1;USART1=ttyS2;No ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART2
+#        ifdef CONFIG_SAM34_USART2
 #          define TTYS2_DEV g_usart2port  /* USART3=ttyS0;USART0=ttyS1;USART2=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* USART3=ttyS0;USART0=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -523,15 +524,15 @@
 #        undef TTYS3_DEV                  /* No ttyS3 */
 #      endif
 #    else
-#      ifdef CONFIG_SAM3U_USART1
+#      ifdef CONFIG_SAM34_USART1
 #        define TTYS1_DEV   g_usart1port  /* USART3=ttyS0;USART1=ttyS1;No ttyS3;No ttyS4 */
-#        ifdef CONFIG_SAM3U_USART2
+#        ifdef CONFIG_SAM34_USART2
 #          define TTYS2_DEV g_EEEEport    /* USART3=ttyS0;USART1=ttyS1;USART2=ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS2_DEV                /* USART3=ttyS0;USART1=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
 #        endif
 #      else
-#        ifdef CONFIG_SAM3U_USART2
+#        ifdef CONFIG_SAM34_USART2
 #          define TTYS1_DEV g_usart2port  /* USART3=ttyS0;USART2=ttyS1;No ttyS2;No ttyS3;No ttyS4 */
 #        else
 #          undef TTYS1_DEV                /* USART3=ttyS0;No ttyS1;No ttyS2;No ttyS3;No ttyS4 */
@@ -600,35 +601,35 @@ static const struct uart_ops_s g_uart_ops =
 
 /* I/O buffers */
 
-#ifdef CONFIG_SAM3U_UART
+#ifdef CONFIG_SAM34_UART
 static char g_uartrxbuffer[CONFIG_UART_RXBUFSIZE];
 static char g_uarttxbuffer[CONFIG_UART_TXBUFSIZE];
 #endif
-#ifdef CONFIG_SAM3U_USART0
+#ifdef CONFIG_SAM34_USART0
 static char g_usart0rxbuffer[CONFIG_USART0_RXBUFSIZE];
 static char g_usart0txbuffer[CONFIG_USART0_TXBUFSIZE];
 #endif
-#ifdef CONFIG_SAM3U_USART1
+#ifdef CONFIG_SAM34_USART1
 static char g_usart1rxbuffer[CONFIG_USART1_RXBUFSIZE];
 static char g_usart1txbuffer[CONFIG_USART1_TXBUFSIZE];
 #endif
-#ifdef CONFIG_SAM3U_USART2
+#ifdef CONFIG_SAM34_USART2
 static char g_usart2rxbuffer[CONFIG_USART2_RXBUFSIZE];
 static char g_usart2txbuffer[CONFIG_USART2_TXBUFSIZE];
 #endif
-#ifdef CONFIG_SAM3U_USART3
+#ifdef CONFIG_SAM34_USART3
 static char g_usart3rxbuffer[CONFIG_USART3_RXBUFSIZE];
 static char g_usart3txbuffer[CONFIG_USART3_TXBUFSIZE];
 #endif
 
-/* This describes the state of the SAM3U UART port. */
+/* This describes the state of the UART port. */
 
-#ifdef CONFIG_SAM3U_UART
+#ifdef CONFIG_SAM34_UART
 static struct up_dev_s g_uartpriv =
 {
-  .usartbase      = SAM3U_UART_BASE,
+  .usartbase      = SAM_UART_BASE,
   .baud           = CONFIG_UART_BAUD,
-  .irq            = SAM3U_IRQ_UART,
+  .irq            = SAM_IRQ_UART,
   .parity         = CONFIG_UART_PARITY,
   .bits           = CONFIG_UART_BITS,
   .stopbits2      = CONFIG_UART_2STOP,
@@ -651,14 +652,14 @@ static uart_dev_t g_uartport =
 };
 #endif
 
-/* This describes the state of the SAM3U USART1 ports. */
+/* This describes the state of the USART0 port. */
 
-#ifdef CONFIG_SAM3U_USART0
+#ifdef CONFIG_SAM34_USART0
 static struct up_dev_s g_usart0priv =
 {
-  .usartbase      = SAM3U_USART0_BASE,
+  .usartbase      = SAM_USART0_BASE,
   .baud           = CONFIG_USART0_BAUD,
-  .irq            = SAM3U_IRQ_USART0,
+  .irq            = SAM_IRQ_USART0,
   .parity         = CONFIG_USART0_PARITY,
   .bits           = CONFIG_USART0_BITS,
   .stopbits2      = CONFIG_USART0_2STOP,
@@ -681,14 +682,14 @@ static uart_dev_t g_usart0port =
 };
 #endif
 
-/* This describes the state of the SAM3U USART1 ports. */
+/* This describes the state of the USART1 port. */
 
-#ifdef CONFIG_SAM3U_USART1
+#ifdef CONFIG_SAM34_USART1
 static struct up_dev_s g_usart1priv =
 {
-  .usartbase      = SAM3U_USART1_BASE,
+  .usartbase      = SAM_USART1_BASE,
   .baud           = CONFIG_USART1_BAUD,
-  .irq            = SAM3U_IRQ_USART1,
+  .irq            = SAM_IRQ_USART1,
   .parity         = CONFIG_USART1_PARITY,
   .bits           = CONFIG_USART1_BITS,
   .stopbits2      = CONFIG_USART1_2STOP,
@@ -711,14 +712,14 @@ static uart_dev_t g_usart1port =
 };
 #endif
 
-/* This describes the state of the SAM3U USART2 port. */
+/* This describes the state of the USART2 port. */
 
-#ifdef CONFIG_SAM3U_USART2
+#ifdef CONFIG_SAM34_USART2
 static struct up_dev_s g_usart2priv =
 {
-  .usartbase      = SAM3U_USART2_BASE,
+  .usartbase      = SAM_USART2_BASE,
   .baud           = CONFIG_USART2_BAUD,
-  .irq            = SAM3U_IRQ_USART2,
+  .irq            = SAM_IRQ_USART2,
   .parity         = CONFIG_USART2_PARITY,
   .bits           = CONFIG_USART2_BITS,
   .stopbits2      = CONFIG_USART2_2STOP,
@@ -741,14 +742,14 @@ static uart_dev_t g_usart2port =
 };
 #endif
 
-/* This describes the state of the SAM3U USART3 port. */
+/* This describes the state of the USART3 port. */
 
-#ifdef CONFIG_SAM3U_USART3
+#ifdef CONFIG_SAM34_USART3
 static struct up_dev_s g_usart3priv =
 {
-  .usartbase      = SAM3U_USART3_BASE,
+  .usartbase      = SAM_USART3_BASE,
   .baud           = CONFIG_USART3_BAUD,
-  .irq            = SAM3U_IRQ_USART3,
+  .irq            = SAM_IRQ_USART3,
   .parity         = CONFIG_USART3_PARITY,
   .bits           = CONFIG_USART3_BITS,
   .stopbits2      = CONFIG_USART3_2STOP,
@@ -799,7 +800,7 @@ static inline void up_serialout(struct up_dev_s *priv, int offset, uint32_t valu
 
 static inline void up_enableint(struct up_dev_s *priv)
 {
-  up_serialout(priv, SAM3U_UART_IER_OFFSET, priv->imr);
+  up_serialout(priv, SAM_UART_IER_OFFSET, priv->imr);
 }
 
 /****************************************************************************
@@ -808,7 +809,7 @@ static inline void up_enableint(struct up_dev_s *priv)
 
 static inline void up_disableint(struct up_dev_s *priv)
 {
-  up_serialout(priv, SAM3U_UART_IDR_OFFSET, ~priv->imr);
+  up_serialout(priv, SAM_UART_IDR_OFFSET, ~priv->imr);
 }
 
 /****************************************************************************
@@ -835,7 +836,7 @@ static void up_disableallints(struct up_dev_s *priv, uint32_t *imr)
   if (imr)
     {
       /* Return the current interrupt mask */
- 
+
       *imr = priv->imr;
     }
 
@@ -861,7 +862,7 @@ static int up_setup(struct uart_dev_s *dev)
   uint32_t regval;
 
   /* Note: The logic here depends on the fact that that the USART module
-   * was enabled and the pins were configured in sam3u_lowsetup().
+   * was enabled and the pins were configured in sam_lowsetup().
    */
 
   /* The shutdown method will put the UART in a known, disabled state */
@@ -889,10 +890,10 @@ static int up_setup(struct uart_dev_s *dev)
       regval |= USART_MR_CHRL_7BITS; /* 7 bits */
     }
 #ifdef HAVE_USART
-#ifdef CONFIG_SAM3U_UART
+#ifdef CONFIG_SAM34_UART
   /* UART does not support 9bit mode */
 
-  else if (priv->bits == 9 && priv->usartbase != SAM3U_UART_BASE)
+  else if (priv->bits == 9 && priv->usartbase != SAM_UART_BASE)
 #else
   else if (priv->bits == 9) /* Only USARTS */
 #endif
@@ -933,16 +934,16 @@ static int up_setup(struct uart_dev_s *dev)
 
   /* And save the new mode register value */
 
-  up_serialout(priv, SAM3U_UART_MR_OFFSET, regval);
+  up_serialout(priv, SAM_UART_MR_OFFSET, regval);
 
   /* Configure the console baud */
 
-  regval  = (SAM3U_MCK_FREQUENCY + (priv->baud << 3))/(priv->baud << 4);
-  up_serialout(priv, SAM3U_UART_BRGR_OFFSET, regval);
+  regval  = (SAM_MCK_FREQUENCY + (priv->baud << 3))/(priv->baud << 4);
+  up_serialout(priv, SAM_UART_BRGR_OFFSET, regval);
 
   /* Enable receiver & transmitter */
 
-  up_serialout(priv, SAM3U_UART_CR_OFFSET, (UART_CR_RXEN|UART_CR_TXEN));
+  up_serialout(priv, SAM_UART_CR_OFFSET, (UART_CR_RXEN|UART_CR_TXEN));
 #endif
   return OK;
 }
@@ -962,7 +963,7 @@ static void up_shutdown(struct uart_dev_s *dev)
 
   /* Reset and disable receiver and transmitter */
 
-  up_serialout(priv, SAM3U_UART_CR_OFFSET,
+  up_serialout(priv, SAM_UART_CR_OFFSET,
                (UART_CR_RSTRX|UART_CR_RSTTX|UART_CR_RXDIS|UART_CR_TXDIS));
 
   /* Disable all interrupts */
@@ -1041,35 +1042,35 @@ static int up_interrupt(int irq, void *context)
   int                passes;
   bool               handled;
 
-#ifdef CONFIG_SAM3U_UART
+#ifdef CONFIG_SAM34_UART
   if (g_uartpriv.irq == irq)
     {
       dev = &g_uartport;
     }
   else
 #endif
-#ifdef CONFIG_SAM3U_USART0
+#ifdef CONFIG_SAM34_USART0
   if (g_usart0priv.irq == irq)
     {
       dev = &g_usart0port;
     }
   else
 #endif
-#ifdef CONFIG_SAM3U_USART1
+#ifdef CONFIG_SAM34_USART1
   if (g_usart1priv.irq == irq)
     {
       dev = &g_usart1port;
     }
   else
 #endif
-#ifdef CONFIG_SAM3U_USART2
+#ifdef CONFIG_SAM34_USART2
   if (g_usart2priv.irq == irq)
     {
       dev = &g_usart2port;
     }
   else
 #endif
-#ifdef CONFIG_SAM3U_USART3
+#ifdef CONFIG_SAM34_USART3
   if (g_usart3priv.irq == irq)
     {
       dev = &g_usart3port;
@@ -1092,7 +1093,7 @@ static int up_interrupt(int irq, void *context)
 
       /* Get the UART/USART status (we are only interested in the unmasked interrupts). */
 
-      priv->sr = up_serialin(priv, SAM3U_UART_SR_OFFSET); /* Save for error reporting */
+      priv->sr = up_serialin(priv, SAM_UART_SR_OFFSET); /* Save for error reporting */
       pending  = priv->sr & priv->imr;                      /* Mask out disabled interrupt sources */
 
       /* Handle an incoming, receive byte.  RXRDY: At least one complete character
@@ -1132,8 +1133,10 @@ static int up_interrupt(int irq, void *context)
 
 static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
 {
+#ifdef CONFIG_SERIAL_TIOCSERGSTRUCT
   struct inode      *inode = filep->f_inode;
   struct uart_dev_s *dev   = inode->i_private;
+#endif
   int                ret    = OK;
 
   switch (cmd)
@@ -1183,7 +1186,7 @@ static int up_receive(struct uart_dev_s *dev, uint32_t *status)
 
   /* Then return the actual received byte */
 
-  return (int)(up_serialin(priv, SAM3U_UART_RHR_OFFSET) & 0xff);
+  return (int)(up_serialin(priv, SAM_UART_RHR_OFFSET) & 0xff);
 }
 
 /****************************************************************************
@@ -1227,7 +1230,7 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
 static bool up_rxavailable(struct uart_dev_s *dev)
 {
   struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
-  return ((up_serialin(priv, SAM3U_UART_SR_OFFSET) & UART_INT_RXRDY) != 0);
+  return ((up_serialin(priv, SAM_UART_SR_OFFSET) & UART_INT_RXRDY) != 0);
 }
 
 /****************************************************************************
@@ -1241,7 +1244,7 @@ static bool up_rxavailable(struct uart_dev_s *dev)
 static void up_send(struct uart_dev_s *dev, int ch)
 {
   struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
-  up_serialout(priv, SAM3U_UART_THR_OFFSET, (uint32_t)ch);
+  up_serialout(priv, SAM_UART_THR_OFFSET, (uint32_t)ch);
 }
 
 /****************************************************************************
@@ -1296,7 +1299,7 @@ static void up_txint(struct uart_dev_s *dev, bool enable)
 static bool up_txready(struct uart_dev_s *dev)
 {
   struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
-  return ((up_serialin(priv, SAM3U_UART_SR_OFFSET) & UART_INT_TXRDY) != 0);
+  return ((up_serialin(priv, SAM_UART_SR_OFFSET) & UART_INT_TXRDY) != 0);
  }
 
 /****************************************************************************
@@ -1310,7 +1313,7 @@ static bool up_txready(struct uart_dev_s *dev)
 static bool up_txempty(struct uart_dev_s *dev)
 {
   struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
-  return ((up_serialin(priv, SAM3U_UART_SR_OFFSET) & UART_INT_TXEMPTY) != 0);
+  return ((up_serialin(priv, SAM_UART_SR_OFFSET) & UART_INT_TXEMPTY) != 0);
 }
 
 /****************************************************************************
@@ -1330,7 +1333,7 @@ static bool up_txempty(struct uart_dev_s *dev)
 void up_earlyserialinit(void)
 {
   /* NOTE:  All GPIO configuration for the USARTs was performed in
-   * sam3u_lowsetup
+   * sam_lowsetup
    */
 
   /* Disable all USARTS */
@@ -1403,7 +1406,7 @@ int up_putc(int ch)
 {
 #ifdef HAVE_CONSOLE
   struct up_dev_s *priv = (struct up_dev_s*)CONSOLE_DEV.priv;
-  uint16_t imr;
+  uint32_t imr;
 
   up_disableallints(priv, &imr);
 
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_spi.c b/nuttx/arch/arm/src/sam34/sam_spi.c
index 8f3c2e28b..10395ec90 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_spi.c
+++ b/nuttx/arch/arm/src/sam34/sam_spi.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam3u_spi.c
+ * arch/arm/src/sam34/sam_spi.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
  *            Diego Sanchez <dsanchez@nx-engineering.com>
  *
@@ -55,11 +55,13 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "sam3u_internal.h"
-#include "sam3u_pmc.h"
-#include "sam3u_spi.h"
+#include "sam_gpio.h"
+#include "sam_spi.h"
+#include "chip/sam_pmc.h"
+#include "chip/sam_spi.h"
+#include "chip/sam_pinmap.h"
 
-#ifdef CONFIG_SAM3U_SPI
+#ifdef CONFIG_SAM34_SPI
 
 /****************************************************************************
  * Definitions
@@ -93,7 +95,7 @@
 /* The state of one chip select */
 
 #ifndef CONFIG_SPI_OWNBUS
-struct sam3u_chipselect_s
+struct sam_chipselect_s
 {
   uint32_t         frequency;  /* Requested clock frequency */
   uint32_t         actual;     /* Actual clock frequency */
@@ -104,12 +106,12 @@ struct sam3u_chipselect_s
 
 /* The overall state of the SPI interface */
 
-struct sam3u_spidev_s
+struct sam_spidev_s
 {
   struct spi_dev_s spidev;     /* Externally visible part of the SPI interface */
 #ifndef CONFIG_SPI_OWNBUS
   sem_t            exclsem;    /* Held while chip is selected for mutual exclusion */
-  struct sam3u_chipselect_s csstate[4];
+  struct sam_chipselect_s csstate[4];
 #endif
   uint8_t          cs;         /* Chip select number */
 };
@@ -117,7 +119,7 @@ struct sam3u_spidev_s
 /****************************************************************************
  * Private Function Prototypes
  ****************************************************************************/
- 
+
 /* Helpers */
 
 #if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE)
@@ -127,7 +129,7 @@ static void spi_dumpregs(FAR const char *msg);
 #endif
 
 static inline void spi_flush(void);
-static inline uint32_t spi_cs2pcs(FAR struct sam3u_spidev_s *priv);
+static inline uint32_t spi_cs2pcs(FAR struct sam_spidev_s *priv);
 
 /* SPI methods */
 
@@ -164,9 +166,9 @@ static const struct spi_ops_s g_spiops =
   .setfrequency      = spi_setfrequency,
   .setmode           = spi_setmode,
   .setbits           = spi_setbits,
-  .status            = sam3u_spistatus,
+  .status            = sam_spistatus,
 #ifdef CONFIG_SPI_CMDDATA
-  .cmddata           = sam3u_spicmddata,
+  .cmddata           = sam_spicmddata,
 #endif
   .send              = spi_send,
 #ifdef CONFIG_SPI_EXCHANGE
@@ -180,16 +182,16 @@ static const struct spi_ops_s g_spiops =
 
 /* SPI device structure */
 
-static struct sam3u_spidev_s g_spidev =
+static struct sam_spidev_s g_spidev =
 {
   .spidev            = { &g_spiops },
-}; 
+};
 
 /* This array maps chip select numbers (0-3) to CSR register addresses */
 
 static const uint32_t g_csraddr[4] =
 {
-  SAM3U_SPI_CSR0, SAM3U_SPI_CSR1, SAM3U_SPI_CSR2, SAM3U_SPI_CSR3
+  SAM_SPI_CSR0, SAM_SPI_CSR1, SAM_SPI_CSR2, SAM_SPI_CSR3
 };
 
 /****************************************************************************
@@ -219,13 +221,13 @@ static void spi_dumpregs(FAR const char *msg)
 {
   spivdbg("%s:\n", msg);
   spivdbg("    MR:%08x   SR:%08x  IMR:%08x\n",
-          getreg32(SAM3U_SPI_MR), getreg32(SAM3U_SPI_SR),
-          getreg32(SAM3U_SPI_IMR));
+          getreg32(SAM_SPI_MR), getreg32(SAM_SPI_SR),
+          getreg32(SAM_SPI_IMR));
   spivdbg("  CSR0:%08x CSR1:%08x CSR2:%08x CSR3:%08x\n",
-          getreg32(SAM3U_SPI_CSR0), getreg32(SAM3U_SPI_CSR1),
-          getreg32(SAM3U_SPI_CSR2), getreg32(SAM3U_SPI_CSR3));
+          getreg32(SAM_SPI_CSR0), getreg32(SAM_SPI_CSR1),
+          getreg32(SAM_SPI_CSR2), getreg32(SAM_SPI_CSR3));
   spivdbg("  WPCR:%08x WPSR:%08x\n",
-          getreg32(SAM3U_SPI_WPCR), getreg32(SAM3U_SPI_WPSR));
+          getreg32(SAM_SPI_WPCR), getreg32(SAM_SPI_WPSR));
 }
 #endif
 
@@ -247,15 +249,15 @@ static inline void spi_flush(void)
 {
   /* Make sure the no TX activity is in progress... waiting if necessary */
 
-  while ((getreg32(SAM3U_SPI_SR) & SPI_INT_TXEMPTY) == 0);
+  while ((getreg32(SAM_SPI_SR) & SPI_INT_TXEMPTY) == 0);
 
   /* Then make sure that there is no pending RX data .. reading as
    * discarding as necessary.
    */
 
-  while ((getreg32(SAM3U_SPI_SR) & SPI_INT_RDRF) != 0)
+  while ((getreg32(SAM_SPI_SR) & SPI_INT_RDRF) != 0)
     {
-       (void)getreg32(SAM3U_SPI_RDR);
+       (void)getreg32(SAM_SPI_RDR);
     }
 }
 
@@ -285,7 +287,7 @@ static inline void spi_flush(void)
  *
  ****************************************************************************/
 
-static inline uint32_t spi_cs2pcs(FAR struct sam3u_spidev_s *priv)
+static inline uint32_t spi_cs2pcs(FAR struct sam_spidev_s *priv)
 {
   return ((uint32_t)1 << (priv->cs)) - 1;
 }
@@ -314,7 +316,7 @@ static inline uint32_t spi_cs2pcs(FAR struct sam3u_spidev_s *priv)
 #ifndef CONFIG_SPI_OWNBUS
 static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
 {
-  FAR struct sam3u_spidev_s *priv = (FAR struct sam3u_spidev_s *)dev;
+  FAR struct sam_spidev_s *priv = (FAR struct sam_spidev_s *)dev;
 
   spivdbg("lock=%d\n", lock);
   if (lock)
@@ -357,7 +359,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
 
  static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
  {
-  FAR struct sam3u_spidev_s *priv = (FAR struct sam3u_spidev_s *)dev;
+  FAR struct sam_spidev_s *priv = (FAR struct sam_spidev_s *)dev;
   uint32_t regval;
 
   /* Are we selecting or de-selecting the device? */
@@ -371,7 +373,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
 
       /* Get the chip select number used with this SPI device */
 
-      priv->cs = sam3u_spicsnumber(devid);
+      priv->cs = sam_spicsnumber(devid);
       spivdbg("cs=%d\n", priv->cs);
       DEBUGASSERT(priv->cs >= 0 && priv->cs <= 3);
 
@@ -379,17 +381,17 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
        * in order to select a slave.
        */
 
-      regval  = getreg32(SAM3U_SPI_MR);
+      regval  = getreg32(SAM_SPI_MR);
       regval &= ~SPI_MR_PCS_MASK;
       regval |= (spi_cs2pcs(priv) << SPI_MR_PCS_SHIFT);
-      putreg32(regval, SAM3U_SPI_MR);
+      putreg32(regval, SAM_SPI_MR);
     }
   else
     {
       /* At this point, we expect the chip to have already been selected */
 
 #ifdef CONFIG_DEBUG
-      int cs = sam3u_spicsnumber(devid);
+      int cs = sam_spicsnumber(devid);
       DEBUGASSERT(priv->cs == cs);
 #endif
 
@@ -402,7 +404,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
    * 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 sam3u_spiselect method still needs to be provided, but it may
+   * This sam_spiselect 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 normal
@@ -412,7 +414,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
    * same as the NPCS pin normal associated with the chip select number.
    */
 
-  sam3u_spiselect(devid, selected);
+  sam_spiselect(devid, selected);
  }
 
 /****************************************************************************
@@ -432,7 +434,7 @@ static int spi_lock(FAR struct spi_dev_s *dev, bool lock)
 
 static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
 {
-  FAR struct sam3u_spidev_s *priv = (FAR struct sam3u_spidev_s *)dev;
+  FAR struct sam_spidev_s *priv = (FAR struct sam_spidev_s *)dev;
   uint32_t actual;
   uint32_t scbr;
   uint32_t dlybs;
@@ -459,7 +461,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
    *   SPCK frequency = MCK / SCBR, or SCBR = MCK / frequency
    */
 
-  scbr = SAM3U_MCK_FREQUENCY / frequency;
+  scbr = SAM_MCK_FREQUENCY / frequency;
 
   if (scbr < 8)
     {
@@ -473,7 +475,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
   scbr = (scbr + 1) & ~1;
 
   /* Save the new scbr value */
-  
+
   regaddr = g_csraddr[priv->cs];
   regval  = getreg32(regaddr);
   regval &= ~(SPI_CSR_SCBR_MASK|SPI_CSR_DLYBS_MASK|SPI_CSR_DLYBCT_MASK);
@@ -491,7 +493,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
    *   DLYBS = MCK * 0.000002 = MCK / 500000
    */
 
-  dlybs   = SAM3U_MCK_FREQUENCY / 500000;
+  dlybs   = SAM_MCK_FREQUENCY / 500000;
   regval |= dlybs << SPI_CSR_DLYBS_SHIFT;
 
   /* DLYBCT: Delay Between Consecutive Transfers.  This field defines the delay
@@ -506,13 +508,13 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
    *  DLYBCT = MCK * 0.000005 / 32 = MCK / 200000 / 32
    */
 
-  dlybct  = SAM3U_MCK_FREQUENCY / 200000 / 32;
+  dlybct  = SAM_MCK_FREQUENCY / 200000 / 32;
   regval |= dlybct << SPI_CSR_DLYBCT_SHIFT;
   putreg32(regval, regaddr);
 
   /* Calculate the new actual frequency */
 
-  actual = SAM3U_MCK_FREQUENCY / scbr;
+  actual = SAM_MCK_FREQUENCY / scbr;
   spivdbg("csr[%08x]=%08x actual=%d\n", regaddr, regval, actual);
 
   /* Save the frequency setting */
@@ -543,7 +545,7 @@ static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency)
 
 static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
 {
-  FAR struct sam3u_spidev_s *priv = (FAR struct sam3u_spidev_s *)dev;
+  FAR struct sam_spidev_s *priv = (FAR struct sam_spidev_s *)dev;
   uint32_t regval;
   uint32_t regaddr;
 
@@ -566,19 +568,19 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
         {
         case SPIDEV_MODE0: /* CPOL=0; NCPHA=0 */
           break;
- 
+
         case SPIDEV_MODE1: /* CPOL=0; NCPHA=1 */
             regval |= SPI_CSR_NCPHA;
           break;
- 
+
         case SPIDEV_MODE2: /* CPOL=1; NCPHA=0 */
             regval |= SPI_CSR_CPOL;
           break;
- 
+
         case SPIDEV_MODE3: /* CPOL=1; NCPHA=1 */
           regval |= (SPI_CSR_CPOL|SPI_CSR_NCPHA);
           break;
- 
+
         default:
           DEBUGASSERT(FALSE);
           return;
@@ -612,7 +614,7 @@ static void spi_setmode(FAR struct spi_dev_s *dev, enum spi_mode_e mode)
 
 static void spi_setbits(FAR struct spi_dev_s *dev, int nbits)
 {
-  FAR struct sam3u_spidev_s *priv = (FAR struct sam3u_spidev_s *)dev;
+  FAR struct sam_spidev_s *priv = (FAR struct sam_spidev_s *)dev;
   uint32_t regaddr;
   uint32_t regval;
 
@@ -709,7 +711,7 @@ static void  spi_exchange(FAR struct spi_dev_s *dev,
                           FAR const void *txbuffer, FAR void *rxbuffer,
                           size_t nwords)
 {
-  FAR struct sam3u_spidev_s *priv = (FAR struct sam3u_spidev_s *)dev;
+  FAR struct sam_spidev_s *priv = (FAR struct sam_spidev_s *)dev;
   FAR uint8_t *rxptr = (FAR uint8_t*)rxbuffer;
   FAR uint8_t *txptr = (FAR uint8_t*)txbuffer;
   uint32_t pcs;
@@ -720,7 +722,7 @@ static void  spi_exchange(FAR struct spi_dev_s *dev,
   /* Set up PCS bits */
 
   pcs = spi_cs2pcs(priv) << SPI_TDR_PCS_SHIFT;
-  
+
   /* Make sure that any previous transfer is flushed from the hardware */
 
   spi_flush();
@@ -786,19 +788,19 @@ static void  spi_exchange(FAR struct spi_dev_s *dev,
        * to the serializer.
        */
 
-      while ((getreg32(SAM3U_SPI_SR) & SPI_INT_TDRE) == 0);
+      while ((getreg32(SAM_SPI_SR) & SPI_INT_TDRE) == 0);
 
       /* Write the data to transmitted to the Transmit Data Register (TDR) */
 
-      putreg32(data, SAM3U_SPI_TDR);
+      putreg32(data, SAM_SPI_TDR);
 
       /* Wait for the read data to be available in the RDR */
 
-      while ((getreg32(SAM3U_SPI_SR) & SPI_INT_RDRF) == 0);
+      while ((getreg32(SAM_SPI_SR) & SPI_INT_RDRF) == 0);
 
-      /* Read the received data from the SPI Data Register */   
+      /* Read the received data from the SPI Data Register */
 
-      data = getreg32(SAM3U_SPI_RDR);
+      data = getreg32(SAM_SPI_RDR);
       if (rxptr)
         {
           *rxptr++ = (uint8_t)data;
@@ -882,7 +884,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw
 
 FAR struct spi_dev_s *up_spiinitialize(int port)
 {
-  FAR struct sam3u_spidev_s *priv = &g_spidev;
+  FAR struct sam_spidev_s *priv = &g_spidev;
   irqstate_t flags;
   uint32_t regval;
 
@@ -898,44 +900,44 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
   /* Apply power to the SPI block */
 
   flags = irqsave();
-  regval = getreg32(SAM3U_PMC_PCER);
-  regval |= (1 << SAM3U_PID_SPI);
-#ifdef CONFIG_SAM3U_SPIINTERRUPT
-  regval |= (1 << SAM3U_IRQ_SPI);
+  regval = getreg32(SAM_PMC_PCER);
+  regval |= (1 << SAM_PID_SPI);
+#ifdef CONFIG_SAM34_SPIINTERRUPT
+  regval |= (1 << SAM_IRQ_SPI);
 #endif
-  putreg32(regval, SAM3U_PMC_PCER);
+  putreg32(regval, SAM_PMC_PCER);
 
   /* Configure multiplexed pins as connected on the board.  Chip select pins
    * must be configured by board-specific logic.
    */
 
-  sam3u_configgpio(GPIO_SPI0_MISO);
-  sam3u_configgpio(GPIO_SPI0_MOSI);
-  sam3u_configgpio(GPIO_SPI0_SPCK);
+  sam_configgpio(GPIO_SPI0_MISO);
+  sam_configgpio(GPIO_SPI0_MOSI);
+  sam_configgpio(GPIO_SPI0_SPCK);
 
   /* Disable SPI clocking */
 
-  putreg32(SPI_CR_SPIDIS, SAM3U_SPI_CR);
+  putreg32(SPI_CR_SPIDIS, SAM_SPI_CR);
 
   /* Execute a software reset of the SPI (twice) */
 
-  putreg32(SPI_CR_SWRST, SAM3U_SPI_CR);
-  putreg32(SPI_CR_SWRST, SAM3U_SPI_CR);
+  putreg32(SPI_CR_SWRST, SAM_SPI_CR);
+  putreg32(SPI_CR_SWRST, SAM_SPI_CR);
   irqrestore(flags);
 
   /* Configure the SPI mode register */
 
-  putreg32(SPI_MR_MSTR | SPI_MR_MODFDIS, SAM3U_SPI_MR);
+  putreg32(SPI_MR_MSTR | SPI_MR_MODFDIS, SAM_SPI_MR);
 
   /* And enable the SPI */
 
-  putreg32(SPI_CR_SPIEN, SAM3U_SPI_CR);
+  putreg32(SPI_CR_SPIEN, SAM_SPI_CR);
   up_mdelay(20);
 
   /* Flush any pending transfers */
 
-  (void)getreg32(SAM3U_SPI_SR);
-  (void)getreg32(SAM3U_SPI_RDR);
+  (void)getreg32(SAM_SPI_SR);
+  (void)getreg32(SAM_SPI_RDR);
 
   /* Initialize the SPI semaphore that enforces mutually exclusive access */
 
@@ -945,4 +947,4 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
   spi_dumpregs("After initialization");
   return &priv->spidev;
 }
-#endif /* CONFIG_SAM3U_SPI */
+#endif /* CONFIG_SAM34_SPI */
diff --git a/nuttx/arch/arm/src/sam34/sam_spi.h b/nuttx/arch/arm/src/sam34/sam_spi.h
new file mode 100644
index 000000000..77e6e26f3
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/sam_spi.h
@@ -0,0 +1,226 @@
+/************************************************************************************
+ * arch/arm/src/sam34/sam_spi.h
+ *
+ *   Copyright (C) 2009-2011, 2013 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_SAM34_SAM_SPI_H
+#define __ARCH_ARM_SRC_SAM34_SAM_SPI_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "chip.h"
+
+/************************************************************************************
+ * 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_spicsnumber, sam_spiselect, sam_spistatus, and sam_spicmddata
+ *
+ * Description:
+ *   These external functions must be provided by board-specific logic.  They
+ *   include:
+ *
+ *   o sam_spicsnumber and sam_spiselect which are helper functions to
+ *     manage the board-specific aspects of the unique SAM3/4 chip select
+ *     architecture.
+ *   o sam_spistatus and sam_spicmddata:  Implementations of the status
+ *     and cmddata methods of the SPI interface defined by struct spi_ops_
+ *     (see include/nuttx/spi.h). All other methods including
+ *     up_spiinitialize()) are provided by common SAM3/4 logic.
+ *
+ *  To use this common SPI logic on your board:
+ *
+ *   1. Provide logic in sam_boardinitialize() to configure SPI chip select
+ *      pins.
+ *   2. Provide sam_spicsnumber(), sam_spiselect() and sam_spistatus()
+ *      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_spicmddata() 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).
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SAM34_SPI
+struct spi_dev_s;
+enum spi_dev_e;
+
+/****************************************************************************
+ * Name: sam_spicsnumber
+ *
+ * Description:
+ *   The SAM3/4 has 4 CS registers for controlling device features.  This
+ *   function must be provided by board-specific code.  Given a logical device
+ *   ID, this function returns a number from 0 to 3 that identifies one of
+ *   these SAM3/4 CS resources.
+ *
+ *   If CONFIG_SPI_OWNBUS is not defined and the GPIO is controlled by
+ *   sam_spiselect, then the same CS register may be used to control
+ *   multiple devices.
+ *
+ * Input Parameters:
+ *   dev - SPI device info
+ *   devid - Identifies the (logical) device
+ *
+ * Returned Values:
+ *   On success, a CS number from 0 to 3 is returned; A negated errno may
+ *   be returned on a failure.
+ *
+ ****************************************************************************/
+
+int sam_spicsnumber(enum spi_dev_e devid);
+
+/****************************************************************************
+ * Name: sam_spiselect
+ *
+ * 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
+ *
+ ****************************************************************************/
+
+void sam_spiselect(enum spi_dev_e devid, bool selected);
+
+/****************************************************************************
+ * Name: sam_spistatus
+ *
+ * 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.h.
+ *
+ ****************************************************************************/
+
+uint8_t sam_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
+
+/****************************************************************************
+ * Name: sam_spicmddata
+ *
+ * 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
+int sam_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
+#endif
+#endif /* CONFIG_SAM34_SPI */
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_SPI_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_start.c b/nuttx/arch/arm/src/sam34/sam_start.c
index dceb65ab2..a3fc49fa2 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_start.c
+++ b/nuttx/arch/arm/src/sam34/sam_start.c
@@ -1,8 +1,7 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam3u_start.c
- * arch/arm/src/chip/sam3u_start.c
+ * arch/arm/src/sam34/sam_start.c
  *
- *   Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009-2010, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +49,9 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "sam3u_internal.h"
+#include "sam_clockconfig.h"
+#include "sam_lowputc.h"
+#include "sam_userspace.h"
 
 /****************************************************************************
  * Private Definitions
@@ -101,8 +102,8 @@ void __start(void)
 
   /* Configure the uart so that we can get debug output as soon as possible */
 
-  sam3u_clockconfig();
-  sam3u_lowsetup();
+  sam_clockconfig();
+  sam_lowsetup();
   showprogress('A');
 
   /* Clear .bss.  We'll do this inline (vs. calling memset) just to be
@@ -141,13 +142,13 @@ void __start(void)
    */
 
 #ifdef CONFIG_NUTTX_KERNEL
-  sam3u_userspace();
+  sam_userspace();
   showprogress('E');
 #endif
 
   /* Initialize onboard resources */
 
-  sam3u_boardinitialize();
+  sam_boardinitialize();
   showprogress('F');
 
   /* Then start NuttX */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_timerisr.c b/nuttx/arch/arm/src/sam34/sam_timerisr.c
index 5ff6dea69..e1879d5cc 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_timerisr.c
+++ b/nuttx/arch/arm/src/sam34/sam_timerisr.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam3u_timerisr.c
+ * arch/arm/src/sam34/sam_timerisr.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,6 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "sam3u_internal.h"
 
 /****************************************************************************
  * Definitions
@@ -67,12 +66,12 @@
  * SysTick Control and Status register.
  */
 
-#undef CONFIG_SAM3U_SYSTICK_HCLKd8 /* Power up default is MCK, not MCK/8 */
+#undef CONFIG_SAM34_SYSTICK_HCLKd8 /* Power up default is MCK, not MCK/8 */
 
-#if CONFIG_SAM3U_SYSTICK_HCLKd8
-#  define SYSTICK_RELOAD ((SAM3U_MCK_FREQUENCY / 8 / CLK_TCK) - 1)
+#if CONFIG_SAM34_SYSTICK_HCLKd8
+#  define SYSTICK_RELOAD ((SAM_MCK_FREQUENCY / 8 / CLK_TCK) - 1)
 #else
-#  define SYSTICK_RELOAD ((SAM3U_MCK_FREQUENCY / CLK_TCK) - 1)
+#  define SYSTICK_RELOAD ((SAM_MCK_FREQUENCY / CLK_TCK) - 1)
 #endif
 
 /* The size of the reload field is 24 bits.  Verify that the reload value
@@ -136,7 +135,7 @@ void up_timerinit(void)
 
 #if 0 /* Does not work.  Comes up with HCLK source and I can't change it */
   regval = getreg32(NVIC_SYSTICK_CTRL);
-#if CONFIG_SAM3U_SYSTICK_HCLKd8
+#if CONFIG_SAM34_SYSTICK_HCLKd8
   regval &= ~NVIC_SYSTICK_CTRL_CLKSOURCE;
 #else
   regval |= NVIC_SYSTICK_CTRL_CLKSOURCE;
@@ -150,7 +149,7 @@ void up_timerinit(void)
 
   /* Attach the timer interrupt vector */
 
-  (void)irq_attach(SAM3U_IRQ_SYSTICK, (xcpt_t)up_timerisr);
+  (void)irq_attach(SAM_IRQ_SYSTICK, (xcpt_t)up_timerisr);
 
   /* Enable SysTick interrupts */
 
@@ -158,5 +157,5 @@ void up_timerinit(void)
 
   /* And enable the timer interrupt */
 
-  up_enable_irq(SAM3U_IRQ_SYSTICK);
+  up_enable_irq(SAM_IRQ_SYSTICK);
 }
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_userspace.c b/nuttx/arch/arm/src/sam34/sam_userspace.c
index 1450e27a9..72f1a814b 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_userspace.c
+++ b/nuttx/arch/arm/src/sam34/sam_userspace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sam3u/sam3u_userspace.c
+ * arch/arm/src/sam34/sam_userspace.c
  *
  *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +44,7 @@
 
 #include <nuttx/userspace.h>
 
-#include "sam3u_internal.h"
+#include "sam_userspace.h"
 
 #ifdef CONFIG_NUTTX_KERNEL
 
@@ -65,7 +65,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: sam3u_userspace
+ * Name: sam_userspace
  *
  * Description:
  *   For the case of the separate user-/kernel-space build, perform whatever
@@ -75,7 +75,7 @@
  *
  ****************************************************************************/
 
-void sam3u_userspace(void)
+void sam_userspace(void)
 {
   uint8_t *src;
   uint8_t *dest;
@@ -111,7 +111,7 @@ void sam3u_userspace(void)
 
   /* Configure the MPU to permit user-space access to its FLASH and RAM */
 
-  sam3u_mpuinitialize();
+  sam_mpuinitialize();
 }
 
 #endif /* CONFIG_NUTTX_KERNEL */
diff --git a/nuttx/arch/arm/src/sam34/sam_userspace.h b/nuttx/arch/arm/src/sam34/sam_userspace.h
new file mode 100644
index 000000000..b24577589
--- /dev/null
+++ b/nuttx/arch/arm/src/sam34/sam_userspace.h
@@ -0,0 +1,105 @@
+/************************************************************************************
+ * arch/arm/src/sam34/sam_userspace.h
+ *
+ *   Copyright (C) 2009-2011, 2013 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_SAM34_SAM_USERSPACE_H
+#define __ARCH_ARM_SRC_SAM34_SAM_USERSPACE_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+#include <nuttx/compiler.h>
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "up_internal.h"
+#include "chip.h"
+
+/************************************************************************************
+ * 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_userspace
+ *
+ * Description:
+ *   For the case of the separate user-/kernel-space build, perform whatever
+ *   platform specific initialization of the user memory is required.
+ *   Normally this just means initializing the user space .data and .bss
+ *   segments.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NUTTX_KERNEL
+void sam_userspace(void);
+#endif
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_SAM34_SAM_USERSPACE_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_vectors.S b/nuttx/arch/arm/src/sam34/sam_vectors.S
index f1d85b8b8..a80df3263 100644
--- a/nuttx/arch/arm/src/sam3u/sam3u_vectors.S
+++ b/nuttx/arch/arm/src/sam34/sam_vectors.S
@@ -1,6 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/sam3u/sam3u_vectors.S
- * arch/arm/src/chip/sam3u_vectors.S
+ * arch/arm/src/sam34/sam_vectors.S
  *
  *   Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -73,7 +72,7 @@
 
 	.syntax		unified
 	.thumb
-	.file		"sam3u_vectors.S"
+	.file		"sam_vectors.S"
 
 /************************************************************************************************
  * Macros
@@ -89,7 +88,7 @@
 	.thumb_func
 \label:
 	mov		r0, #\irqno
-	b		sam3u_common
+	b		sam_common
 	.endm
 
 /************************************************************************************************
@@ -99,63 +98,45 @@
 	.section	.vectors, "ax"
 	.code		16
 	.align		2
-	.globl		sam3u_vectors
-	.type		sam3u_vectors, function
+	.globl		sam_vectors
+	.type		sam_vectors, function
 
-sam3u_vectors:
+sam_vectors:
 
 /* Processor Exceptions */
 
-	.word	IDLE_STACK			/* Vector  0: Reset stack pointer */
-	.word	__start				/* Vector  1: Reset vector */
-	.word	sam3u_nmi			/* Vector  2: Non-Maskable Interrupt (NMI) */
-	.word	sam3u_hardfault		/* Vector  3: Hard fault */
-	.word	sam3u_mpu			/* Vector  4: Memory management (MPU) */
-	.word	sam3u_busfault		/* Vector  5: Bus fault */
-	.word	sam3u_usagefault	/* Vector  6: Usage fault */
-	.word	sam3u_reserved		/* Vector  7: Reserved */
-	.word	sam3u_reserved		/* Vector  8: Reserved */
-	.word	sam3u_reserved		/* Vector  9: Reserved */
-	.word	sam3u_reserved		/* Vector 10: Reserved */
-	.word	sam3u_svcall		/* Vector 11: SVC call */
-	.word	sam3u_dbgmonitor	/* Vector 12: Debug monitor */
-	.word	sam3u_reserved		/* Vector 13: Reserved */
-	.word	sam3u_pendsv		/* Vector 14: Pendable system service request */
-	.word	sam3u_systick		/* Vector 15: System tick */
+	.word	IDLE_STACK		/* Vector  0: Reset stack pointer */
+	.word	__start			/* Vector  1: Reset vector */
+	.word	sam_nmi			/* Vector  2: Non-Maskable Interrupt (NMI) */
+	.word	sam_hardfault	/* Vector  3: Hard fault */
+	.word	sam_mpu			/* Vector  4: Memory management (MPU) */
+	.word	sam_busfault	/* Vector  5: Bus fault */
+	.word	sam_usagefault	/* Vector  6: Usage fault */
+	.word	sam_reserved	/* Vector  7: Reserved */
+	.word	sam_reserved	/* Vector  8: Reserved */
+	.word	sam_reserved	/* Vector  9: Reserved */
+	.word	sam_reserved	/* Vector 10: Reserved */
+	.word	sam_svcall		/* Vector 11: SVC call */
+	.word	sam_dbgmonitor	/* Vector 12: Debug monitor */
+	.word	sam_reserved	/* Vector 13: Reserved */
+	.word	sam_pendsv		/* Vector 14: Pendable system service request */
+	.word	sam_systick		/* Vector 15: System tick */
 
 /* External Interrupts */
 
-	.word	sam3u_supc			/* Vector 16+0:  Supply Controller */
-	.word	sam3u_rstc			/* Vector 16+1:  Reset Controller */
-	.word	sam3u_rtc			/* Vector 16+2:  Real Time Clock */
-	.word	sam3u_rtt			/* Vector 16+3:  Real Time Timer */
-	.word	sam3u_wdt			/* Vector 16+4:  Watchdog Timer */
-	.word	sam3u_pmc			/* Vector 16+5:  Power Management Controller */
-	.word	sam3u_eefc0			/* Vector 16+6:  Enhanced Embedded Flash Controller 0 */
-	.word	sam3u_eefc1			/* Vector 16+7:  Enhanced Embedded Flash Controller 1 */
-	.word	sam3u_uart			/* Vector 16+8:  Universal Asynchronous Receiver Transmitter */
-	.word	sam3u_smc			/* Vector 16+9:  Static Memory Controller */
-	.word	sam3u_pioa			/* Vector 16+10: Parallel I/O Controller A */
-	.word	sam3u_piob			/* Vector 16+11: Parallel I/O Controller B */
-	.word	sam3u_pioc			/* Vector 16+12: Parallel I/O Controller C */
-	.word	sam3u_usart0		/* Vector 16+13: USART 0 */
-	.word	sam3u_usart1		/* Vector 16+14: USART 1 */
-	.word	sam3u_usart2		/* Vector 16+15: USART 2 */
-	.word	sam3u_usart3		/* Vector 16+16: USART 3 */
-	.word	sam3u_hsmci			/* Vector 16+17: High Speed Multimedia Card Interface */
-	.word	sam3u_twi0			/* Vector 16+18: Two-Wire Interface 0 */
-	.word	sam3u_twi1			/* Vector 16+19: Two-Wire Interface 1 */
-	.word	sam3u_spi			/* Vector 16+20: Serial Peripheral Interface */
-	.word	sam3u_ssc			/* Vector 16+21: Synchronous Serial Controller */
-	.word	sam3u_tc0			/* Vector 16+22: Timer Counter 0 */
-	.word	sam3u_tc1			/* Vector 16+23: Timer Counter 1 */
-	.word	sam3u_tc2			/* Vector 16+24: Timer Counter 2 */
-	.word	sam3u_pwm			/* Vector 16+25: Pulse Width Modulation Controller */
-	.word	sam3u_adc12b		/* Vector 16+26: 12-bit ADC Controller */
-	.word	sam3u_adc			/* Vector 16+27: 10-bit ADC Controller */
-	.word	sam3u_dmac			/* Vector 16+28: DMA Controller */
-	.word	sam3u_udphs			/* Vector 16+29: USB Device High Speed */
-	.size	sam3u_vectors, .-sam3u_vectors
+#undef VECTOR
+#define VECTOR(l,i) .word l
+
+#undef UNUSED
+#define UNUSED(i) .word stm32_reserved
+
+#if defined(CONFIG_ARCH_CHIP_SAM3U)
+#  include "chip/sam3u_vectors.h"
+#else
+#  Unrecognized SAM architecture
+#endif
+
+	.size	sam_vectors, .-sam_vectors
 
 /************************************************************************************************
  * .text
@@ -165,47 +146,28 @@ sam3u_vectors:
 	.type	handlers, function
 	.thumb_func
 handlers:
-	HANDLER	sam3u_reserved, SAM3U_IRQ_RESERVED		/* Unexpected/reserved vector */
-	HANDLER	sam3u_nmi, SAM3U_IRQ_NMI				/* Vector  2: Non-Maskable Interrupt (NMI) */
-	HANDLER	sam3u_hardfault, SAM3U_IRQ_HARDFAULT	/* Vector  3: Hard fault */
-	HANDLER	sam3u_mpu, SAM3U_IRQ_MEMFAULT			/* Vector  4: Memory management (MPU) */
-	HANDLER	sam3u_busfault, SAM3U_IRQ_BUSFAULT		/* Vector  5: Bus fault */
-	HANDLER	sam3u_usagefault, SAM3U_IRQ_USAGEFAULT	/* Vector  6: Usage fault */
-	HANDLER	sam3u_svcall, SAM3U_IRQ_SVCALL			/* Vector 11: SVC call */
-	HANDLER	sam3u_dbgmonitor, SAM3U_IRQ_DBGMONITOR	/* Vector 12: Debug Monitor */
-	HANDLER	sam3u_pendsv, SAM3U_IRQ_PENDSV			/* Vector 14: Penable system service request */
-	HANDLER	sam3u_systick, SAM3U_IRQ_SYSTICK		/* Vector 15: System tick */
-
-	HANDLER	sam3u_supc, SAM3U_IRQ_SUPC				/* Vector 16+0:  Supply Controller */
-	HANDLER	sam3u_rstc, SAM3U_IRQ_RSTC				/* Vector 16+1:  Reset Controller */
-	HANDLER	sam3u_rtc, SAM3U_IRQ_RTC				/* Vector 16+2:  Real Time Clock */
-	HANDLER	sam3u_rtt, SAM3U_IRQ_RTT				/* Vector 16+3:  Real Time Timer */
-	HANDLER	sam3u_wdt, SAM3U_IRQ_WDT				/* Vector 16+4:  Watchdog Timer */
-	HANDLER	sam3u_pmc, SAM3U_IRQ_PMC				/* Vector 16+5:  Power Management Controller */
-	HANDLER	sam3u_eefc0, SAM3U_IRQ_EEFC0			/* Vector 16+6:  Enhanced Embedded Flash Controller 0 */
-	HANDLER	sam3u_eefc1, SAM3U_IRQ_EEFC1			/* Vector 16+7:  Enhanced Embedded Flash Controller 1 */
-	HANDLER	sam3u_uart, SAM3U_IRQ_UART				/* Vector 16+8:  Universal Asynchronous Receiver Transmitter */
-	HANDLER	sam3u_smc, SAM3U_IRQ_SMC				/* Vector 16+9:  Static Memory Controller */
-	HANDLER	sam3u_pioa, SAM3U_IRQ_PIOA				/* Vector 16+10: Parallel I/O Controller A */
-	HANDLER	sam3u_piob, SAM3U_IRQ_PIOB				/* Vector 16+11: Parallel I/O Controller B */
-	HANDLER	sam3u_pioc, SAM3U_IRQ_PIOC				/* Vector 16+12: Parallel I/O Controller C */
-	HANDLER	sam3u_usart0, SAM3U_IRQ_USART0			/* Vector 16+13: USART 0 */
-	HANDLER	sam3u_usart1, SAM3U_IRQ_USART1			/* Vector 16+14: USART 1 */
-	HANDLER	sam3u_usart2, SAM3U_IRQ_USART2			/* Vector 16+15: USART 2 */
-	HANDLER	sam3u_usart3, SAM3U_IRQ_USART3			/* Vector 16+16: USART 3 */
-	HANDLER	sam3u_hsmci, SAM3U_IRQ_HSMCI			/* Vector 16+17: High Speed Multimedia Card Interface */
-	HANDLER	sam3u_twi0, SAM3U_IRQ_TWI0				/* Vector 16+18: Two-Wire Interface 0 */
-	HANDLER	sam3u_twi1, SAM3U_IRQ_TWI1				/* Vector 16+19: Two-Wire Interface 1 */
-	HANDLER	sam3u_spi, SAM3U_IRQ_SPI				/* Vector 16+20: Serial Peripheral Interface */
-	HANDLER	sam3u_ssc, SAM3U_IRQ_SSC				/* Vector 16+21: Synchronous Serial Controller */
-	HANDLER	sam3u_tc0, SAM3U_IRQ_TC0				/* Vector 16+22: Timer Counter 0 */
-	HANDLER	sam3u_tc1, SAM3U_IRQ_TC1				/* Vector 16+23: Timer Counter 1 */
-	HANDLER	sam3u_tc2, SAM3U_IRQ_TC2				/* Vector 16+24: Timer Counter 2 */
-	HANDLER	sam3u_pwm, SAM3U_IRQ_PWM				/* Vector 16+25: Pulse Width Modulation Controller */
-	HANDLER	sam3u_adc12b, SAM3U_IRQ_ADC12B			/* Vector 16+26: 12-bit ADC Controller */
-	HANDLER	sam3u_adc, SAM3U_IRQ_ADC				/* Vector 16+27: 10-bit ADC Controller */
-	HANDLER	sam3u_dmac, SAM3U_IRQ_DMAC				/* Vector 16+28: DMA Controller */
-	HANDLER	sam3u_udphs, SAM3U_IRQ_UDPHS			/* Vector 16+29: USB Device High Speed */
+	HANDLER	sam_reserved, SAM_IRQ_RESERVED		/* Unexpected/reserved vector */
+	HANDLER	sam_nmi, SAM_IRQ_NMI				/* Vector  2: Non-Maskable Interrupt (NMI) */
+	HANDLER	sam_hardfault, SAM_IRQ_HARDFAULT	/* Vector  3: Hard fault */
+	HANDLER	sam_mpu, SAM_IRQ_MEMFAULT			/* Vector  4: Memory management (MPU) */
+	HANDLER	sam_busfault, SAM_IRQ_BUSFAULT		/* Vector  5: Bus fault */
+	HANDLER	sam_usagefault, SAM_IRQ_USAGEFAULT	/* Vector  6: Usage fault */
+	HANDLER	sam_svcall, SAM_IRQ_SVCALL			/* Vector 11: SVC call */
+	HANDLER	sam_dbgmonitor, SAM_IRQ_DBGMONITOR	/* Vector 12: Debug Monitor */
+	HANDLER	sam_pendsv, SAM_IRQ_PENDSV			/* Vector 14: Penable system service request */
+	HANDLER	sam_systick, SAM_IRQ_SYSTICK		/* Vector 15: System tick */
+
+#undef VECTOR
+#define VECTOR(l,i) HANDLER l, i
+
+#undef UNUSED
+#define UNUSED(i)
+
+#if defined(CONFIG_ARCH_CHIP_SAM3U)
+#  include "chip/sam3u_vectors.h"
+#else
+#  Unrecognized SAM architecture
+#endif
 
 /* Common IRQ handling logic.  On entry here, the return stack is on either
  * the PSP or the MSP and looks like the following:
@@ -225,7 +187,7 @@ handlers:
  *      We are in handler mode and the current SP is the MSP
  */
 
-sam3u_common:
+sam_common:
 
 	/* Complete the context save */
 
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_adc.h b/nuttx/arch/arm/src/sam3u/sam3u_adc.h
deleted file mode 100644
index 4701c0c48..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_adc.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_adc.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_ADC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_ADC_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/****************************************************************************************
- * Pre-processor Definitions
- ****************************************************************************************/
-
-/* ADC register offsets ****************************************************************/
-
-#define SAM3U_ADC_CR_OFFSET          0x00 /* Control Register (Both) */
-#define SAM3U_ADC_MR_OFFSET          0x04 /* Mode Register (Both) */
-                                          /* 0x08: Reserved */
-                                          /* 0x0c: Reserved */
-#define SAM3U_ADC_CHER_OFFSET        0x10 /* Channel Enable Register (Both) */
-#define SAM3U_ADC_CHDR_OFFSET        0x14 /* Channel Disable Register (Both) */
-#define SAM3U_ADC_CHSR_OFFSET        0x18 /* Channel Status Register (Both) */
-#define SAM3U_ADC_SR_OFFSET          0x1c /* Status Register (Both) */
-#define SAM3U_ADC_LCDR_OFFSET        0x20 /* Last Converted Data Register (Both) */
-#define SAM3U_ADC_IER_OFFSET         0x24 /* Interrupt Enable Register (Both) */
-#define SAM3U_ADC_IDR_OFFSET         0x28 /* Interrupt Disable Register (Both) */
-#define SAM3U_ADC_IMR_OFFSET         0x2c /* Interrupt Mask Register (Both) */
-#define SAM3U_ADC_CDR_OFFSET(n)      (0x30+((n)<<2))
-#define SAM3U_ADC_CDR0_OFFSET        0x30 /* Channel Data Register 0 (Both) */
-#define SAM3U_ADC_CDR1_OFFSET        0x34 /* Channel Data Register 1 (Both) */
-#define SAM3U_ADC_CDR2_OFFSET        0x38 /* Channel Data Register 2 (Both) */
-#define SAM3U_ADC_CDR3_OFFSET        0x3c /* Channel Data Register 3 (Both) */
-#define SAM3U_ADC_CDR4_OFFSET        0x40 /* Channel Data Register 4 (Both) */
-#define SAM3U_ADC_CDR5_OFFSET        0x44 /* Channel Data Register 5 (Both) */
-#define SAM3U_ADC_CDR6_OFFSET        0x48 /* Channel Data Register 6 (Both) */
-#define SAM3U_ADC_CDR7_OFFSET        0x4c /* Channel Data Register 7 (Both) */
-#define SAM3U_ADC12B_ACR_OFFSET      0x64 /* Analog Control Register (ADC12B only) */
-#define SAM3U_ADC12B_EMR_OFFSET      0x68 /* Extended Mode Register (ADC12B only) */
-
-/* ADC register adresses ***************************************************************/
-
-#define SAM3U_ADC12B_CR              (SAM3U_ADC12B_BASE+SAM3U_ADC_CR_OFFSET)
-#define SAM3U_ADC12B_MR              (SAM3U_ADC12B_BASE+SAM3U_ADC_MR_OFFSET)
-#define SAM3U_ADC12B_CHER            (SAM3U_ADC12B_BASE+SAM3U_ADC_CHER_OFFSET)
-#define SAM3U_ADC12B_CHDR            (SAM3U_ADC12B_BASE+SAM3U_ADC_CHDR_OFFSET)
-#define SAM3U_ADC12B_CHSR            (SAM3U_ADC12B_BASE+SAM3U_ADC_CHSR_OFFSET)
-#define SAM3U_ADC12B_SR              (SAM3U_ADC12B_BASE+SAM3U_ADC_SR_OFFSET)
-#define SAM3U_ADC12B_LCDR_           (SAM3U_ADC12B_BASE+SAM3U_ADC_LCDR_OFFSET)
-#define SAM3U_ADC12B_IER             (SAM3U_ADC12B_BASE+SAM3U_ADC_IER_OFFSET)
-#define SAM3U_ADC12B_IDR             (SAM3U_ADC12B_BASE+SAM3U_ADC_IDR_OFFSET)
-#define SAM3U_ADC12B_IMR             (SAM3U_ADC12B_BASE+SAM3U_ADC_IMR_OFFSET)
-#define SAM3U_ADC12B_CDR(n))         (SAM3U_ADC12B_BASE+SAM3U_ADC_CDR_OFFSET(n))
-#define SAM3U_ADC12B_CDR0            (SAM3U_ADC12B_BASE+SAM3U_ADC_CDR0_OFFSET)
-#define SAM3U_ADC12B_CDR1            (SAM3U_ADC12B_BASE+SAM3U_ADC_CDR1_OFFSET)
-#define SAM3U_ADC12B_CDR2            (SAM3U_ADC12B_BASE+SAM3U_ADC_CDR2_OFFSET)
-#define SAM3U_ADC12B_CDR3            (SAM3U_ADC12B_BASE+SAM3U_ADC_CDR3_OFFSET)
-#define SAM3U_ADC12B_CDR4            (SAM3U_ADC12B_BASE+SAM3U_ADC_CDR4_OFFSET)
-#define SAM3U_ADC12B_CDR5            (SAM3U_ADC12B_BASE+SAM3U_ADC_CDR5_OFFSET)
-#define SAM3U_ADC12B_CDR6            (SAM3U_ADC12B_BASE+SAM3U_ADC_CDR6_OFFSET)
-#define SAM3U_ADC12B_CDR7            (SAM3U_ADC12B_BASE+SAM3U_ADC_CDR7_OFFSET)
-#define SAM3U_ADC12B_ACR             (SAM3U_ADC12B_BASE+SAM3U_ADC12B_ACR_OFFSET)
-#define SAM3U_ADC12B_EMR             (SAM3U_ADC12B_BASE+SAM3U_ADC12B_EMR_OFFSET)
-
-#define SAM3U_ADC_CR                 (SAM3U_ADC_BASE+SAM3U_ADC_CR_OFFSET)
-#define SAM3U_ADC_MR                 (SAM3U_ADC_BASE+SAM3U_ADC_MR_OFFSET)
-#define SAM3U_ADC_CHER               (SAM3U_ADC_BASE+SAM3U_ADC_CHER_OFFSET)
-#define SAM3U_ADC_CHDR               (SAM3U_ADC_BASE+SAM3U_ADC_CHDR_OFFSET)
-#define SAM3U_ADC_CHSR               (SAM3U_ADC_BASE+SAM3U_ADC_CHSR_OFFSET)
-#define SAM3U_ADC_SR                 (SAM3U_ADC_BASE+SAM3U_ADC_SR_OFFSET)
-#define SAM3U_ADC_LCDR               (SAM3U_ADC_BASE+SAM3U_ADC_LCDR_OFFSET)
-#define SAM3U_ADC_IER                (SAM3U_ADC_BASE+SAM3U_ADC_IER_OFFSET)
-#define SAM3U_ADC_IDR                (SAM3U_ADC_BASE+SAM3U_ADC_IDR_OFFSET)
-#define SAM3U_ADC_IMR                (SAM3U_ADC_BASE+SAM3U_ADC_IMR_OFFSET)
-#define SAM3U_ADC_CDR(n))            (SAM3U_ADC_BASE+SAM3U_ADC_CDR_OFFSET(n))
-#define SAM3U_ADC_CDR0               (SAM3U_ADC_BASE+SAM3U_ADC_CDR0_OFFSET)
-#define SAM3U_ADC_CDR1               (SAM3U_ADC_BASE+SAM3U_ADC_CDR1_OFFSET)
-#define SAM3U_ADC_CDR2               (SAM3U_ADC_BASE+SAM3U_ADC_CDR2_OFFSET)
-#define SAM3U_ADC_CDR3               (SAM3U_ADC_BASE+SAM3U_ADC_CDR3_OFFSET)
-#define SAM3U_ADC_CDR4               (SAM3U_ADC_BASE+SAM3U_ADC_CDR4_OFFSET)
-#define SAM3U_ADC_CDR5               (SAM3U_ADC_BASE+SAM3U_ADC_CDR5_OFFSET)
-#define SAM3U_ADC_CDR6               (SAM3U_ADC_BASE+SAM3U_ADC_CDR6_OFFSET)
-#define SAM3U_ADC_CDR7               (SAM3U_ADC_BASE+SAM3U_ADC_CDR7_OFFSET)
-
-/* ADC register bit definitions ********************************************************/
-
-/* ADC12B Control Register and ADC(10B) Control Register common bit-field definitions */
-
-#define ADC_CR_SWRST                 (1 << 0)  /* Bit 0:  Software Reset */
-#define ADC_CR_START                 (1 << 1)  /* Bit 1:  Start Conversion */
-
-/* ADC12B Mode Register and ADC(10B) Mode Register common bit-field definitions */
-
-#define ADC_MR_TRGEN                 (1 << 0)  /* Bit 0:  Trigger Enable */
-#define ADC_MR_TRGSEL_SHIFT          (1)       /* Bits 1-3: Trigger Selection */
-#define ADC_MR_TRGSEL_MASK           (7 << ADC_MR_TRGSEL_SHIFT)
-#define ADC_MR_LOWRES                (1 << 4)  /* Bit 4:  Resolution */
-#define ADC_MR_SLEEP                 (1 << 5)  /* Bit 5:  Sleep Mode */
-#define ADC_MR_PRESCAL_SHIFT         (8)       /* Bits 8-15: Prescaler Rate Selection */
-#define ADC_MR_PRESCAL_MASK          (0xff << ADC_MR_PRESCAL_SHIFT)
-#define ADB12B_MRSTARTUP_SHIFT       (16)      /* Bits 16-23: Start Up Time (ADC12B) */
-#define ADB12B_MRSTARTUP_MASK        (0xff << ADB12B_MRSTARTUP_SHIFT
-#define ADB10B_MRSTARTUP_SHIFT       (16)      /* Bits 16-22: Start Up Time (ADC10B) */
-#define ADB10B_MRSTARTUP_MASK        (0x7f << ADB10B_MRSTARTUP_SHIFT)
-#define ADC_MR_SHTIM_SHIFT           (24)      /* Bits 24-27: Sample & Hold Time */
-#define ADC_MR_SHTIM_MASK            (15 << ADC_MR_SHTIM_SHIFT)
-
-/* ADC12B Channel Enable Register, ADC12B Channel Disable Register, ADC12B Channel
- * Status Register, ADC(10B) Channel Enable Register, ADC(10B) Channel Disable Register,
- * and ADC(10B) Channel Status Register common bit-field definitions
- */
-
-#define ADC_CH(n)                    (1 << (n))
-#define ADC_CH0                      (1 << 0)  /* Bit 0:  Channel x Enable */
-#define ADC_CH1                      (1 << 1)  /* Bit 1:  Channel x Enable */
-#define ADC_CH2                      (1 << 2)  /* Bit 2:  Channel x Enable */
-#define ADC_CH3                      (1 << 3)  /* Bit 3:  Channel x Enable */
-#define ADC_CH4                      (1 << 4)  /* Bit 4:  Channel x Enable */
-#define ADC_CH5                      (1 << 5)  /* Bit 5:  Channel x Enable */
-#define ADC_CH6                      (1 << 6)  /* Bit 6:  Channel x Enable */
-#define ADC_CH7                      (1 << 7)  /* Bit 7:  Channel x Enable */
-
-/* ADC12B Analog Control Register (ADC12B only) */
-
-#define ADC12B_ACR_GAIN_SHIFT        (0)       /* Bits 0-1: Input Gain */
-#define ADC12B_ACR_GAIN_MASK         (3 << ADC12B_ACR_GAIN_SHIFT)
-#define ADC12B_ACR_IBCTL_SHIFT       (8)       /* Bits 8-9: Bias Current Control */
-#define ADC12B_ACR_IBCTL_MASK        (3 << ADC12B_ACR_IBCTL_SHIFT)
-#define ADC12B_ACR_DIFF              (1 << 16) /* Bit 16: Differential Mode */
-#define ADC12B_ACR_OFFSET            (1 << 17) /* Bit 17: Input OFFSET */
-
-/* ADC12B Extended Mode Register (ADC12B only) */
-
-#define ADC12B_EMR_OFFMODES          (1 << 0)  /* Bit 0:  Off Mode if Sleep Bit (ADC12B_MR) = 1 */
-#define ADC12B_EMR_OFFMSTIME_SHIFT   (16)      /* Bits 16-23: Startup Time */
-#define ADC12B_EMR_OFFMSTIME_MASK    (0xff << ADC12B_EMR_OFFMSTIME_SHIFT)
-
-/* ADC12B Status Register , ADC12B Interrupt Enable Register, ADC12B Interrupt
- * Disable Register, ADC12B Interrupt Mask Register, ADC(10B) Status Register,
- * ADC(10B) Interrupt Enable Register, ADC(10B) Interrupt Disable Register, and
- * ADC(10B) Interrupt Mask Register common bit-field definitions
- */
-
-#define ADC_INT_EOC(n)               (1<<(n))
-#define ADC_INT_EOC0                 (1 << 0)  /* Bit 0:  End of Conversion 0 */
-#define ADC_INT_EOC1                 (1 << 1)  /* Bit 1:  End of Conversion 1 */
-#define ADC_INT_EOC2                 (1 << 2)  /* Bit 2:  End of Conversion 2 */
-#define ADC_INT_EOC3                 (1 << 3)  /* Bit 3:  End of Conversion 3 */
-#define ADC_INT_EOC4                 (1 << 4)  /* Bit 4:  End of Conversion 4 */
-#define ADC_INT_EOC5                 (1 << 5)  /* Bit 5:  End of Conversion 5 */
-#define ADC_INT_EOC6                 (1 << 6)  /* Bit 6:  End of Conversion 6 */
-#define ADC_INT_EOC7                 (1 << 7)  /* Bit 0:  End of Conversion 7 */
-#define ADC_INT_OVRE(n)              (1<<((n)+8))
-#define ADC_INT_OVRE0                (1 << 8)  /* Bit 8:  Overrun Error 0 */
-#define ADC_INT_OVRE1                (1 << 9)  /* Bit 9:  Overrun Error 1 */
-#define ADC_INT_OVRE2                (1 << 10) /* Bit 10: Overrun Error 2 */
-#define ADC_INT_OVRE3                (1 << 11) /* Bit 11: Overrun Error 3 */
-#define ADC_INT_OVRE4                (1 << 12) /* Bit 12: Overrun Error 4 */
-#define ADC_INT_OVRE5                (1 << 13) /* Bit 13: Overrun Error 5 */
-#define ADC_INT_OVRE6                (1 << 14) /* Bit 14: Overrun Error 6 */
-#define ADC_INT_OVRE7                (1 << 15) /* Bit 15: Overrun Error 7 */
-#define ADC_INT_DRDY                 (1 << 16) /* Bit 16: Data Ready */
-#define ADC_INT_GOVRE                (1 << 17) /* Bit 17: General Overrun Error */
-#define ADC_INT_ENDRX                (1 << 18) /* Bit 18: End of RX Buffer */
-#define ADC_INT_RXBUFF               (1 << 19) /* Bit 19: RX Buffer Full */
-
-/* ADC12B Last Converted Data Register */
-
-#define ADC12B_LCDR_DATA_SHIFT       (0)       /* Bits 0-11: Last Data Converted */
-#define ADC12B_LCDR_DATA_MASK        (0xfff << ADC12B_LCDR_DATA_SHIFT)
-
-/* ADC(10B) Last Converted Data Register */
-
-#define ADC10B_LCDR_DATA_SHIFT       (0)       /* Bits 0-9: Last Data Converted */
-#define ADC10B_LCDR_DATA_MASK        (0x1ff << ADC10B_LCDR_DATA_SHIFT)
-
-/* ADC12B Channel Data Register */
-
-#define ADC12B_CDR_DATA_SHIFT        (0)       /* Bits 0-11: Converted Data */
-#define ADC12B_CDR_DATA_MASK         (0xfff << ADC12B_CDR_DATA_SHIFT)
-
-/* ADC(10B) Channel Data Register */
-
-#define ADC10B_CDR_DATA_SHIFT        (0)       /* Bits 0-9: Converted Data */
-#define ADC10B_CDR_DATA_MASK         (0x1ff << ADC10B_CDR_DATA_SHIFT)
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Functions
- ****************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_ADC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_eefc.h b/nuttx/arch/arm/src/sam3u/sam3u_eefc.h
deleted file mode 100644
index d32c6670b..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_eefc.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_eefc.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_EEFC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_EEFC_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/****************************************************************************************
- * Pre-processor Definitions
- ****************************************************************************************/
-
-/* EEFC register offsets ****************************************************************/
-
-#define SAM3U_EEFC_FMR_OFFSET          0x00 /* EEFC Flash Mode Register */
-#define SAM3U_EEFC_FCR_OFFSET          0x04 /* EEFC Flash Command Register */
-#define SAM3U_EEFC_FSR_OFFSET          0x08 /* EEFC Flash Status Register */
-#define SAM3U_EEFC_FRR_OFFSET          0x0c /* EEFC Flash Result Register */
-
-/* EEFC register adresses ***************************************************************/
-
-#define SAM3U_EEFC_FMR(n)              (SAM3U_EEFCN_BASE(n)+SAM3U_EEFC_FMR_OFFSET)
-#define SAM3U_EEFC_FCR(n)              (SAM3U_EEFCN_BASE(n)+SAM3U_EEFC_FCR_OFFSET)
-#define SAM3U_EEFC_FSR(n)              (SAM3U_EEFCN_BASE(n)+SAM3U_EEFC_FSR_OFFSET)
-#define SAM3U_EEFC_FRR(n)              (SAM3U_EEFCN_BASE(n)+SAM3U_EEFC_FRR_OFFSET)
-
-#define SAM3U_EEFC0_FMR                (SAM3U_EEFC0_BASE+SAM3U_EEFC_FMR_OFFSET)
-#define SAM3U_EEFC0_FCR                (SAM3U_EEFC0_BASE+SAM3U_EEFC_FCR_OFFSET)
-#define SAM3U_EEFC0_FSR                (SAM3U_EEFC0_BASE+SAM3U_EEFC_FSR_OFFSET)
-#define SAM3U_EEFC0_FRR                (SAM3U_EEFC0_BASE+SAM3U_EEFC_FRR_OFFSET)
-
-#define SAM3U_EEFC1_FMR                (SAM3U_EEFC1_BASE+SAM3U_EEFC_FMR_OFFSET)
-#define SAM3U_EEFC1_FCR                (SAM3U_EEFC1_BASE+SAM3U_EEFC_FCR_OFFSET)
-#define SAM3U_EEFC1_FSR                (SAM3U_EEFC1_BASE+SAM3U_EEFC_FSR_OFFSET)
-#define SAM3U_EEFC1_FRR                (SAM3U_EEFC1_BASE+SAM3U_EEFC_FRR_OFFSET)
-
-/* EEFC register bit definitions ********************************************************/
-
-#define EEFC_FMR_FRDY                  (1 << 0)  /* Bit 0:  Ready Interrupt Enable */
-#define EEFC_FMR_FWS_SHIFT             (8)       /* Bits 8-11:  Flash Wait State */
-#define EEFC_FMR_FWS_MASK              (15 << EEFC_FMR_FWS_SHIFT)
-#define EEFC_FMR_FAM                   (1 << 24) /* Bit 24: Flash Access Mode */
-
-#define EEFC_FCR_FCMD_SHIFT            (0)       /* Bits 0-7:  Flash Command */
-#define EEFC_FCR_FCMD_MASK             (0xff << EEFC_FCR_FCMD_SHIFT)
-#  define EEFC_FCR_FCMD_GETD           (0  << EEFC_FCR_FCMD_SHIFT) /* Get Flash Descriptor */
-#  define EEFC_FCR_FCMD_WP             (1  << EEFC_FCR_FCMD_SHIFT) /* Write page */
-#  define EEFC_FCR_FCMD_WPL            (2  << EEFC_FCR_FCMD_SHIFT) /* Write page and lock */
-#  define EEFC_FCR_FCMD_EWP            (3  << EEFC_FCR_FCMD_SHIFT) /* Erase page and write page */
-#  define EEFC_FCR_FCMD_EWPL           (4  << EEFC_FCR_FCMD_SHIFT) /* Erase page and write page then lock */
-#  define EEFC_FCR_FCMD_EA             (5  << EEFC_FCR_FCMD_SHIFT) /* Erase all */
-#  define EEFC_FCR_FCMD_SLB            (8  << EEFC_FCR_FCMD_SHIFT) /* Set Lock Bit */
-#  define EEFC_FCR_FCMD_CLB            (9  << EEFC_FCR_FCMD_SHIFT) /* Clear Lock Bit */
-#  define EEFC_FCR_FCMD_GLB            (10 << EEFC_FCR_FCMD_SHIFT) /* Get Lock Bit */
-#  define EEFC_FCR_FCMD_SGPB           (11 << EEFC_FCR_FCMD_SHIFT) /* Set GPNVM Bit */
-#  define EEFC_FCR_FCMD_CGPB           (12 << EEFC_FCR_FCMD_SHIFT) /* Clear GPNVM Bit */
-#  define EEFC_FCR_FCMD_GGPB           (13 << EEFC_FCR_FCMD_SHIFT) /* Get GPNVM Bit */
-#  define EEFC_FCR_FCMD_STUI           (14 << EEFC_FCR_FCMD_SHIFT) /* Start Read Unique Identifier */
-#  define EEFC_FCR_FCMD_SPUI           (15 << EEFC_FCR_FCMD_SHIFT) /* Stop Read Unique Identifier */
-#define EEFC_FCR_FARG_SHIFT            (8)       /* Bits 8-23:  Flash Command Argument */
-#define EEFC_FCR_FARG_MASK             (0xffff << EEFC_FCR_FARG_SHIFT)
-#define EEFC_FCR_FKEY_SHIFT            (24)      /* Bits 24-31:  Flash Writing Protection Key */
-#define EEFC_FCR_FKEY__MASK            (0xff << EEFC_FCR_FKEY_SHIFT)
-
-#define EEFC_FSR_FRDY                  (1 << 0)  /* Bit 0:  Flash Ready Status */
-#define EEFC_FSR_FCMDE                 (1 << 1)  /* Bit 1:  Flash Command Error Status */
-#define EEFC_FSR_FLOCKE                (1 << 2)  /* Bit 2:  Flash Lock Error Status */
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Functions
- ****************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_EEFC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.h b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.h
deleted file mode 100644
index 1667789a6..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_hsmci.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_HSMCI_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_HSMCI_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/****************************************************************************************
- * Pre-processor Definitions
- ****************************************************************************************/
-
-/* HSMCI register offsets ***************************************************************/
-
-#define SAM3U_HSMCI_CR_OFFSET       0x0000 /* Control Register */
-#define SAM3U_HSMCI_MR_OFFSET       0x0004 /* Mode Register */
-#define SAM3U_HSMCI_DTOR_OFFSET     0x0008 /* Data Timeout Register */
-#define SAM3U_HSMCI_SDCR_OFFSET     0x000c /* SD/SDIO Card Register */
-#define SAM3U_HSMCI_ARGR_OFFSET     0x0010 /* Argument Register */
-#define SAM3U_HSMCI_CMDR_OFFSET     0x0014 /* Command Register */
-#define SAM3U_HSMCI_BLKR_OFFSET     0x0018 /* Block Register */
-#define SAM3U_HSMCI_CSTOR_OFFSET    0x001c /* Completion Signal Timeout Register */
-#define SAM3U_HSMCI_RSPR0_OFFSET    0x0020 /* Response Register 0 */
-#define SAM3U_HSMCI_RSPR1_OFFSET    0x0024 /* Response Register 1 */
-#define SAM3U_HSMCI_RSPR2_OFFSET    0x0028 /* Response Register 2 */
-#define SAM3U_HSMCI_RSPR3_OFFSET    0x002c /* Response Register 3 */
-#define SAM3U_HSMCI_RDR_OFFSET      0x0030 /* Receive Data Register */
-#define SAM3U_HSMCI_TDR_OFFSET      0x0034 /* Transmit Data Register  */
-                                           /* 0x0038-0x003c: Reserved */
-#define SAM3U_HSMCI_SR_OFFSET       0x0040 /* Status Register */
-#define SAM3U_HSMCI_IER_OFFSET      0x0044 /* Interrupt Enable Register */
-#define SAM3U_HSMCI_IDR_OFFSET      0x0048 /* Interrupt Disable Register */
-#define SAM3U_HSMCI_IMR_OFFSET      0x004c /* Interrupt Mask Register */
-#define SAM3U_HSMCI_DMA_OFFSET      0x0050 /* DMA Configuration Register */
-#define SAM3U_HSMCI_CFG_OFFSET      0x0054 /* Configuration Register */
-                                           /* 0x0058-0x00e0: Reserved */
-#define SAM3U_HSMCI_WPMR_OFFSET     0x00e4 /* Write Protection Mode Register */
-#define SAM3U_HSMCI_WPSR_OFFSET     0x00e8 /* Write Protection Status Register */
-                                           /* 0x00ec-0x00fc: Reserved */
-                                           /* 0x0100-0x0124: Reserved */
-#define SAM3U_HSMCI_FIFO_OFFSET     0x0200 /* 0x0200-0x3ffc FIFO Memory Aperture */
-
-/* HSMCI register adresses **************************************************************/
-
-#define SAM3U_HSMCI_CR              (SAM3U_MCI_BASE+SAM3U_HSMCI_CR_OFFSET)
-#define SAM3U_HSMCI_MR              (SAM3U_MCI_BASE+SAM3U_HSMCI_MR_OFFSET)
-#define SAM3U_HSMCI_DTOR            (SAM3U_MCI_BASE+SAM3U_HSMCI_DTOR_OFFSET)
-#define SAM3U_HSMCI_SDCR            (SAM3U_MCI_BASE+SAM3U_HSMCI_SDCR_OFFSET)
-#define SAM3U_HSMCI_ARGR            (SAM3U_MCI_BASE+SAM3U_HSMCI_ARGR_OFFSET)
-#define SAM3U_HSMCI_CMDR            (SAM3U_MCI_BASE+SAM3U_HSMCI_CMDR_OFFSET)
-#define SAM3U_HSMCI_BLKR            (SAM3U_MCI_BASE+SAM3U_HSMCI_BLKR_OFFSET)
-#define SAM3U_HSMCI_CSTOR           (SAM3U_MCI_BASE+SAM3U_HSMCI_CSTOR_OFFSET)
-#define SAM3U_HSMCI_RSPR0           (SAM3U_MCI_BASE+SAM3U_HSMCI_RSPR0_OFFSET)
-#define SAM3U_HSMCI_RSPR1           (SAM3U_MCI_BASE+SAM3U_HSMCI_RSPR1_OFFSET)
-#define SAM3U_HSMCI_RSPR2           (SAM3U_MCI_BASE+SAM3U_HSMCI_RSPR2_OFFSET)
-#define SAM3U_HSMCI_RSPR3           (SAM3U_MCI_BASE+SAM3U_HSMCI_RSPR3_OFFSET)
-#define SAM3U_HSMCI_RDR             (SAM3U_MCI_BASE+SAM3U_HSMCI_RDR_OFFSET)
-#define SAM3U_HSMCI_TDR             (SAM3U_MCI_BASE+SAM3U_HSMCI_TDR_OFFSET)
-#define SAM3U_HSMCI_SR              (SAM3U_MCI_BASE+SAM3U_HSMCI_SR_OFFSET)
-#define SAM3U_HSMCI_IER             (SAM3U_MCI_BASE+SAM3U_HSMCI_IER_OFFSET)
-#define SAM3U_HSMCI_IDR             (SAM3U_MCI_BASE+SAM3U_HSMCI_IDR_OFFSET)
-#define SAM3U_HSMCI_IMR             (SAM3U_MCI_BASE+SAM3U_HSMCI_IMR_OFFSET)
-#define SAM3U_HSMCI_DMA             (SAM3U_MCI_BASE+SAM3U_HSMCI_DMA_OFFSET)
-#define SAM3U_HSMCI_CFG             (SAM3U_MCI_BASE+SAM3U_HSMCI_CFG_OFFSET)
-#define SAM3U_HSMCI_WPMR            (SAM3U_MCI_BASE+SAM3U_HSMCI_WPMR_OFFSET)
-#define SAM3U_HSMCI_WPSR            (SAM3U_MCI_BASE+SAM3U_HSMCI_WPSR_OFFSET)
-#define SAM3U_HSMCI_FIFO            (SAM3U_MCI_BASE+SAM3U_HSMCI_FIFO_OFFSET)
-
-/* HSMCI register bit definitions *******************************************************/
-
-/* HSMCI Control Register */
-
-#define HSMCI_CR_MCIEN              (1 << 0)  /* Bit 0:  Multi-Media Interface Enable */
-#define HSMCI_CR_MCIDIS             (1 << 1)  /* Bit 1:  Multi-Media Interface Disable */
-#define HSMCI_CR_PWSEN              (1 << 2)  /* Bit 2:  Power Save Mode Enable */
-#define HSMCI_CR_PWSDIS             (1 << 3)  /* Bit 3:  Power Save Mode Disable */
-#define HSMCI_CR_SWRST              (1 << 7)  /* Bit 7:  Software Reset */
-
-/* HSMCI Mode Register */
-
-#define HSMCI_MR_CLKDIV_SHIFT       (0)       /* Bits 0-7: Clock Divider */
-#define HSMCI_MR_CLKDIV_MASK        (0xff << HSMCI_MR_CLKDIV_SHIFT)
-#define HSMCI_MR_PWSDIV_SHIFT       (8)       /* Bits 8-10: Power Saving Divider */
-#define HSMCI_MR_PWSDIV_MASK        (7 << HSMCI_MR_PWSDIV_SHIFT)
-#  define HSMCI_MR_PWSDIV_MAX       (7 << HSMCI_MR_PWSDIV_SHIFT)
-#define HSMCI_MR_RDPROOF            (1 << 11) /* Bit 11: Read Proof Enable */
-#define HSMCI_MR_WRPROOF            (1 << 12) /* Bit 12: Write Proof Enable */
-#define HSMCI_MR_FBYTE              (1 << 13) /* Bit 13: Force Byte Transfer */
-#define HSMCI_MR_PADV               (1 << 14) /* Bit 14: Padding Value */
-#define HSMCI_MR_BLKLEN_SHIFT       (16)      /* Bits 16-31: Data Block Length */
-#define HSMCI_MR_BLKLEN_MASK        (0xffff << HSMCI_MR_BLKLEN_SHIFT)
-
-/* HSMCI Data Timeout Register */
-
-#define HSMCI_DTOR_DTOCYC_SHIFT     (0)       /* Bits 0-3: Data Timeout Cycle Number */
-#define HSMCI_DTOR_DTOCYC_MASK      (15 << HSMCI_DTOR_DTOCYC_SHIFT)
-#  define HSMCI_DTOR_DTOCYC_MAX     (15 << HSMCI_DTOR_DTOCYC_SHIFT)
-#define HSMCI_DTOR_DTOMUL_SHIFT     (4)       /* Bits 4-6: Data Timeout Multiplier */
-#define HSMCI_DTOR_DTOMUL_MASK      (7 << HSMCI_DTOR_DTOMUL_SHIFT)
-#  define HSMCI_DTOR_DTOMUL_1       (0 << HSMCI_DTOR_DTOMUL_SHIFT)
-#  define HSMCI_DTOR_DTOMUL_16      (1 << HSMCI_DTOR_DTOMUL_SHIFT)
-#  define HSMCI_DTOR_DTOMUL_128     (2 << HSMCI_DTOR_DTOMUL_SHIFT)
-#  define HSMCI_DTOR_DTOMUL_256     (3 << HSMCI_DTOR_DTOMUL_SHIFT)
-#  define HSMCI_DTOR_DTOMUL_1024    (4 << HSMCI_DTOR_DTOMUL_SHIFT)
-#  define HSMCI_DTOR_DTOMUL_4096    (5 << HSMCI_DTOR_DTOMUL_SHIFT)
-#  define HSMCI_DTOR_DTOMUL_65536   (6 << HSMCI_DTOR_DTOMUL_SHIFT)
-#  define HSMCI_DTOR_DTOMUL_1048576 (7 << HSMCI_DTOR_DTOMUL_SHIFT)
-#  define HSMCI_DTOR_DTOMUL_MAX     (7 << HSMCI_DTOR_DTOMUL_SHIFT)
-
-/* HSMCI SDCard/SDIO Register */
-
-#define HSMCI_SDCR_SDCSEL_SHIFT     (0)       /* Bits 0-1: SDCard/SDIO Slot */
-#define HSMCI_SDCR_SDCSEL_MASK      (3 << HSMCI_SDCR_SDCSEL_SHIFT)
-#  define HSMCI_SDCR_SDCSEL_SLOTA   (0 << HSMCI_SDCR_SDCSEL_SHIFT)
-#define HSMCI_SDCR_SDCBUS_SHIFT     (6)       /* Bits 6-7: SDCard/SDIO Bus Width */
-#define HSMCI_SDCR_SDCBUS_MASK      (3 << HSMCI_SDCR_SDCBUS_SHIFT)
-#  define HSMCI_SDCR_SDCBUS_1BIT    (0 << HSMCI_SDCR_SDCBUS_SHIFT)
-#  define HSMCI_SDCR_SDCBUS_4BIT    (2 << HSMCI_SDCR_SDCBUS_SHIFT)
-#  define HSMCI_SDCR_SDCBUS_8BIT    (3 << HSMCI_SDCR_SDCBUS_SHIFT)
-
-/* HSMCI Command Register */
-
-#define HSMCI_CMDR_CMDNB_SHIFT      (0)       /* Bits 0-5: Command Number */
-#define HSMCI_CMDR_CMDNB_MASK       (63 << HSMCI_CMDR_CMDNB_SHIFT)
-#define HSMCI_CMDR_RSPTYP_SHIFT     (6)       /* Bits 6-7: Response Type */
-#define HSMCI_CMDR_RSPTYP_MASK      (3 << HSMCI_CMDR_RSPTYP_SHIFT)
-#  define HSMCI_CMDR_RSPTYP_NONE    (0 << HSMCI_CMDR_RSPTYP_SHIFT) /* No response */
-#  define HSMCI_CMDR_RSPTYP_48BIT   (1 << HSMCI_CMDR_RSPTYP_SHIFT) /* 48-bit response */
-#  define HSMCI_CMDR_RSPTYP_136BIT  (2 << HSMCI_CMDR_RSPTYP_SHIFT) /* 136-bit response */
-#  define HSMCI_CMDR_RSPTYP_R1B     (3 << HSMCI_CMDR_RSPTYP_SHIFT) /* R1b response type */
-#define HSMCI_CMDR_SPCMD_SHIFT      (8)       /* Bits 8-10: Special Command */
-#define HSMCI_CMDR_SPCMD_MASK       (7 << HSMCI_CMDR_SPCMD_SHIFT)
-#  define HSMCI_CMDR_SPCMD_NORMAL   (0 << HSMCI_CMDR_SPCMD_SHIFT) /* Not a special CMD */
-#  define HSMCI_CMDR_SPCMD_INIT     (1 << HSMCI_CMDR_SPCMD_SHIFT) /* Initialization CMD */
-#  define HSMCI_CMDR_SPCMD_SYNC     (2 << HSMCI_CMDR_SPCMD_SHIFT) /* Synchronized CMD */
-#  define HSMCI_CMDR_SPCMD_CEATAC   (3 << HSMCI_CMDR_SPCMD_SHIFT) /* CE-ATA Completion Signal disable CMD */
-#  define HSMCI_CMDR_SPCMD_INTCMD   (4 << HSMCI_CMDR_SPCMD_SHIFT) /* Interrupt command */
-#  define HSMCI_CMDR_SPCMD_INTRESP  (5 << HSMCI_CMDR_SPCMD_SHIFT) /* Interrupt response */
-#  define HSMCI_CMDR_SPCMD_BOOTOP   (6 << HSMCI_CMDR_SPCMD_SHIFT) /* Boot Operation Request */
-#  define HSMCI_CMDR_SPCMD_BOOTEND  (7 << HSMCI_CMDR_SPCMD_SHIFT) /* End Boot Operation */
-#define HSMCI_CMDR_OPDCMD           (1 << 11) /* Bit 11: Open Drain Command */
-#define HSMCI_CMDR_MAXLAT           (1 << 12) /* Bit 12: Max Latency for Command to Response */
-#define HSMCI_CMDR_TRCMD_SHIFT      (16)      /* Bits 16-17: Transfer Command */
-#define HSMCI_CMDR_TRCMD_MASK       (3 << HSMCI_CMDR_TRCMD_SHIFT)
-#  define HSMCI_CMDR_TRCMD_NONE     (0 << HSMCI_CMDR_TRCMD_SHIFT) /* No data transfer */
-#  define HSMCI_CMDR_TRCMD_START    (1 << HSMCI_CMDR_TRCMD_SHIFT) /* Start data transfer */
-#  define HSMCI_CMDR_TRCMD_STOP     (2 << HSMCI_CMDR_TRCMD_SHIFT) /* Stop data transfer */
-#define HSMCI_CMDR_TRDIR            (1 << 18) /* Bit 18: Transfer Direction */
-#  define HSMCI_CMDR_TRDIR_WRITE    (0 << 18)
-#  define HSMCI_CMDR_TRDIR_READ     (1 << 18)
-#define HSMCI_CMDR_TRTYP_SHIFT      (19)      /* Bits 19-21: Transfer Type */
-#define HSMCI_CMDR_TRTYP_MASK       (7 << HSMCI_CMDR_TRTYP_SHIFT)
-#  define HSMCI_CMDR_TRTYP_SINGLE   (0 << HSMCI_CMDR_TRTYP_SHIFT) /* MMC/SDCard Single Block */
-#  define HSMCI_CMDR_TRTYP_MULTI    (1 << HSMCI_CMDR_TRTYP_SHIFT) /* MMC/SDCard Multiple Block */
-#  define HSMCI_CMDR_TRTYP_STREAM   (2 << HSMCI_CMDR_TRTYP_SHIFT) /* MMC Stream */
-#  define HSMCI_CMDR_TRTYP_SDIOBYTE (4 << HSMCI_CMDR_TRTYP_SHIFT) /* SDIO Byte */
-#  define HSMCI_CMDR_TRTYP_SDIOBLK  (5 << HSMCI_CMDR_TRTYP_SHIFT) /* SDIO Block */
-#define HSMCI_CMDR_IOSPCMD_SHIFT    (24)      /* Bits 24-25: SDIO Special Command */
-#define HSMCI_CMDR_IOSPCMD_MASK     (3 << HSMCI_CMDR_IOSPCMD_SHIFT)
-#  define HSMCI_CMDR_IOSPCMD_NORMAL (0 << HSMCI_CMDR_IOSPCMD_SHIFT) /* Not an SDIO Special Command */
-#  define HSMCI_CMDR_IOSPCMD_SUSP   (1 << HSMCI_CMDR_IOSPCMD_SHIFT) /* SDIO Suspend Command */
-#  define HSMCI_CMDR_IOSPCMD_RESUME (2 << HSMCI_CMDR_IOSPCMD_SHIFT) /* SDIO Resume Command */
-#define HSMCI_CMDR_ATACS            (1 << 26) /* Bit 26: ATA with Command Completion Signal */
-#define HSMCI_CMDR_BOOTACK          (1 << 17) /* Bit 27: Boot Operation Acknowledge */
-
-/* HSMCI Block Register */
-
-#define HSMCI_BLKR_BCNT_SHIFT       (0)       /* Bits 0-15: MMC/SDIO Block Count - SDIO Byte Count */
-#define HSMCI_BLKR_BCNT_MASK        (0xffff << HSMCI_BLKR_BCNT_SHIFT)
-#define HSMCI_BLKR_BLKLEN_SHIFT     (16)      /* Bits 16-31: Data Block Length */
-#define HSMCI_BLKR_BLKLEN_MASK      (0xffff << HSMCI_BLKR_BLKLEN_SHIFT)
-
-/* HSMCI Completion Signal Timeout Register */
-
-#define HSMCI_CSTOR_CSTOCYC_SHIFT   (0)       /* Bits 0-3: Completion Signal Timeout Cycle Number */
-#define HSMCI_CSTOR_CSTOCYC_MASK    (15 << HSMCI_CSTOR_CSTOCYC_SHIFT)
-#define HSMCI_CSTOR_CSTOMUL_SHIFT   (4)       /* Bits 4-6: Completion Signal Timeout Multiplier */
-#define HSMCI_CSTOR_CSTOMUL_MASK    (7 << HSMCI_CSTOR_CSTOMUL_SHIFT)
-#  define HSMCI_CSTOR_CSTOMUL_1       (0 << HSMCI_CSTOR_CSTOMUL_SHIFT)
-#  define HSMCI_CSTOR_CSTOMUL_16      (1 << HSMCI_CSTOR_CSTOMUL_SHIFT)
-#  define HSMCI_CSTOR_CSTOMUL_128     (2 << HSMCI_CSTOR_CSTOMUL_SHIFT)
-#  define HSMCI_CSTOR_CSTOMUL_256     (3 << HSMCI_CSTOR_CSTOMUL_SHIFT)
-#  define HSMCI_CSTOR_CSTOMUL_1024    (4 << HSMCI_CSTOR_CSTOMUL_SHIFT)
-#  define HSMCI_CSTOR_CSTOMUL_4096    (5 << HSMCI_CSTOR_CSTOMUL_SHIFT)
-#  define HSMCI_CSTOR_CSTOMUL_65536   (6 << HSMCI_CSTOR_CSTOMUL_SHIFT)
-#  define HSMCI_CSTOR_CSTOMUL_1048576 (7 << HSMCI_CSTOR_CSTOMUL_SHIFT)
-
-/* HSMCI Status Register, HSMCI Interrupt Enable Register, HSMCI Interrupt Disable
- * Register, and HSMCI Interrupt Mask Register common bit-field definitions
- */
-
-#define HSMCI_INT_CMDRDY            (1 << 0)  /* Bit 0:  Command Ready */
-#define HSMCI_INT_RXRDY             (1 << 1)  /* Bit 1:  Receiver Ready */
-#define HSMCI_INT_TXRDY             (1 << 2)  /* Bit 2:  Transmit Ready */
-#define HSMCI_INT_BLKE              (1 << 3)  /* Bit 3:  Data Block Ended */
-#define HSMCI_INT_DTIP              (1 << 4)  /* Bit 4:  Data Transfer in Progress */
-#define HSMCI_INT_NOTBUSY           (1 << 5)  /* Bit 6:  HSMCI Not Busy */
-#define HSMCI_INT_SDIOIRQA          (1 << 8)  /* Bit 8:  SDIO Interrupt for Slot A */
-#define HSMCI_INT_SDIOWAIT          (1 << 12) /* Bit 12: SDIO Read Wait Operation Status */
-#define HSMCI_INT_CSRCV             (1 << 13) /* Bit 13: CE-ATA Completion Signal Received */
-#define HSMCI_INT_RINDE             (1 << 16) /* Bit 16: Response Index Error */
-#define HSMCI_INT_RDIRE             (1 << 17) /* Bit 17: Response Direction Error */
-#define HSMCI_INT_RCRCE             (1 << 18) /* Bit 18: Response CRC Error */
-#define HSMCI_INT_RENDE             (1 << 19) /* Bit 19: Response End Bit Error */
-#define HSMCI_INT_RTOE              (1 << 20) /* Bit 20: Response Time-out */
-#define HSMCI_INT_DCRCE             (1 << 21) /* Bit 21: Data CRC Error */
-#define HSMCI_INT_DTOE              (1 << 22) /* Bit 22: Data Time-out Error */
-#define HSMCI_INT_CSTOE             (1 << 23) /* Bit 23: Completion Signal Time-out Error */
-#define HSMCI_INT_BLKOVRE           (1 << 24) /* Bit 24: DMA Block Overrun Error */
-#define HSMCI_INT_DMADONE           (1 << 25) /* Bit 25: DMA Transfer done */
-#define HSMCI_INT_FIFOEMPTY         (1 << 26) /* Bit 26: FIFO empty flag */
-#define HSMCI_INT_XFRDONE           (1 << 27) /* Bit 27: Transfer Done flag */
-#define HSMCI_INT_ACKRCV            (1 << 28) /* Bit 28: Boot Operation Acknowledge Received */
-#define HSMCI_INT_ACKRCVE           (1 << 29) /* Bit 29: Boot Operation Acknowledge Error */
-#define HSMCI_INT_OVRE              (1 << 30) /* Bit 30: Overrun */
-#define HSMCI_INT_UNRE              (1 << 31) /* Bit 31: Underrun */
-
-/* HSMCI DMA Configuration Register */
-
-#define HSMCI_DMA_OFFSET_SHIFT      (0)       /* Bits 0-1: DMA Write Buffer Offset */
-#define HSMCI_DMA_OFFSET_MASK       (3 << HSMCI_DMA_OFFSET_SHIFT)
-#define HSMCI_DMA_CHKSIZE           (1 << 4)  /* Bit 4:  DMA Channel Read and Write Chunk Size */
-#define HSMCI_DMA_DMAEN             (1 << 8)  /* Bit 8:  DMA Hardware Handshaking Enable */
-#define HSMCI_DMA_ROPT              (1 << 12) /* Bit 12: Read Optimization with padding */
-
-/* HSMCI Configuration Register */
-
-#define HSMCI_CFG_FIFOMODE          (1 << 0)  /* Bit 0:  HSMCI Internal FIFO control mode */
-#define HSMCI_CFG_FERRCTRL          (1 << 4)  /* Bit 4:  Flow Error flag reset control mode */
-#define HSMCI_CFG_HSMODE            (1 << 8)  /* Bit 8:  High Speed Mode */
-#define HSMCI_CFG_LSYNC             (1 << 12) /* Bit 12: Synchronize on the last block */
-
-/* HSMCI Write Protect Mode Register */
-
-#define HSMCI_WPMR_WP_EN            (1 << 0)  /* Bit 0:  Write Protection Enable */
-#define HSMCI_WPMR_WP_KEY_SHIFT     (8)       /* Bits 8-31: Write Protection Key password */
-#define HSMCI_WPMR_WP_KEY_MASK      (0x00ffffff << HSMCI_WPMR_WP_KEY_SHIFT)
-
-/* HSMCI Write Protect Status Register */
-
-#define HSMCI_WPSR_WP_VS_SHIFT      (0)       /* Bits 0-3: Write Protection Violation Status */
-#define HSMCI_WPSR_WP_VS_MASK       (15 << HSMCI_WPSR_WP_VS_SHIFT)
-#define HSMCI_WPSR_WP_VSRC_SHIFT    (8)       /* Bits 8-23: Write Protection Violation Source */
-#define HSMCI_WPSR_WP_VSRC_MASK     (0xffff << HSMCI_WPSR_WP_VSRC_SHIFT)
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Functions
- ****************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_HSMCI_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_internal.h b/nuttx/arch/arm/src/sam3u/sam3u_internal.h
deleted file mode 100644
index 8953aa0c6..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_internal.h
+++ /dev/null
@@ -1,911 +0,0 @@
-/************************************************************************************
- * arch/arm/src/sam3u/sam3u_internal.h
- *
- *   Copyright (C) 2009-2011, 2013 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_SAM3U_SAM3U_INTERNAL_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_INTERNAL_H
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include <nuttx/config.h>
-#include <nuttx/compiler.h>
-
-#include <sys/types.h>
-#include <stdint.h>
-#include <stdbool.h>
-
-#include "up_internal.h"
-#include "chip.h"
-
-/************************************************************************************
- * Definitions
- ************************************************************************************/
-
-/* Configuration ********************************************************************/
-
-#if defined(CONFIG_GPIOA_IRQ) || defined(CONFIG_GPIOB_IRQ) || defined(CONFIG_GPIOC_IRQ)
-#  define CONFIG_GPIO_IRQ 1
-#else
-#  undef CONFIG_GPIO_IRQ
-#endif
-
-#ifndef CONFIG_DEBUG
-#  undef CONFIG_DEBUG_GPIO
-#  undef CONFIG_DEBUG_DMA
-#endif
-
-/* Bit-encoded input to sam3u_configgpio() ******************************************/
-
-/* 16-bit Encoding:
- * MMCC CII. VPPB BBBB
- */
-
-/* Input/Output mode:
- *
- * MM.. .... .... ....
- */
-
-#define GPIO_MODE_SHIFT            (14)        /* Bits 14-15: GPIO mode */
-#define GPIO_MODE_MASK             (3 << GPIO_MODE_SHIFT)
-#  define GPIO_INPUT               (0 << GPIO_MODE_SHIFT) /* Input */
-#  define GPIO_OUTPUT              (1 << GPIO_MODE_SHIFT) /* Output */
-#  define GPIO_PERIPHA             (2 << GPIO_MODE_SHIFT) /* Controlled by periph A signal */
-#  define GPIO_PERIPHB             (3 << GPIO_MODE_SHIFT) /* Controlled by periph B signal */
-
-/* These bits set the configuration of the pin:
- * ..CC C... .... ....
- */
-
-#define GPIO_CFG_SHIFT             (11)        /* Bits 11-13: GPIO configuration bits */
-#define GPIO_CFG_MASK              (7 << GPIO_CFG_SHIFT)
-#  define GPIO_CFG_DEFAULT         (0 << GPIO_CFG_SHIFT) /* Default, no attribute */
-#  define GPIO_CFG_PULLUP          (1 << GPIO_CFG_SHIFT) /* Bit 11: Internal pull-up */
-#  define GPIO_CFG_DEGLITCH        (2 << GPIO_CFG_SHIFT) /* Bit 12: Internal glitch filter */
-#  define GPIO_CFG_OPENDRAIN       (4 << GPIO_CFG_SHIFT) /* Bit 13: Open drain */
-
-/* Additional interrupt modes:
- * .... .II. .... ....
- */
-
-#define GPIO_INT_SHIFT             (9)        /* Bits 9-10: GPIO configuration bits */
-#define GPIO_INT_MASK              (3 << GPIO_INT_SHIFT)
-#  define GPIO_INT_LEVEL           (1 << 10)   /* Bit 10: Level detection interrupt */
-#  define GPIO_INT_EDGE            (0)         /*        (vs. Edge detection interrupt) */
-#  define GPIO_INT_HIGHLEVEL       (1 << 9)    /* Bit 9: High level detection interrupt */
-#  define GPIO_INT_LOWLEVEL        (0)         /*        (vs. Low level detection interrupt) */
-#  define GPIO_INT_RISING          (1 << 9)    /* Bit 9: Rising edge detection interrupt */
-#  define GPIO_INT_FALLING         (0)         /*        (vs. Falling edge detection interrupt) */
-
-/* If the pin is an GPIO output, then this identifies the initial output value:
- * .... .... V... ....
- */
-
-#define GPIO_OUTPUT_SET            (1 << 7)    /* Bit 7: Inital value of output */
-#define GPIO_OUTPUT_CLEAR          (0) 
-
-/* This identifies the GPIO port:
- * .... .... .PP. ....
- */
-
-#define GPIO_PORT_SHIFT            (5)         /* Bit 5-6:  Port number */
-#define GPIO_PORT_MASK             (3 << GPIO_PORT_SHIFT)
-#  define GPIO_PORT_PIOA           (0 << GPIO_PORT_SHIFT)
-#  define GPIO_PORT_PIOB           (1 << GPIO_PORT_SHIFT)
-#  define GPIO_PORT_PIOC           (2 << GPIO_PORT_SHIFT)
-
-/* This identifies the bit in the port:
- * .... .... ...B BBBB
- */
-
-#define GPIO_PIN_SHIFT             0        /* Bits 0-4: GPIO number: 0-31 */
-#define GPIO_PIN_MASK              (31 << GPIO_PIN_SHIFT)
-#define GPIO_PIN0                  (0  << GPIO_PIN_SHIFT)
-#define GPIO_PIN1                  (1  << GPIO_PIN_SHIFT)
-#define GPIO_PIN2                  (2  << GPIO_PIN_SHIFT)
-#define GPIO_PIN3                  (3  << GPIO_PIN_SHIFT)
-#define GPIO_PIN4                  (4  << GPIO_PIN_SHIFT)
-#define GPIO_PIN5                  (5  << GPIO_PIN_SHIFT)
-#define GPIO_PIN6                  (6  << GPIO_PIN_SHIFT)
-#define GPIO_PIN7                  (7  << GPIO_PIN_SHIFT)
-#define GPIO_PIN8                  (8  << GPIO_PIN_SHIFT)
-#define GPIO_PIN9                  (9  << GPIO_PIN_SHIFT)
-#define GPIO_PIN10                 (10 << GPIO_PIN_SHIFT)
-#define GPIO_PIN11                 (11 << GPIO_PIN_SHIFT)
-#define GPIO_PIN12                 (12 << GPIO_PIN_SHIFT)
-#define GPIO_PIN13                 (13 << GPIO_PIN_SHIFT)
-#define GPIO_PIN14                 (14 << GPIO_PIN_SHIFT)
-#define GPIO_PIN15                 (15 << GPIO_PIN_SHIFT)
-#define GPIO_PIN16                 (16 << GPIO_PIN_SHIFT)
-#define GPIO_PIN17                 (17 << GPIO_PIN_SHIFT)
-#define GPIO_PIN18                 (18 << GPIO_PIN_SHIFT)
-#define GPIO_PIN19                 (19 << GPIO_PIN_SHIFT)
-#define GPIO_PIN20                 (20 << GPIO_PIN_SHIFT)
-#define GPIO_PIN21                 (21 << GPIO_PIN_SHIFT)
-#define GPIO_PIN22                 (22 << GPIO_PIN_SHIFT)
-#define GPIO_PIN23                 (23 << GPIO_PIN_SHIFT)
-#define GPIO_PIN24                 (24 << GPIO_PIN_SHIFT)
-#define GPIO_PIN25                 (25 << GPIO_PIN_SHIFT)
-#define GPIO_PIN26                 (26 << GPIO_PIN_SHIFT)
-#define GPIO_PIN27                 (27 << GPIO_PIN_SHIFT)
-#define GPIO_PIN28                 (28 << GPIO_PIN_SHIFT)
-#define GPIO_PIN29                 (29 << GPIO_PIN_SHIFT)
-#define GPIO_PIN30                 (30 << GPIO_PIN_SHIFT)
-#define GPIO_PIN31                 (31 << GPIO_PIN_SHIFT)
-
-/* GPIO pin definitions *************************************************************/
-
-#define GPIO_ADC0_AD0             (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN21)
-#define GPIO_ADC0_AD1             (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN30)
-#define GPIO_ADC0_AD2             (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN3)
-#define GPIO_ADC0_AD3             (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN4)
-#define GPIO_ADC0_AD4             (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN15)
-#define GPIO_ADC0_AD5             (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN16)
-#define GPIO_ADC0_AD6             (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN17)
-#define GPIO_ADC0_AD7             (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN18)
-
-#define GPIO_CAN_XCVR_RS          (GPIO_OUTPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_OUTPUT_SET|GPIO_PIN23)
-#define GPIO_CAN1_XCVR_TXD        (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN27)
-#define GPIO_CAN1_XCVR_RXD        (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN26)
-#define GPIO_CAN2_XCVR_TXD        (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN29)
-#define GPIO_CAN2_XCVR_RXD        (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN28)
-
-#define GPIO_SMC_D0               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN9)  /* Check! */
-#define GPIO_SMC_D1               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN10) /* Check! */
-#define GPIO_SMC_D2               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN11) /* Check! */
-#define GPIO_SMC_D3               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN12) /* Check! */
-#define GPIO_SMC_D4               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN13) /* Check! */
-#define GPIO_SMC_D5               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN14) /* Check! */
-#define GPIO_SMC_D6               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN15) /* Check! */
-#define GPIO_SMC_D7               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN16) /* Check! */
-#define GPIO_SMC_D8               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN25) /* Check! */
-#define GPIO_SMC_D9               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN26) /* Check! */
-#define GPIO_SMC_D10              (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN27) /* Check! */
-#define GPIO_SMC_D11              (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN28) /* Check! */
-#define GPIO_SMC_D12              (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN29) /* Check! */
-#define GPIO_SMC_D13              (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN30) /* Check! */
-#define GPIO_SMC_D14              (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|{GPIO_PIN31) /* Check! */
-#define GPIO_SMC_D15              (GPIO_PERIPHB|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN6)   /* Check! */
-#define GPIO_SMC_NCS0             (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN20)
-#define GPIO_SMC_NRD              (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN19)
-#define GPIO_SMC_NWE              (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN23)
-#define GPIO_SMC_PSRAM_A0         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN0)  /* Check! */
-#define GPIO_SMC_PSRAM_A1         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN1)  /* Check! */
-#define GPIO_SMC_PSRAM_A2         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN2)  /* Check! */
-#define GPIO_SMC_PSRAM_A3         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN3)  /* Check! */
-#define GPIO_SMC_PSRAM_A4         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN4)  /* Check! */
-#define GPIO_SMC_PSRAM_A5         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN5)  /* Check! */
-#define GPIO_SMC_PSRAM_A6         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN6)  /* Check! */
-#define GPIO_SMC_PSRAM_A7         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN7)  /* Check! */
-#define GPIO_SMC_PSRAM_A8         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN8)  /* Check! */
-#define GPIO_SMC_PSRAM_A9         (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN9)  /* Check! */
-#define GPIO_SMC_PSRAM_A10        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN10) /* Check! */
-#define GPIO_SMC_PSRAM_A11        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN11) /* Check! */
-#define GPIO_SMC_PSRAM_A12        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN24) /* Check! */
-#define GPIO_SMC_PSRAM_A13        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN25) /* Check! */
-#define GPIO_SMC_PSRAM_A14        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN26) /* Check! */
-#define GPIO_SMC_PSRAM_A15        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN27) /* Check! */
-#define GPIO_SMC_PSRAM_A16        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN27) /* Check! */
-#define GPIO_SMC_PSRAM_A17        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN28) /* Check! */
-#define GPIO_SMC_PSRAM_A18        (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|{GPIO_PIN29) /* Check! */
-#define GPIO_SMC_PSRAM_NBS0       (GPIO_PERIPHB|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN7)   /* Check! */
-#define GPIO_SMC_PSRAM_NBS1       (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|GPIO_PIN15)
-#define GPIO_SMC_A1               (GPIO_PERIPHB|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN8)
-#define GPIO_SMC_NCS2             (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOC|GPIO_PIN16)
-#define GPIO_SMC_LCD_RS           (GPIO_PERIPHB|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN8)
-
-#define GPIO_MCI_DAT0             (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN5)
-#define GPIO_MCI_DAT1             (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN6)
-#define GPIO_MCI_DAT2             (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN7)
-#define GPIO_MCI_DAT3             (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN8)
-#define GPIO_MCI_DAT4             (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN28)
-#define GPIO_MCI_DAT5             (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN29)
-#define GPIO_MCI_DAT6             (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN30)
-#define GPIO_MCI_DAT7             (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOB|GPIO_PIN31)
-#define GPIO_MCI_CK               (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN3)
-#define GPIO_MCI_DA               (GPIO_PERIPHA|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN4)
-#define GPIO_MCI_DAT0IN           (GPIO_INPUT|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN5)
-
-#define GPIO_PWMC_PWMH0           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN0)
-#define GPIO_PWMC_PWML0           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN7)
-#define GPIO_PWMC_PWMH1           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN1)
-#define GPIO_PWMC_PWML1           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN8)
-#define GPIO_PWMC_PWMH2           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN2)
-#define GPIO_PWMC_PWML2           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN9)
-
-#define GPIO_SPI0_MISO            (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN13)
-#define GPIO_SPI0_MOSI            (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN14)
-#define GPIO_SPI0_SPCK            (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN15)
-#define GPIO_SPI0_NPCS0           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN16)
-
-#define GPIO_SPI0_NPCS1_1         (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN0)
-#define GPIO_SPI0_NPCS1_2         (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN3)
-#define GPIO_SPI0_NPCS1_3         (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN19)
-#define GPIO_SPI0_NPCS2_1         (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN1)
-#define GPIO_SPI0_NPCS2_2         (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN4)
-#define GPIO_SPI0_NPCS2_3         (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN14)
-#define GPIO_SPI0_NPCS3_1         (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN19)
-#define GPIO_SPI0_NPCS3_2         (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN5)
-
-#define GPIO_SSC_TD               (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN26)
-#define GPIO_SSC_TK               (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN28)
-#define GPIO_SSC_TF               (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN30)
-
-#define GPIO_PCK0                 (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN21)
-
-#define GPIO_TWI_TWD0             (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN9)
-#define GPIO_TWI_TWCK0            (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN10)
-#define GPIO_TWI_TWD1             (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN24)
-#define GPIO_TWI_TWCK1            (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN25)
-
-#define GPIO_UART_TXD             (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN12)
-#define GPIO_UART_RXD             (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN11)
-
-#define GPIO_USART0_CTS           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN8)
-#define GPIO_USART0_DCD           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN11)
-#define GPIO_USART0_DSR           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN10)
-#define GPIO_USART0_DTR           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN9)
-#define GPIO_USART0_RI            (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN12)
-#define GPIO_USART0_RTS           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN7)
-#define GPIO_USART0_RXD           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN19)
-#define GPIO_USART0_SCK           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN17)
-#define GPIO_USART0_TXD           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN18)
-
-#define GPIO_USART1_CTS           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN23)
-#define GPIO_USART1_RTS           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN22)
-#define GPIO_USART1_RXD           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN21)
-#define GPIO_USART1_SCK           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN24)
-#define GPIO_USART1_TXD           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN20)
-
-#define GPIO_USART2_CTS           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN22)
-#define GPIO_USART2_RTS           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOB|GPIO_PIN21)
-#define GPIO_USART2_RXD           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN23)
-#define GPIO_USART2_SCK           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN25)
-#define GPIO_USART2_TXD           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN22)
-
-#define GPIO_USART3_CTS           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN10)
-#define GPIO_USART3_RTS           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN11)
-#define GPIO_USART3_RXD           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN13)
-#define GPIO_USART3_SCK           (GPIO_PERIPHA|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN19)
-#define GPIO_USART3_TXD           (GPIO_PERIPHB|GPIO_CFG_DEFAULT|GPIO_PORT_PIOC|GPIO_PIN12)
-
-#define GPIO_USB_VBUS             (GPIO_INPUT|GPIO_CFG_DEFAULT|GPIO_PORT_PIOA|GPIO_PIN0)
-
-/* DMA ******************************************************************************/
-
-/* Flags used to characterize the desired DMA channel.  The naming convention is that
- * one side is the peripheral and the other is memory (however, the interface could still
- * be used if, for example, both sides were memory although the naming would be awkward)
- */
-
-/* Unchange-able properties of the channel */
-
-#define DMACH_FLAG_FLOWCONTROL                (1 << 0)  /* Bit 0: Channel supports flow control */
-#define DMACH_FLAG_FIFOSIZE_SHIFT             (1)       /* Bit 1: Size of DMA FIFO */
-#define DMACH_FLAG_FIFOSIZE_MASK              (1 << DMACH_FLAG_FIFOSIZE_SHIFT)
-#  define DMACH_FLAG_FIFO_8BYTES              (0 << DMACH_FLAG_FIFOSIZE_SHIFT) /* 8 bytes */
-#  define DMACH_FLAG_FIFO_32BYTES             (1 << DMACH_FLAG_FIFOSIZE_SHIFT) /* 32 bytes */
-
-/* Configurable properties of the channel */
-
-#define DMACH_FLAG_BURST_LARGEST              0  /* Largest length AHB burst */
-#define DMACH_FLAG_BURST_HALF                 1  /* Half FIFO size */
-#define DMACH_FLAG_BURST_SINGLE               2  /* Single AHB access */
-
-#define DMACH_FLAG_FIFOCFG_SHIFT              (2)       /* Bits 2-3: FIFO configuration */
-#define DMACH_FLAG_FIFOCFG_MASK               (3 << DMACH_FLAG_FIFOCFG_SHIFT)
-#  define DMACH_FLAG_FIFOCFG_LARGEST          (DMACH_FLAG_BURST_LARGEST << DMACH_FLAG_FIFOCFG_SHIFT)
-#  define DMACH_FLAG_FIFOCFG_HALF             (DMACH_FLAG_BURST_HALF << DMACH_FLAG_FIFOCFG_SHIFT)
-#  define DMACH_FLAG_FIFOCFG_SINGLE           (DMACH_FLAG_BURST_SINGLE << DMACH_FLAG_FIFOCFG_SHIFT)
-
-/* Peripheral endpoint characteristics */
-
-#define DMACH_FLAG_PERIPHPID_SHIFT            (4)       /* Bits 4-7: Peripheral PID */
-#define DMACH_FLAG_PERIPHPID_MASK             (15 << DMACH_FLAG_PERIPHPID_SHIFT)
-#define DMACH_FLAG_PERIPHH2SEL                (1 << 8)  /* Bits 8: HW handshaking */
-#define DMACH_FLAG_PERIPHISPERIPH             (1 << 9)  /* Bits 9: 0=memory; 1=peripheral */
-#define DMACH_FLAG_PERIPHWIDTH_SHIFT          (10)      /* Bits 10-11: Peripheral width */
-#define DMACH_FLAG_PERIPHWIDTH_MASK           (3 << DMACH_FLAG_PERIPHWIDTH_SHIFT)
-#  define DMACH_FLAG_PERIPHWIDTH_8BITS        (0 << DMACH_FLAG_PERIPHWIDTH_SHIFT) /* 8 bits */
-#  define DMACH_FLAG_PERIPHWIDTH_16BITS       (1 << DMACH_FLAG_PERIPHWIDTH_SHIFT) /* 16 bits */
-#  define DMACH_FLAG_PERIPHWIDTH_32BITS       (2 << DMACH_FLAG_PERIPHWIDTH_SHIFT) /* 32 bits */
-#define DMACH_FLAG_PERIPHINCREMENT            (1 << 12) /* Bit 12: Autoincrement peripheral address */
-#define DMACH_FLAG_PERIPHCHUNKSIZE            (1 << 13) /* Bit 13: Peripheral chunk size */
-#  define DMACH_FLAG_PERIPHCHUNKSIZE_1        (0)                        /* Peripheral chunksize = 1 */
-#  define DMACH_FLAG_PERIPHCHUNKSIZE_4        DMACH_FLAG_PERIPHCHUNKSIZE /* Peripheral chunksize = 4 */
-
-/* Memory endpoint characteristics */
-
-#define DMACH_FLAG_MEMPID_SHIFT               (14)      /* Bits 14-17: Memory PID */
-#define DMACH_FLAG_MEMPID_MASK                (15 << DMACH_FLAG_PERIPHPID_SHIFT)
-#define DMACH_FLAG_MEMH2SEL                   (1 << 18) /* Bits 18: HW handshaking */
-#define DMACH_FLAG_MEMISPERIPH                (1 << 19) /* Bits 19: 0=memory; 1=peripheral */
-#define DMACH_FLAG_MEMWIDTH_SHIFT             (20)      /* Bits 20-21: Memory width */
-#define DMACH_FLAG_MEMWIDTH_MASK              (3 << DMACH_FLAG_MEMWIDTH_SHIFT)
-#  define DMACH_FLAG_MEMWIDTH_8BITS           (0 << DMACH_FLAG_MEMWIDTH_SHIFT) /* 8 bits */
-#  define DMACH_FLAG_MEMWIDTH_16BITS          (1 << DMACH_FLAG_MEMWIDTH_SHIFT) /* 16 bits */
-#  define DMACH_FLAG_MEMWIDTH_32BITS          (2 << DMACH_FLAG_MEMWIDTH_SHIFT) /* 32 bits */
-#define DMACH_FLAG_MEMINCREMENT               (1 << 22) /* Bit 22: Autoincrement memory address */
-#define DMACH_FLAG_MEMCHUNKSIZE               (1 << 22) /* Bit 23: Memory chunk size */
-#  define DMACH_FLAG_MEMCHUNKSIZE_1           (0)                     /* Memory chunksize = 1 */
-#  define DMACH_FLAG_MEMCHUNKSIZE_4           DMACH_FLAG_MEMCHUNKSIZE /* Memory chunksize = 4 */
-
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
-typedef FAR void *DMA_HANDLE;
-typedef void (*dma_callback_t)(DMA_HANDLE handle, void *arg, int result);
-
-/* The following is used for sampling DMA registers when CONFIG DEBUG_DMA is selected */
-
-#ifdef CONFIG_DEBUG_DMA
-struct sam3u_dmaregs_s
-{
-  /* Global Registers */
-
-  uint32_t gcfg;    /* DMAC Global Configuration Register */
-  uint32_t en;      /* DMAC Enable Register */
-  uint32_t sreq;    /* DMAC Software Single Request Register */
-  uint32_t creq;    /* DMAC Software Chunk Transfer Request Register */
-  uint32_t last;    /* DMAC Software Last Transfer Flag Register */
-  uint32_t ebcimr;  /* DMAC Error Mask */
-  uint32_t ebcisr;  /* DMAC Error Status */
-  uint32_t chsr;    /* DMAC Channel Handler Status Register */
-
-  /* Channel Registers */
-
-  uint32_t saddr;   /* DMAC Channel Source Address Register */
-  uint32_t daddr;   /* DMAC Channel Destination Address Register */
-  uint32_t dscr;    /* DMAC Channel Descriptor Address Register */
-  uint32_t ctrla;   /* DMAC Channel Control A Register */
-  uint32_t ctrlb;   /* DMAC Channel Control B Register */
-  uint32_t cfg;     /* DMAC Channel Configuration Register */
-};
-#endif
-
-/************************************************************************************
- * 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: sam3u_clockconfig
- *
- * Description:
- *   Called to initialize the SAM3U.  This does whatever setup is needed to put the
- *   SoC in a usable state.  This includes the initialization of clocking using the
- *   settings in board.h.  (After power-on reset, the sam3u is initiallyrunning on
- *   a 4MHz internal RC clock).  This function also performs other low-level chip
- *   initialization of the chip including EFC, master clock, IRQ and watchdog
- *   configuration.
- *
- ************************************************************************************/
-
-void sam3u_clockconfig(void);
-
-/************************************************************************************
- * Name: sam3u_lowsetup
- *
- * Description:
- *   Called at the very beginning of _start.  Performs low level initialization
- *   including setup of the console UART.  This UART done early so that the serial
- *   console is available for debugging very early in the boot sequence.
- *
- ************************************************************************************/
-
-void sam3u_lowsetup(void);
-
-/****************************************************************************
- * Name: sam3u_userspace
- *
- * Description:
- *   For the case of the separate user-/kernel-space build, perform whatever
- *   platform specific initialization of the user memory is required.
- *   Normally this just means initializing the user space .data and .bss
- *   segments.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_NUTTX_KERNEL
-void sam3u_userspace(void);
-#endif
-
-/****************************************************************************
- * Name: sam3u_mpuinitialize
- *
- * Description:
- *   Configure the MPU to permit user-space access to only unrestricted SAM3U
- *   resources.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_NUTTX_KERNEL
-void sam3u_mpuinitialize(void);
-#else
-#  define sam3u_mpuinitialize()
-#endif
-
-/****************************************************************************
- * Name: sam3u_mpu_uheap
- *
- * Description:
- *  Map the user heap region.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_NUTTX_KERNEL
-void sam3u_mpu_uheap(uintptr_t start, size_t size);
-#else
-#  define sam3u_mpu_uheap(start,size)
-#endif
-
-/************************************************************************************
- * Name: sam3u_gpioirqinitialize
- *
- * Description:
- *   Initialize logic to support a second level of interrupt decoding for GPIO pins.
- *
- ************************************************************************************/
-
-#ifdef CONFIG_GPIO_IRQ
-void sam3u_gpioirqinitialize(void);
-#else
-#  define sam3u_gpioirqinitialize()
-#endif
-
-/************************************************************************************
- * Name: sam3u_configgpio
- *
- * Description:
- *   Configure a GPIO pin based on bit-encoded description of the pin.
- *
- ************************************************************************************/
-
-int sam3u_configgpio(uint16_t cfgset);
-
-/************************************************************************************
- * Name: sam3u_gpiowrite
- *
- * Description:
- *   Write one or zero to the selected GPIO pin
- *
- ************************************************************************************/
-
-void sam3u_gpiowrite(uint16_t pinset, bool value);
-
-/************************************************************************************
- * Name: sam3u_gpioread
- *
- * Description:
- *   Read one or zero from the selected GPIO pin
- *
- ************************************************************************************/
-
-bool sam3u_gpioread(uint16_t pinset);
-
-/************************************************************************************
- * Name: sam3u_gpioirq
- *
- * Description:
- *   Configure an interrupt for the specified GPIO pin.
- *
- ************************************************************************************/
-
-#ifdef CONFIG_GPIO_IRQ
-void sam3u_gpioirq(uint16_t pinset);
-#else
-#  define sam3u_gpioirq(pinset)
-#endif
-
-/************************************************************************************
- * Name: sam3u_gpioirqenable
- *
- * Description:
- *   Enable the interrupt for specified GPIO IRQ
- *
- ************************************************************************************/
-
-#ifdef CONFIG_GPIO_IRQ
-void sam3u_gpioirqenable(int irq);
-#else
-#  define sam3u_gpioirqenable(irq)
-#endif
-
-/************************************************************************************
- * Name: sam3u_gpioirqdisable
- *
- * Description:
- *   Disable the interrupt for specified GPIO IRQ
- *
- ************************************************************************************/
-
-#ifdef CONFIG_GPIO_IRQ
-void sam3u_gpioirqdisable(int irq);
-#else
-#  define sam3u_gpioirqdisable(irq)
-#endif
-
-/************************************************************************************
- * Function:  sam3u_dumpgpio
- *
- * Description:
- *   Dump all GPIO registers associated with the base address of the provided pinset.
- *
- ************************************************************************************/
-
-#ifdef CONFIG_DEBUG_GPIO
-int sam3u_dumpgpio(uint32_t pinset, const char *msg);
-#else
-#  define sam3u_dumpgpio(p,m)
-#endif
-
-/****************************************************************************
- * Name: sam3u_dmachannel
- *
- * Description:
- *   Allocate a DMA channel.  This function sets aside a DMA channel with
- *   the required FIFO size and flow control capabilities (determined by
- *   dma_flags) then  gives the caller exclusive access to the DMA channel.
- *
- *   The naming convention in all of the DMA interfaces is that one side is
- *   the 'peripheral' and the other is 'memory'.  Howerver, the interface
- *   could still be used if, for example, both sides were memory although
- *   the naming would be awkward.
- *
- * Returned Value:
- *   If a DMA channel if the required FIFO size is available, this function
- *   returns a non-NULL, void* DMA channel handle.  NULL is returned on any
- *   failure.
- *
- ****************************************************************************/
-
-DMA_HANDLE sam3u_dmachannel(uint32_t dmach_flags);
-
-/****************************************************************************
- * Name: sam3u_dmafree
- *
- * Description:
- *   Release a DMA channel.  NOTE:  The 'handle' used in this argument must
- *   NEVER be used again until sam3u_dmachannel() is called again to re-gain
- *   a valid handle.
- *
- * Returned Value:
- *   None
- *
- ****************************************************************************/
-
-void sam3u_dmafree(DMA_HANDLE handle);
-
-/****************************************************************************
- * Name: sam3u_dmatxsetup
- *
- * Description:
- *   Configure DMA for transmit of one buffer (memory to peripheral).  This
- *   function may be called multiple times to handle large and/or dis-
- *   continuous transfers.  Calls to sam3u_dmatxsetup() and sam3u_dmatxsetup()
- *   must not be intermixed on the same transfer, however.
- *
- ****************************************************************************/
-
-int sam3u_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
-                     size_t nbytes);
-
-/****************************************************************************
- * Name: sam3u_dmarxsetup
- *
- * Description:
- *   Configure DMA for receipt of one buffer (peripheral to memory).  This
- *   function may be called multiple times to handle large and/or dis-
- *   continuous transfers.  Calls to sam3u_dmatxsetup() and sam3u_dmatxsetup()
- *   must not be intermixed on the same transfer, however.
- *
- ****************************************************************************/
-
-int sam3u_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
-                     size_t nbytes);
-
-/****************************************************************************
- * Name: sam3u_dmastart
- *
- * Description:
- *   Start the DMA transfer
- *
- ****************************************************************************/
-
-int sam3u_dmastart(DMA_HANDLE handle, dma_callback_t callback, void *arg);
-
-/****************************************************************************
- * Name: sam3u_dmastop
- *
- * Description:
- *   Cancel the DMA.  After sam3u_dmastop() is called, the DMA channel is
- *   reset and sam3u_dmasetup() must be called before sam3u_dmastart() can be
- *   called again
- *
- ****************************************************************************/
-
-void sam3u_dmastop(DMA_HANDLE handle);
-
-/****************************************************************************
- * Name: sam3u_dmasample
- *
- * Description:
- *   Sample DMA register contents
- *
- ****************************************************************************/
-
-#ifdef CONFIG_DEBUG_DMA
-void sam3u_dmasample(DMA_HANDLE handle, struct sam3u_dmaregs_s *regs);
-#else
-#  define sam3u_dmasample(handle,regs)
-#endif
-
-/****************************************************************************
- * Name: sam3u_dmadump
- *
- * Description:
- *   Dump previously sampled DMA register contents
- *
- ****************************************************************************/
-
-#ifdef CONFIG_DEBUG_DMA
-void sam3u_dmadump(DMA_HANDLE handle, const struct sam3u_dmaregs_s *regs,
-                   const char *msg);
-#else
-#  define sam3u_dmadump(handle,regs,msg)
-#endif
-
-/****************************************************************************
- * Name: sdio_initialize
- *
- * Description:
- *   Initialize SDIO for operation.
- *
- * Input Parameters:
- *   slotno - Not used.
- *
- * Returned Values:
- *   A reference to an SDIO interface structure.  NULL is returned on failures.
- *
- ****************************************************************************/
-
-struct sdio_dev_s; /* See include/nuttx/sdio.h */
-FAR struct sdio_dev_s *sdio_initialize(int slotno);
-
-/****************************************************************************
- * Name: sdio_mediachange
- *
- * Description:
- *   Called by board-specific logic -- posssible from an interrupt handler --
- *   in order to signal to the driver that a card has been inserted or
- *   removed from the slot
- *
- * Input Parameters:
- *   dev        - An instance of the SDIO driver device state structure.
- *   cardinslot - true is a card has been detected in the slot; false if a 
- *                card has been removed from the slot.  Only transitions
- *                (inserted->removed or removed->inserted should be reported)
- *
- * Returned Values:
- *   None
- *
- ****************************************************************************/
-
-void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot);
-
-/****************************************************************************
- * Name: sdio_wrprotect
- *
- * Description:
- *   Called by board-specific logic to report if the card in the slot is
- *   mechanically write protected.
- *
- * Input Parameters:
- *   dev       - An instance of the SDIO driver device state structure.
- *   wrprotect - true is a card is writeprotected.
- *
- * Returned Values:
- *   None
- *
- ****************************************************************************/
-
-void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect);
-
-/****************************************************************************
- * Name:  sam3u_spicsnumber, sam3u_spiselect, sam3u_spistatus, and
- *        sam3u_spicmddata
- *
- * Description:
- *   These external functions must be provided by board-specific logic.  They
- *   include:
- *
- *   o sam3u_spicsnumbe and sam3u_spiselect which are helper functions to
- *     manage the board-specific aspects of the unique SAM3U chip select
- *     architecture.
- *   o sam3u_spistatus and sam3u_spicmddata:  Implementations of the status
- *     and cmddata methods of the SPI interface defined by struct spi_ops_
- *     (see include/nuttx/spi.h). All other methods including
- *     up_spiinitialize()) are provided by common SAM3U logic.
- *
- *  To use this common SPI logic on your board:
- *
- *   1. Provide logic in sam3u_boardinitialize() to configure SPI chip select
- *      pins.
- *   2. Provide sam3u_spicsnumber(), sam3u_spiselect() and sam3u_spistatus()
- *      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
- *      sam3u_spicmddata() 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).
- *
- ****************************************************************************/
-
-#ifdef CONFIG_SAM3U_SPI
-struct spi_dev_s;
-enum spi_dev_e;
-
-/****************************************************************************
- * Name: sam3u_spicsnumber
- *
- * Description:
- *   The SAM3U has 4 CS registers for controlling device features.  This
- *   function must be provided by board-specific code.  Given a logical device
- *   ID, this function returns a number from 0 to 3 that identifies one of
- *   these SAM3U CS resources.
- *
- *   If CONFIG_SPI_OWNBUS is not defined and the GPIO is controlled by
- *   sam3u_spiselect, then the same CS register may be used to control
- *   multiple devices.
- *
- * Input Parameters:
- *   dev - SPI device info
- *   devid - Identifies the (logical) device
- *
- * Returned Values:
- *   On success, a CS number from 0 to 3 is returned; A negated errno may
- *   be returned on a failure.
- *
- ****************************************************************************/
-
-int sam3u_spicsnumber(enum spi_dev_e devid);
-
-/****************************************************************************
- * Name: sam3u_spiselect
- *
- * 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
- *
- ****************************************************************************/
-
-void sam3u_spiselect(enum spi_dev_e devid, bool selected);
-
-/****************************************************************************
- * Name: sam3u_spistatus
- *
- * 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.h.
- *
- ****************************************************************************/
-
-uint8_t sam3u_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid);
-
-/****************************************************************************
- * Name: sam3u_spicmddata
- *
- * 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
-int sam3u_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
-#endif
-#endif /* CONFIG_SAM3U_SPI */
-
-#undef EXTERN
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_INTERNAL_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_matrix.h b/nuttx/arch/arm/src/sam3u/sam3u_matrix.h
deleted file mode 100644
index 52232bfa5..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_matrix.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_matric.h
- *
- *   Copyright (C) 2009-2010 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_SAM3U_SAM3U_MATRIX_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_MATRIX_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/****************************************************************************************
- * Pre-processor Definitions
- ****************************************************************************************/
-
-/* MATRIX register offsets **************************************************************/
-
-#define SAM3U_MATRIX_MCFG_OFFSET(n)      ((n)<<2)
-#define SAM3U_MATRIX_MCFG0_OFFSET        0x0000 /* Master Configuration Register 0 */
-#define SAM3U_MATRIX_MCFG1_OFFSET        0x0004 /* Master Configuration Register 1 */
-#define SAM3U_MATRIX_MCFG2_OFFSET        0x0008 /* Master Configuration Register 2 */
-#define SAM3U_MATRIX_MCFG3_OFFSET        0x000c /* Master Configuration Register 3 */
-#define SAM3U_MATRIX_MCFG4_OFFSET        0x0010 /* Master Configuration Register 4 */
-                                                /* 0x0014-0x003c: Reserved */
-#define SAM3U_MATRIX_SCFG_OFFSET(n)      (0x0040+((n)<<2))
-#define SAM3U_MATRIX_SCFG0_OFFSET        0x0040 /* Slave Configuration Register 0 */
-#define SAM3U_MATRIX_SCFG1_OFFSET        0x0044 /* Slave Configuration Register 1 */
-#define SAM3U_MATRIX_SCFG2_OFFSET        0x0048 /* Slave Configuration Register 2 */
-#define SAM3U_MATRIX_SCFG3_OFFSET        0x004c /* Slave Configuration Register 3 */
-#define SAM3U_MATRIX_SCFG4_OFFSET        0x0050 /* Slave Configuration Register 4 */
-#define SAM3U_MATRIX_SCFG5_OFFSET        0x0054 /* Slave Configuration Register 5 */
-#define SAM3U_MATRIX_SCFG6_OFFSET        0x0058 /* Slave Configuration Register 6 */
-#define SAM3U_MATRIX_SCFG7_OFFSET        0x005c /* Slave Configuration Register 7 */
-#define SAM3U_MATRIX_SCFG8_OFFSET        0x0060 /* Slave Configuration Register 8 */
-#define SAM3U_MATRIX_SCFG9_OFFSET        0x0064 /* Slave Configuration Register 9 */
-                                                /* 0x0068-0x007c: Reserved */
-#define SAM3U_MATRIX_PRAS_OFFSET(n)     (0x0080+((n)<<3))
-#define SAM3U_MATRIX_PRAS0_OFFSET        0x0080 /* Priority Register A for Slave 0 */
-                                                /* 0x0084: Reserved */
-#define SAM3U_MATRIX_PRAS1_OFFSET        0x0088 /* Priority Register A for Slave 1 */
-                                                /* 0x008c: Reserved */
-#define SAM3U_MATRIX_PRAS2_OFFSET        0x0090 /* Priority Register A for Slave 2 */
-                                                /* 0x0094: Reserved */
-#define SAM3U_MATRIX_PRAS3_OFFSET        0x0098 /* Priority Register A for Slave 3 */
-                                                /* 0x009c: Reserved */
-#define SAM3U_MATRIX_PRAS4_OFFSET        0x00a0 /* Priority Register A for Slave 4 */
-                                                /* 0x00a4: Reserved */
-#define SAM3U_MATRIX_PRAS5_OFFSET        0x00a8 /* Priority Register A for Slave 5 */
-                                                /* 0x00ac: Reserved */
-#define SAM3U_MATRIX_PRAS6_OFFSET        0x00b0 /* Priority Register A for Slave 6 */
-                                                /* 0x00b4: Reserved */
-#define SAM3U_MATRIX_PRAS7_OFFSET        0x00b8 /* Priority Register A for Slave 7 */
-                                                /* 0x00bc: Reserved */
-#define SAM3U_MATRIX_PRAS8_OFFSET        0x00c0 /* Priority Register A for Slave 8 */
-                                                /* 0x00c4: Reserved */
-#define SAM3U_MATRIX_PRAS9_OFFSET        0x00c8 /* Priority Register A for Slave 9 */
-                                                /* 0x00cc-0x00fc: Reserved */
-#define SAM3U_MATRIX_MRCR_OFFSET         0x0100 /* Master Remap Control Register */
-                                                /* 0x0104-0x010c: Reserved */
-#define SAM3U_MATRIX_WPMR_OFFSET         0x01e4 /* Write Protect Mode Register */
-#define SAM3U_MATRIX_WPSR_OFFSET         0x01e8 /* Write Protect Status Register */
-                                                /* 0x0110 - 0x01fc: Reserved */
-
-/* MATRIX register adresses *************************************************************/
-
-#define SAM3U_MATRIX_MCFG(n))            (SAM3U_MATRIX_BASE+SAM3U_MATRIX_MCFG_OFFSET(n))
-#define SAM3U_MATRIX_MCFG0               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_MCFG0_OFFSET)
-#define SAM3U_MATRIX_MCFG1               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_MCFG1_OFFSET)
-#define SAM3U_MATRIX_MCFG2               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_MCFG2_OFFSET)
-#define SAM3U_MATRIX_MCFG3               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_MCFG3_OFFSET)
-#define SAM3U_MATRIX_MCFG4               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_MCFG4_OFFSET)
- 
-#define SAM3U_MATRIX_SCFG(n)             (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG_OFFSET(n))
-#define SAM3U_MATRIX_SCFG0               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG0_OFFSET)
-#define SAM3U_MATRIX_SCFG1               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG1_OFFSET)
-#define SAM3U_MATRIX_SCFG2               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG2_OFFSET)
-#define SAM3U_MATRIX_SCFG3               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG3_OFFSET)
-#define SAM3U_MATRIX_SCFG4               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG4_OFFSET)
-#define SAM3U_MATRIX_SCFG5               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG5_OFFSET)
-#define SAM3U_MATRIX_SCFG6               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG6_OFFSET)
-#define SAM3U_MATRIX_SCFG7               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG7_OFFSET)
-#define SAM3U_MATRIX_SCFG8               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG8_OFFSET)
-#define SAM3U_MATRIX_SCFG9               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_SCFG9_OFFSET)
-
-#define SAM3U_MATRIX_PRAS(n)             (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS_OFFSET(n))
-#define SAM3U_MATRIX_PRAS0               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS0_OFFSET)
-#define SAM3U_MATRIX_PRAS1               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS1_OFFSET)
-#define SAM3U_MATRIX_PRAS2               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS2_OFFSET)
-#define SAM3U_MATRIX_PRAS3               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS3_OFFSET)
-#define SAM3U_MATRIX_PRAS4               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS4_OFFSET)
-#define SAM3U_MATRIX_PRAS5               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS5_OFFSET)
-#define SAM3U_MATRIX_PRAS6               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS6_OFFSET)
-#define SAM3U_MATRIX_PRAS7               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS7_OFFSET)
-#define SAM3U_MATRIX_PRAS8               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS8_OFFSET)
-#define SAM3U_MATRIX_PRAS9               (SAM3U_MATRIX_BASE+SAM3U_MATRIX_PRAS9_OFFSET)
-
-#define SAM3U_MATRIX_MRCR                (SAM3U_MATRIX_BASE+SAM3U_MATRIX_MRCR_OFFSET)
-#define SAM3U_MATRIX_WPMR                (SAM3U_MATRIX_BASE+SAM3U_MATRIX_WPMR_OFFSET)
-#define SAM3U_MATRIX_WPSR                (SAM3U_MATRIX_BASE+SAM3U_MATRIX_WPSR_OFFSET)
-
-/* MATRIX register bit definitions ******************************************************/
-
-#define MATRIX_MCFG_ULBT_SHIFT           (0)       /* Bits 0-2:  Undefined Length Burst Type */
-#define MATRIX_MCFG_ULBT_MASK            (7 << MATRIX_MCFG_ULBT_SHIFT)
-#  define MATRIX_MCFG_ULBT_INF           (0 << MATRIX_MCFG_ULBT_SHIFT) /* Infinite Length Burst */
-#  define MATRIX_MCFG_ULBT_SINGLE        (1 << MATRIX_MCFG_ULBT_SHIFT) /* Single Access */
-#  define MATRIX_MCFG_ULBT_4BEAT         (2 << MATRIX_MCFG_ULBT_SHIFT) /* Four Beat Burst */
-#  define MATRIX_MCFG_ULBT_8BEAT         (3 << MATRIX_MCFG_ULBT_SHIFT) /* Eight Beat Burst */
-#  define MATRIX_MCFG_ULBT_16BEAT        (4 << MATRIX_MCFG_ULBT_SHIFT) /* Sixteen Beat Burst */
-
-#define MATRIX_SCFG_SLOTCYCLE_SHIFT      (0)       /* Bits 0-7:  Maximum Number of Allowed Cycles for a Burst */
-#define MATRIX_SCFG_SLOTCYCLE_MASK       (0xff << MATRIX_SCFG_SLOTCYCLE_SHIFT)
-#define MATRIX_SCFG_DEFMSTRTYPE_SHIFT    (16)      /* Bits 16-17:  Default Master Type */
-#define MATRIX_SCFG_DEFMSTRTYPE_MASK     (3 << MATRIX_SCFG_DEFMSTRTYPE_SHIFT)
-#  define MATRIX_SCFG_DEFMSTRTYPE_NONE   (0 << MATRIX_SCFG_DEFMSTRTYPE_SHIFT)
-#  define MATRIX_SCFG_DEFMSTRTYPE_LAST   (1 << MATRIX_SCFG_DEFMSTRTYPE_SHIFT)
-#  define MATRIX_SCFG_DEFMSTRTYPE_FIXED  (2 << MATRIX_SCFG_DEFMSTRTYPE_SHIFT)
-#define MATRIX_SCFG_FIXEDDEFMSTR_SHIFT   (18)      /* Bits 18-20:   Fixed Default Master */
-#define MATRIX_SCFG_FIXEDDEFMSTR_MASK    (7 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG0_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG1_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG2_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG3_FIXEDDEFMSTR_ARMC (0 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG4_FIXEDDEFMSTR_ARMC (0 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG5_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG6_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG7_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG8_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG8_FIXEDDEFMSTR_HDMA (4 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG9_FIXEDDEFMSTR_ARMS (1 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-#  define MATRIX_SCFG9_FIXEDDEFMSTR_HDMA (4 << MATRIX_SCFG_FIXEDDEFMSTR_SHIFT)
-
-#define MATRIX_SCFG_ARBT_SHIFT          (24)      /* Bits 24-25:   Arbitration Type */
-#define MATRIX_SCFG_ARBT_MASK           (3 << MATRIX_SCFG_ARBT_SHIFT)
-#  define MATRIX_SCFG_ARBT_RR           (0 << MATRIX_SCFG_ARBT_SHIFT) /* Round-Robin Arbitration */
-#  define MATRIX_SCFG_ARBT_FIXED        (1 << MATRIX_SCFG_ARBT_SHIFT) /* Fixed Priority Arbitration */
-
-#define MATRIX_PRAS_MPR_SHIFT(x)        ((n)<<2)
-#define MATRIX_PRAS_MPR_MASK(x)         (3 << MATRIX_PRAS_MPR_SHIFT(x))
-#define MATRIX_PRAS_M0PR_SHIFT          (0)       /* Bits 0-1:  Master 0 Priority */
-#define MATRIX_PRAS_M0PR_MASK           (3 << MATRIX_PRAS_M0PR_SHIFT)
-#define MATRIX_PRAS_M1PR_SHIFT          (4)       /* Bits 4-5:   Master 1 Priority */
-#define MATRIX_PRAS_M1PR_MASK           (3 << MATRIX_PRAS_M1PR_SHIFT)
-#define MATRIX_PRAS_M2PR_SHIFT          (8)       /* Bits 8-9:  Master 2 Priority */
-#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-17  Master 4 Priority */
-#define MATRIX_PRAS_M4PR_MASK           (3 << MATRIX_PRAS_M4PR_SHIFT)
-
-#define MATRIX_MRCR_RCB(x)              (1 << (x))
-#define MATRIX_MRCR_RCB0                (1 << 0)  /* Bit 0:  Remap Command Bit for AHB Master 0 */
-#define MATRIX_MRCR_RCB1                (1 << 1)  /* Bit 1:  Remap Command Bit for AHB Master 1 */
-#define MATRIX_MRCR_RCB2                (1 << 2)  /* Bit 2:  Remap Command Bit for AHB Master 2 */
-#define MATRIX_MRCR_RCB3                (1 << 3)  /* Bit 3:  Remap Command Bit for AHB Master 3 */
-#define MATRIX_MRCR_RCB4                (1 << 4)  /* Bit 4:  Remap Command Bit for AHB Master 4 */
-
-#define MATRIX_WPMR_WPEN                (1 << 0)  /* Bit 0:  Write Protect Enable */
-#define MATRIX_WPMR_WPKEY_SHIFT         (8)       /* Bits 8-31:   Write Protect KEY (Write-only) */
-#define MATRIX_WPMR_WPKEY_MASK          (0x00ffffff << MATRIX_WPMR_WPKEY_SHIFT)
-
-#define MATRIX_WPSR_WPVS                (1 << 0)  /* Bit 0:  Enable Write Protect */
-#define MATRIX_WPSR_WPVSRC_SHIFT        (8)       /* Bits 8-23:  Write Protect Violation Source */
-#define MATRIX_WPSR_WPVSRC_MASK         (0xffff << MATRIX_WPSR_WPVSRC_SHIFT)
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Functions
- ****************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_MATRIX_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_memorymap.h b/nuttx/arch/arm/src/sam3u/sam3u_memorymap.h
deleted file mode 100644
index 81027f7b4..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_memorymap.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/************************************************************************************************
- * arch/arm/src/sam3u/sam3u_memorymap.h
- *
- *   Copyright (C) 2009-2010 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_SAM3U_SAM3U_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_MEMORYMAP_H
-
-/************************************************************************************************
- * Included Files
- ************************************************************************************************/
-
-#include <nuttx/config.h>
-#include "chip.h"
-
-/************************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************************/
-
-#define   SAM3U_CODE_BASE        0x00000000 /* 0x00000000-0x1fffffff: Code space */
-#  define SAM3U_BOOTMEMORY_BASE  0x00000000 /* 0x00000000-0x0007ffff:   Boot Memory */
-#  define SAM3U_INTFLASH0_BASE   0x00080000 /* 0x00080000-0x000fffff:   Internal FLASH 0 */
-#  define SAM3U_INTFLASH1_BASE   0x00100000 /* 0x00100000-0x0017ffff:   Internal FLASH 1 */
-#  define SAM3U_INTROM_BASE      0x00180000 /* 0x00180000-0x001fffff:   Internal ROM */
-                                            /* 0x00200000-0x1fffffff:   Reserved */
-#define   SAM3U_INTSRAM_BASE     0x20000000 /* 0x20000000-0x3fffffff: Internal SRAM */
-#  define SAM3U_INTSRAM0_BASE    0x20000000 /* 0x20000000-0x2007ffff:   SRAM0 (see chip.h) */
-#  define SAM3U_INTSRAM1_BASE    0x20080000 /* 0x20080000-0x200fffff:   SRAM1 (see chip.h) */
-#  define SAM3U_NFCSRAM_BASE     0x20100000 /* 0x20100000-0x207fffff:   NAND FLASH controller (SRAM) */
-#  define SAM3U_UDPHPSDMS_BASE   0x20180000 /* 0x20180000-0x201fffff:   USB Device High Speed (DMA) */
-                                            /* 0x20200000-0x2fffffff:   Undefined */
-#  define SAM3U_BBSRAM_BASE      0x22000000 /* 0x22000000-0x23ffffff:   32Mb bit-band alias */
-                                            /* 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         0x40004000 /* 0x40004000-0x40007fff:   Synchronous Serial Controller */
-#  define SAM3U_SPI_BASE         0x40008000 /* 0x40008000-0x4000bfff:   Serial Peripheral Interface */
-                                            /* 0x4000c000-0x4007ffff:   Reserved */
-#  define SAM3U_TC_BASE          0x40080000 /* 0x40080000-0x40083fff:   Timer Counters */
-#    define SAM3U_TCN_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 */
-#    define SAM3U_TC2_BASE       0x40080080 /* 0x40080080-0x400800bf:     Timer Counter 2 */
-#  define SAM3U_TWI_BASE         0x40084000 /* 0x40084000-0x4008ffff:   Two-Wire Interface */
-#    define SAM3U_TWIN_BASE(n)   (0x40084000+((n)<<14))
-#    define SAM3U_TWI0_BASE      0x40084000 /* 0x40084000-0x40087fff:     Two-Wire Interface 0 */
-#    define SAM3U_TWI1_BASE      0x40088000 /* 0x40088000-0x4008bfff:     Two-Wire Interface 1 */
-#  define SAM3U_PWM_BASE         0x4008c000 /* 0x4008c000-0x4008ffff:   Pulse Width Modulation Controller */
-#  define SAM3U_USART_BASE       0x40090000 /* 0x40090000-0x4009ffff:   USART */
-#    define SAM3U_USARTN_BASE(n) (0x40090000+((n)<<14))
-#    define SAM3U_USART0_BASE    0x40090000 /* 0x40090000-0x40093fff:     USART0 */
-#    define SAM3U_USART1_BASE    0x40094000 /* 0x40094000-0x40097fff:     USART1 */
-#    define SAM3U_USART2_BASE    0x40098000 /* 0x40098000-0x4009bfff:     USART2 */
-#    define SAM3U_USART3_BASE    0x4009c000 /* 0x4009c000-0x4009ffff:     USART3 */
-                                            /* 0x400a0000-0x400a3fff:   Reserved */
-#  define SAM3U_UDPHS_BASE       0x400a4000 /* 0x400a4000-0x400a7fff:   USB Device High Speed */
-#  define SAM3U_ADC12B_BASE      0x400a8000 /* 0x400a8000-0x400abfff:   12-bit ADC Controller */
-#  define SAM3U_ADC_BASE         0x400ac000 /* 0x400ac000-0x400affff:   10-bit ADC Controller */
-#  define SAM3U_DMAC_BASE        0x400b0000 /* 0x400b0000-0x400b3fff:   DMA controller */
-                                            /* 0x400b4000-0x400dffff:   Reserved */
-#  define SAM3U_SYSCTRLR_BASE    0x400e0000 /* 0x400e0000-0x400e25ff:   System controller */
-                                            /* 0x400e2600-0x400fffff:   Reserved */
-                                            /* 0x40100000-0x41ffffff:   Reserved */
-#  define SAM3U_BBPERIPH__BASE   0x42000000 /* 0x42000000-0x43ffffff:   32Mb bit-band alias */
-                                            /* 0x44000000-0x5fffffff:   Reserved */
-#define   SAM3U_EXTSRAM_BASE     0x60000000 /* 0x60000000-0x9fffffff: External SRAM */
-#  define SAM3U_EXTCS_BASE       0x60000000 /* 0x60000000-0x63ffffff:   Chip selects */
-#    define SAM3U_EXTCSN_BASE(n) (0x60000000*((n)<<24))
-#    define SAM3U_EXTCS0_BASE    0x60000000 /* 0x60000000-0x60ffffff:     Chip select 0 */
-#    define SAM3U_EXTCS1_BASE    0x61000000 /* 0x61000000-0x601fffff:     Chip select 1 */
-#    define SAM3U_EXTCS2_BASE    0x62000000 /* 0x62000000-0x62ffffff:     Chip select 2 */
-#    define SAM3U_EXTCS3_BASE    0x63000000 /* 0x63000000-0x63ffffff:     Chip select 3 */
-                                            /* 0x64000000-0x67ffffff:   Reserved */
-#  define SAM3U_NFC_BASE         0x68000000 /* 0x68000000-0x68ffffff:   NAND FLASH controller */
-                                            /* 0x69000000-0x9fffffff:   Reserved */
-                                            /* 0xa0000000-0xdfffffff:   Reserved */
-#define   SAM3U_SYSTEM_BASE      0xe0000000 /* 0xe0000000-0xffffffff: System */
-
-/* System Controller Register Blocks:  0x400e0000-0x4007ffff */
-
-#define SAM3U_SMC_BASE           0x400e0000 /* 0x400e0000-0x400e01ff: Static Memory Controller */
-#define SAM3U_MATRIX_BASE        0x400e0200 /* 0x400e0200-0x400e03ff: MATRIX */
-#define SAM3U_PMC_BASE           0x400e0400 /* 0x400e0400-0x400e05ff: Power Management Controller */
-#define SAM3U_UART_BASE          0x400e0600 /* 0x400e0600-0x400e073f: UART */
-#define SAM3U_CHIPID_BASE        0x400e0740 /* 0x400e0740-0x400e07ff: CHIP ID */
-#define SAM3U_EEFC_BASE          0x400e0800 /* 0x400e0800-0x400e0bff: Enhanced Embedded Flash Controllers*/
-#  define SAM3U_EEFCN_BASE(n)    (0x400e0800+((n)<<9))
-#  define SAM3U_EEFC0_BASE       0x400e0800 /* 0x400e0800-0x400e09ff:   Enhanced Embedded Flash Controller 0 */
-#  define SAM3U_EEFC1_BASE       0x400e0a00 /* 0x400e0a00-0x400e0bff:   Enhanced Embedded Flash Controller 1 */
-#define SAM3U_PIO_BASE           0x400e0c00 /* 0x400e0c00-0x400e11ff: Parallel I/O Controllers */
-#  define SAM3U_PION_BASE(n)     (0x400e0c00+((n)<<9))
-#  define SAM3U_PIOA_BASE        0x400e0c00 /* 0x400e0c00-0x400e0dff:   Parallel I/O Controller A */
-#  define SAM3U_PIOB_BASE        0x400e0e00 /* 0x400e0e00-0x400e0fff:   Parallel I/O Controller B */
-#  define SAM3U_PIOC_BASE        0x400e1000 /* 0x400e1000-0x400e11ff:   Parallel I/O Controller C */
-#define SAM3U_RSTC_BASE          0x400e1200 /* 0x400e1200-0x400e120f: Reset Controller */
-#define SAM3U_SUPC_BASE          0x400e1210 /* 0x400e1210-0x400e122f: Supply Controller */
-#define SAM3U_RTT_BASE           0x400e1230 /* 0x400e1230-0x400e124f: Real Time Timer */
-#define SAM3U_WDT_BASE           0x400e1250 /* 0x400e1250-0x400e125f: Watchdog Timer */
-#define SAM3U_RTC_BASE           0x400e1260 /* 0x400e1260-0x400e128f: Real Time Clock */
-#define SAM3U_GPBR_BASE          0x400e1290 /* 0x400e1290-0x400e13ff: GPBR */
-                                            /* 0x490e1400-0x4007ffff: Reserved */
-
-/************************************************************************************************
- * Public Types
- ************************************************************************************************/
-
-/************************************************************************************************
- * Public Data
- ************************************************************************************************/
-
-/************************************************************************************************
- * Public Functions
- ************************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_MEMORYMAP_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_pio.h b/nuttx/arch/arm/src/sam3u/sam3u_pio.h
deleted file mode 100644
index b55197ae1..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_pio.h
+++ /dev/null
@@ -1,324 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_pio.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_PIO_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_PIO_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/****************************************************************************************
- * Pre-processor Definitions
- ****************************************************************************************/
-
-/* PIO register offsets *****************************************************************/
-
-#define SAM3U_PIO_PER_OFFSET         0x0000 /* PIO Enable Register */
-#define SAM3U_PIO_PDR_OFFSET         0x0004 /* PIO Disable Register */
-#define SAM3U_PIO_PSR_OFFSET         0x0008 /* PIO Status Register */
-                                            /* 0x000c: Reserved */
-#define SAM3U_PIO_OER_OFFSET         0x0010 /* Output Enable Register */
-#define SAM3U_PIO_ODR_OFFSET         0x0014 /* Output Disable Register */
-#define SAM3U_PIO_OSR_OFFSET         0x0018 /* utput Status Register */
-                                            /* 0x001c: Reserved */
-#define SAM3U_PIO_IFER_OFFSET        0x0020 /* Glitch Input Filter Enable Register */
-#define SAM3U_PIO_IFDR_OFFSET        0x0024 /* Glitch Input Filter Disable Register */
-#define SAM3U_PIO_IFSR_OFFSET        0x0028 /* Glitch Input Filter Status Register */
-                                            /* 0x002c: Reserved */
-#define SAM3U_PIO_SODR_OFFSET        0x0030 /* Set Output Data Register */
-#define SAM3U_PIO_CODR_OFFSET        0x0034 /* Clear Output Data Register */
-#define SAM3U_PIO_ODSR_OFFSET        0x0038 /* Output Data Status Register */
-#define SAM3U_PIO_PDSR_OFFSET        0x003c /* Pin Data Status Register */
-#define SAM3U_PIO_IER_OFFSET         0x0040 /* Interrupt Enable Register */
-#define SAM3U_PIO_IDR_OFFSET         0x0044 /* Interrupt Disable Register */
-#define SAM3U_PIO_IMR_OFFSET         0x0048 /* Interrupt Mask Register */
-#define SAM3U_PIO_ISR_OFFSET         0x004c /* Interrupt Status Register */
-#define SAM3U_PIO_MDER_OFFSET        0x0050 /* Multi-driver Enable Register */
-#define SAM3U_PIO_MDDR_OFFSET        0x0054 /* Multi-driver Disable Register */
-#define SAM3U_PIO_MDSR_OFFSET        0x0058 /* Multi-driver Status Register */
-                                            /* 0x005c: Reserved */
-#define SAM3U_PIO_PUDR_OFFSET        0x0060 /* Pull-up Disable Register */
-#define SAM3U_PIO_PUER_OFFSET        0x0064 /* Pull-up Enable Register */
-#define SAM3U_PIO_PUSR_OFFSET        0x0068 /* Pad Pull-up Status Register */
-                                            /* 0x006c: Reserved */
-#define SAM3U_PIO_ABSR_OFFSET        0x0070 /* Peripheral AB Select Register */
-                                            /* 0x0074-0x007c: Reserved */
-#define SAM3U_PIO_SCIFSR_OFFSET      0x0080 /* System Clock Glitch Input Filter Select Register */
-#define SAM3U_PIO_DIFSR_OFFSET       0x0084 /* Debouncing Input Filter Select Register */
-#define SAM3U_PIO_IFDGSR_OFFSET      0x0088 /* Glitch or Debouncing Input Filter Clock Selection Status Register */
-#define SAM3U_PIO_SCDR_OFFSET        0x008c /* Slow Clock Divider Debouncing Register */
-                                            /* 0x0090-0x009c: Reserved */
-#define SAM3U_PIO_OWER_OFFSET        0x00a0 /* Output Write Enable */
-#define SAM3U_PIO_OWDR_OFFSET        0x00a4 /* Output Write Disable */
-#define SAM3U_PIO_OWSR_OFFSET        0x00a8 /* Output Write Status Register */
-                                            /* 0x00ac: Reserved */
-#define SAM3U_PIO_AIMER_OFFSET       0x00b0 /* Additional Interrupt Modes Enable Register */
-#define SAM3U_PIO_AIMDR_OFFSET       0x00b4 /* Additional Interrupt Modes Disables Register */
-#define SAM3U_PIO_AIMMR_OFFSET       0x00b8 /* Additional Interrupt Modes Mask Register */
-                                            /* 0x00bc: Reserved */
-#define SAM3U_PIO_ESR_OFFSET         0x00c0 /* Edge Select Register */
-#define SAM3U_PIO_LSR_OFFSET         0x00c4 /* Level Select Register */
-#define SAM3U_PIO_ELSR_OFFSET        0x00c8 /* Edge/Level Status Register */
-                                            /* 0x00cc: Reserved */
-#define SAM3U_PIO_FELLSR_OFFSET      0x00d0 /* Falling Edge/Low Level Select Register */
-#define SAM3U_PIO_REHLSR_OFFSET      0x00d4 /* Rising Edge/ High Level Select Register */
-#define SAM3U_PIO_FRLHSR_OFFSET      0x00d8 /* Fall/Rise - Low/High Status Register */
-                                            /* 0x00dc: Reserved */
-#define SAM3U_PIO_LOCKSR_OFFSET      0x00e0 /* Lock Status */
-#define SAM3U_PIO_WPMR_OFFSET        0x00e4 /* Write Protect Mode Register */
-#define SAM3U_PIO_WPSR_OFFSET        0x00e8 /* Write Protect Status Register */
-                                            /* 0x00ec-0x00f8: Reserved */
-                                            /* 0x0100-0x0144: Reserved */
-
-/* PIO register adresses ****************************************************************/
-
-#define PIOA                         (0)
-#define PIOB                         (1)
-#define PIOC                         (2)
-#define NPIO                         (3)
-
-#define SAM3U_PIO_PER(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_PER_OFFSET)
-#define SAM3U_PIO_PDR(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_PDR_OFFSET)
-#define SAM3U_PIO_PSR(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_PSR_OFFSET)
-#define SAM3U_PIO_OER(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_OER_OFFSET)
-#define SAM3U_PIO_ODR(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_ODR_OFFSET)
-#define SAM3U_PIO_OSR(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_OSR_OFFSET)
-#define SAM3U_PIO_IFER(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_IFER_OFFSET)
-#define SAM3U_PIO_IFDR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_IFDR_OFFSET)
-#define SAM3U_PIO_IFSR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_IFSR_OFFSET)
-#define SAM3U_PIO_SODR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_SODR_OFFSET)
-#define SAM3U_PIO_CODR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_CODR_OFFSET)
-#define SAM3U_PIO_ODSR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_ODSR_OFFSET)
-#define SAM3U_PIO_PDSR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_PDSR_OFFSET)
-#define SAM3U_PIO_IER(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_IER_OFFSET)
-#define SAM3U_PIO_IDR(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_IDR_OFFSET)
-#define SAM3U_PIO_IMR(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_IMR_OFFSET)
-#define SAM3U_PIO_ISR(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_ISR_OFFSET)
-#define SAM3U_PIO_MDER(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_MDER_OFFSET)
-#define SAM3U_PIO_MDDR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_MDDR_OFFSET)
-#define SAM3U_PIO_MDSR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_MDSR_OFFSET)
-#define SAM3U_PIO_PUDR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_PUDR_OFFSET)
-#define SAM3U_PIO_PUER(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_PUER_OFFSET)
-#define SAM3U_PIO_PUSR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_PUSR_OFFSET)
-#define SAM3U_PIO_ABSR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_ABSR_OFFSET)
-#define SAM3U_PIO_SCIFSR(n)          (SAM3U_PIO_BASE(n)+SAM3U_PIO_SCIFSR_OFFSET)
-#define SAM3U_PIO_DIFSR(n)           (SAM3U_PIO_BASE(n)+SAM3U_PIO_DIFSR_OFFSET)
-#define SAM3U_PIO_IFDGSR(n)          (SAM3U_PIO_BASE(n)+SAM3U_PIO_IFDGSR_OFFSET)
-#define SAM3U_PIO_SCDR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_SCDR_OFFSET)
-#define SAM3U_PIO_OWER(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_OWER_OFFSET)
-#define SAM3U_PIO_OWDR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_OWDR_OFFSET)
-#define SAM3U_PIO_OWSR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_OWSR_OFFSET)
-#define SAM3U_PIO_AIMER(n)           (SAM3U_PIO_BASE(n)+SAM3U_PIO_AIMER_OFFSET)
-#define SAM3U_PIO_AIMDR(n)           (SAM3U_PIO_BASE(n)+SAM3U_PIO_AIMDR_OFFSET)
-#define SAM3U_PIO_AIMMR(n)           (SAM3U_PIO_BASE(n)+SAM3U_PIO_AIMMR_OFFSET)
-#define SAM3U_PIO_ESR(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_ESR_OFFSET)
-#define SAM3U_PIO_LSR(n)             (SAM3U_PIO_BASE(n)+SAM3U_PIO_LSR_OFFSET)
-#define SAM3U_PIO_ELSR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_ELSR_OFFSET)
-#define SAM3U_PIO_FELLSR(n)          (SAM3U_PIO_BASE(n)+SAM3U_PIO_FELLSR_OFFSET)
-#define SAM3U_PIO_REHLSR(n)          (SAM3U_PIO_BASE(n)+SAM3U_PIO_REHLSR_OFFSET)
-#define SAM3U_PIO_FRLHSR(n)          (SAM3U_PIO_BASE(n)+SAM3U_PIO_FRLHSR_OFFSET)
-#define SAM3U_PIO_LOCKSR(n)          (SAM3U_PIO_BASE(n)+SAM3U_PIO_LOCKSR_OFFSET)
-#define SAM3U_PIO_WPMR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_WPMR_OFFSET)
-#define SAM3U_PIO_WPSR(n)            (SAM3U_PIO_BASE(n)+SAM3U_PIO_WPSR_OFFSET)
-
-#define SAM3U_PIOA_PER               (SAM3U_PIOA_BASE+SAM3U_PIO_PER_OFFSET)
-#define SAM3U_PIOA_PDR_              (SAM3U_PIOA_BASE+SAM3U_PIO_PDR_OFFSET)
-#define SAM3U_PIOA_PSR               (SAM3U_PIOA_BASE+SAM3U_PIO_PSR_OFFSET)
-#define SAM3U_PIOA_OER               (SAM3U_PIOA_BASE+SAM3U_PIO_OER_OFFSET)
-#define SAM3U_PIOA_ODR               (SAM3U_PIOA_BASE+SAM3U_PIO_ODR_OFFSET)
-#define SAM3U_PIOA_OSR               (SAM3U_PIOA_BASE+SAM3U_PIO_OSR_OFFSET)
-#define SAM3U_PIOA_IFER              (SAM3U_PIOA_BASE+SAM3U_PIO_IFER_OFFSET)
-#define SAM3U_PIOA_IFDR              (SAM3U_PIOA_BASE+SAM3U_PIO_IFDR_OFFSET)
-#define SAM3U_PIOA_IFSR              (SAM3U_PIOA_BASE+SAM3U_PIO_IFSR_OFFSET)
-#define SAM3U_PIOA_SODR              (SAM3U_PIOA_BASE+SAM3U_PIO_SODR_OFFSET)
-#define SAM3U_PIOA_CODR              (SAM3U_PIOA_BASE+SAM3U_PIO_CODR_OFFSET)
-#define SAM3U_PIOA_ODSR              (SAM3U_PIOA_BASE+SAM3U_PIO_ODSR_OFFSET)
-#define SAM3U_PIOA_PDSR              (SAM3U_PIOA_BASE+SAM3U_PIO_PDSR_OFFSET)
-#define SAM3U_PIOA_IER               (SAM3U_PIOA_BASE+SAM3U_PIO_IER_OFFSET)
-#define SAM3U_PIOA_IDR               (SAM3U_PIOA_BASE+SAM3U_PIO_IDR_OFFSET)
-#define SAM3U_PIOA_IMR               (SAM3U_PIOA_BASE+SAM3U_PIO_IMR_OFFSET)
-#define SAM3U_PIOA_ISR               (SAM3U_PIOA_BASE+SAM3U_PIO_ISR_OFFSET)
-#define SAM3U_PIOA_MDER              (SAM3U_PIOA_BASE+SAM3U_PIO_MDER_OFFSET)
-#define SAM3U_PIOA_MDDR              (SAM3U_PIOA_BASE+SAM3U_PIO_MDDR_OFFSET)
-#define SAM3U_PIOA_MDSR              (SAM3U_PIOA_BASE+SAM3U_PIO_MDSR_OFFSET)
-#define SAM3U_PIOA_PUDR              (SAM3U_PIOA_BASE+SAM3U_PIO_PUDR_OFFSET)
-#define SAM3U_PIOA_PUER              (SAM3U_PIOA_BASE+SAM3U_PIO_PUER_OFFSET)
-#define SAM3U_PIOA_PUSR              (SAM3U_PIOA_BASE+SAM3U_PIO_PUSR_OFFSET)
-#define SAM3U_PIOA_ABSR              (SAM3U_PIOA_BASE+SAM3U_PIO_ABSR_OFFSET)
-#define SAM3U_PIOA_SCIFSR            (SAM3U_PIOA_BASE+SAM3U_PIO_SCIFSR_OFFSET)
-#define SAM3U_PIOA_DIFSR             (SAM3U_PIOA_BASE+SAM3U_PIO_DIFSR_OFFSET)
-#define SAM3U_PIOA_IFDGSR            (SAM3U_PIOA_BASE+SAM3U_PIO_IFDGSR_OFFSET)
-#define SAM3U_PIOA_SCDR              (SAM3U_PIOA_BASE+SAM3U_PIO_SCDR_OFFSET)
-#define SAM3U_PIOA_OWER              (SAM3U_PIOA_BASE+SAM3U_PIO_OWER_OFFSET)
-#define SAM3U_PIOA_OWDR              (SAM3U_PIOA_BASE+SAM3U_PIO_OWDR_OFFSET)
-#define SAM3U_PIOA_OWSR              (SAM3U_PIOA_BASE+SAM3U_PIO_OWSR_OFFSET)
-#define SAM3U_PIOA_AIMER             (SAM3U_PIOA_BASE+SAM3U_PIO_AIMER_OFFSET)
-#define SAM3U_PIOA_AIMDR             (SAM3U_PIOA_BASE+SAM3U_PIO_AIMDR_OFFSET)
-#define SAM3U_PIOA_AIMMR             (SAM3U_PIOA_BASE+SAM3U_PIO_AIMMR_OFFSET)
-#define SAM3U_PIOA_ESR               (SAM3U_PIOA_BASE+SAM3U_PIO_ESR_OFFSET)
-#define SAM3U_PIOA_LSR               (SAM3U_PIOA_BASE+SAM3U_PIO_LSR_OFFSET)
-#define SAM3U_PIOA_ELSR              (SAM3U_PIOA_BASE+SAM3U_PIO_ELSR_OFFSET)
-#define SAM3U_PIOA_FELLSR            (SAM3U_PIOA_BASE+SAM3U_PIO_FELLSR_OFFSET)
-#define SAM3U_PIOA_REHLSR            (SAM3U_PIOA_BASE+SAM3U_PIO_REHLSR_OFFSET)
-#define SAM3U_PIOA_FRLHSR            (SAM3U_PIOA_BASE+SAM3U_PIO_FRLHSR_OFFSET)
-#define SAM3U_PIOA_LOCKSR            (SAM3U_PIOA_BASE+SAM3U_PIO_LOCKSR_OFFSET)
-#define SAM3U_PIOA_WPMR              (SAM3U_PIOA_BASE+SAM3U_PIO_WPMR_OFFSET)
-#define SAM3U_PIOA_WPSR              (SAM3U_PIOA_BASE+SAM3U_PIO_WPSR_OFFSET)
-
-#define SAM3U_PIOB_PER               (SAM3U_PIOB_BASE+SAM3U_PIO_PER_OFFSET)
-#define SAM3U_PIOB_PDR_              (SAM3U_PIOB_BASE+SAM3U_PIO_PDR_OFFSET)
-#define SAM3U_PIOB_PSR               (SAM3U_PIOB_BASE+SAM3U_PIO_PSR_OFFSET)
-#define SAM3U_PIOB_OER               (SAM3U_PIOB_BASE+SAM3U_PIO_OER_OFFSET)
-#define SAM3U_PIOB_ODR               (SAM3U_PIOB_BASE+SAM3U_PIO_ODR_OFFSET)
-#define SAM3U_PIOB_OSR               (SAM3U_PIOB_BASE+SAM3U_PIO_OSR_OFFSET)
-#define SAM3U_PIOB_IFER              (SAM3U_PIOB_BASE+SAM3U_PIO_IFER_OFFSET)
-#define SAM3U_PIOB_IFDR              (SAM3U_PIOB_BASE+SAM3U_PIO_IFDR_OFFSET)
-#define SAM3U_PIOB_IFSR              (SAM3U_PIOB_BASE+SAM3U_PIO_IFSR_OFFSET)
-#define SAM3U_PIOB_SODR              (SAM3U_PIOB_BASE+SAM3U_PIO_SODR_OFFSET)
-#define SAM3U_PIOB_CODR              (SAM3U_PIOB_BASE+SAM3U_PIO_CODR_OFFSET)
-#define SAM3U_PIOB_ODSR              (SAM3U_PIOB_BASE+SAM3U_PIO_ODSR_OFFSET)
-#define SAM3U_PIOB_PDSR              (SAM3U_PIOB_BASE+SAM3U_PIO_PDSR_OFFSET)
-#define SAM3U_PIOB_IER               (SAM3U_PIOB_BASE+SAM3U_PIO_IER_OFFSET)
-#define SAM3U_PIOB_IDR               (SAM3U_PIOB_BASE+SAM3U_PIO_IDR_OFFSET)
-#define SAM3U_PIOB_IMR               (SAM3U_PIOB_BASE+SAM3U_PIO_IMR_OFFSET)
-#define SAM3U_PIOB_ISR               (SAM3U_PIOB_BASE+SAM3U_PIO_ISR_OFFSET)
-#define SAM3U_PIOB_MDER              (SAM3U_PIOB_BASE+SAM3U_PIO_MDER_OFFSET)
-#define SAM3U_PIOB_MDDR              (SAM3U_PIOB_BASE+SAM3U_PIO_MDDR_OFFSET)
-#define SAM3U_PIOB_MDSR              (SAM3U_PIOB_BASE+SAM3U_PIO_MDSR_OFFSET)
-#define SAM3U_PIOB_PUDR              (SAM3U_PIOB_BASE+SAM3U_PIO_PUDR_OFFSET)
-#define SAM3U_PIOB_PUER              (SAM3U_PIOB_BASE+SAM3U_PIO_PUER_OFFSET)
-#define SAM3U_PIOB_PUSR              (SAM3U_PIOB_BASE+SAM3U_PIO_PUSR_OFFSET)
-#define SAM3U_PIOB_ABSR              (SAM3U_PIOB_BASE+SAM3U_PIO_ABSR_OFFSET)
-#define SAM3U_PIOB_SCIFSR            (SAM3U_PIOB_BASE+SAM3U_PIO_SCIFSR_OFFSET)
-#define SAM3U_PIOB_DIFSR             (SAM3U_PIOB_BASE+SAM3U_PIO_DIFSR_OFFSET)
-#define SAM3U_PIOB_IFDGSR            (SAM3U_PIOB_BASE+SAM3U_PIO_IFDGSR_OFFSET)
-#define SAM3U_PIOB_SCDR              (SAM3U_PIOB_BASE+SAM3U_PIO_SCDR_OFFSET)
-#define SAM3U_PIOB_OWER              (SAM3U_PIOB_BASE+SAM3U_PIO_OWER_OFFSET)
-#define SAM3U_PIOB_OWDR              (SAM3U_PIOB_BASE+SAM3U_PIO_OWDR_OFFSET)
-#define SAM3U_PIOB_OWSR              (SAM3U_PIOB_BASE+SAM3U_PIO_OWSR_OFFSET)
-#define SAM3U_PIOB_AIMER             (SAM3U_PIOB_BASE+SAM3U_PIO_AIMER_OFFSET)
-#define SAM3U_PIOB_AIMDR             (SAM3U_PIOB_BASE+SAM3U_PIO_AIMDR_OFFSET)
-#define SAM3U_PIOB_AIMMR             (SAM3U_PIOB_BASE+SAM3U_PIO_AIMMR_OFFSET)
-#define SAM3U_PIOB_ESR               (SAM3U_PIOB_BASE+SAM3U_PIO_ESR_OFFSET)
-#define SAM3U_PIOB_LSR               (SAM3U_PIOB_BASE+SAM3U_PIO_LSR_OFFSET)
-#define SAM3U_PIOB_ELSR              (SAM3U_PIOB_BASE+SAM3U_PIO_ELSR_OFFSET)
-#define SAM3U_PIOB_FELLSR            (SAM3U_PIOB_BASE+SAM3U_PIO_FELLSR_OFFSET)
-#define SAM3U_PIOB_REHLSR            (SAM3U_PIOB_BASE+SAM3U_PIO_REHLSR_OFFSET)
-#define SAM3U_PIOB_FRLHSR            (SAM3U_PIOB_BASE+SAM3U_PIO_FRLHSR_OFFSET)
-#define SAM3U_PIOB_LOCKSR            (SAM3U_PIOB_BASE+SAM3U_PIO_LOCKSR_OFFSET)
-#define SAM3U_PIOB_WPMR              (SAM3U_PIOB_BASE+SAM3U_PIO_WPMR_OFFSET)
-#define SAM3U_PIOB_WPSR              (SAM3U_PIOB_BASE+SAM3U_PIO_WPSR_OFFSET)
-
-#define SAM3U_PIOC_PER               (SAM3U_PIOC_BASE+SAM3U_PIO_PER_OFFSET)
-#define SAM3U_PIOC_PDR_              (SAM3U_PIOC_BASE+SAM3U_PIO_PDR_OFFSET)
-#define SAM3U_PIOC_PSR               (SAM3U_PIOC_BASE+SAM3U_PIO_PSR_OFFSET)
-#define SAM3U_PIOC_OER               (SAM3U_PIOC_BASE+SAM3U_PIO_OER_OFFSET)
-#define SAM3U_PIOC_ODR               (SAM3U_PIOC_BASE+SAM3U_PIO_ODR_OFFSET)
-#define SAM3U_PIOC_OSR               (SAM3U_PIOC_BASE+SAM3U_PIO_OSR_OFFSET)
-#define SAM3U_PIOC_IFER              (SAM3U_PIOC_BASE+SAM3U_PIO_IFER_OFFSET)
-#define SAM3U_PIOC_IFDR              (SAM3U_PIOC_BASE+SAM3U_PIO_IFDR_OFFSET)
-#define SAM3U_PIOC_IFSR              (SAM3U_PIOC_BASE+SAM3U_PIO_IFSR_OFFSET)
-#define SAM3U_PIOC_SODR              (SAM3U_PIOC_BASE+SAM3U_PIO_SODR_OFFSET)
-#define SAM3U_PIOC_CODR              (SAM3U_PIOC_BASE+SAM3U_PIO_CODR_OFFSET)
-#define SAM3U_PIOC_ODSR              (SAM3U_PIOC_BASE+SAM3U_PIO_ODSR_OFFSET)
-#define SAM3U_PIOC_PDSR              (SAM3U_PIOC_BASE+SAM3U_PIO_PDSR_OFFSET)
-#define SAM3U_PIOC_IER               (SAM3U_PIOC_BASE+SAM3U_PIO_IER_OFFSET)
-#define SAM3U_PIOC_IDR               (SAM3U_PIOC_BASE+SAM3U_PIO_IDR_OFFSET)
-#define SAM3U_PIOC_IMR               (SAM3U_PIOC_BASE+SAM3U_PIO_IMR_OFFSET)
-#define SAM3U_PIOC_ISR               (SAM3U_PIOC_BASE+SAM3U_PIO_ISR_OFFSET)
-#define SAM3U_PIOC_MDER              (SAM3U_PIOC_BASE+SAM3U_PIO_MDER_OFFSET)
-#define SAM3U_PIOC_MDDR              (SAM3U_PIOC_BASE+SAM3U_PIO_MDDR_OFFSET)
-#define SAM3U_PIOC_MDSR              (SAM3U_PIOC_BASE+SAM3U_PIO_MDSR_OFFSET)
-#define SAM3U_PIOC_PUDR              (SAM3U_PIOC_BASE+SAM3U_PIO_PUDR_OFFSET)
-#define SAM3U_PIOC_PUER              (SAM3U_PIOC_BASE+SAM3U_PIO_PUER_OFFSET)
-#define SAM3U_PIOC_PUSR              (SAM3U_PIOC_BASE+SAM3U_PIO_PUSR_OFFSET)
-#define SAM3U_PIOC_ABSR              (SAM3U_PIOC_BASE+SAM3U_PIO_ABSR_OFFSET)
-#define SAM3U_PIOC_SCIFSR            (SAM3U_PIOC_BASE+SAM3U_PIO_SCIFSR_OFFSET)
-#define SAM3U_PIOC_DIFSR             (SAM3U_PIOC_BASE+SAM3U_PIO_DIFSR_OFFSET)
-#define SAM3U_PIOC_IFDGSR            (SAM3U_PIOC_BASE+SAM3U_PIO_IFDGSR_OFFSET)
-#define SAM3U_PIOC_SCDR              (SAM3U_PIOC_BASE+SAM3U_PIO_SCDR_OFFSET)
-#define SAM3U_PIOC_OWER              (SAM3U_PIOC_BASE+SAM3U_PIO_OWER_OFFSET)
-#define SAM3U_PIOC_OWDR              (SAM3U_PIOC_BASE+SAM3U_PIO_OWDR_OFFSET)
-#define SAM3U_PIOC_OWSR              (SAM3U_PIOC_BASE+SAM3U_PIO_OWSR_OFFSET)
-#define SAM3U_PIOC_AIMER             (SAM3U_PIOC_BASE+SAM3U_PIO_AIMER_OFFSET)
-#define SAM3U_PIOC_AIMDR             (SAM3U_PIOC_BASE+SAM3U_PIO_AIMDR_OFFSET)
-#define SAM3U_PIOC_AIMMR             (SAM3U_PIOC_BASE+SAM3U_PIO_AIMMR_OFFSET)
-#define SAM3U_PIOC_ESR               (SAM3U_PIOC_BASE+SAM3U_PIO_ESR_OFFSET)
-#define SAM3U_PIOC_LSR               (SAM3U_PIOC_BASE+SAM3U_PIO_LSR_OFFSET)
-#define SAM3U_PIOC_ELSR              (SAM3U_PIOC_BASE+SAM3U_PIO_ELSR_OFFSET)
-#define SAM3U_PIOC_FELLSR            (SAM3U_PIOC_BASE+SAM3U_PIO_FELLSR_OFFSET)
-#define SAM3U_PIOC_REHLSR            (SAM3U_PIOC_BASE+SAM3U_PIO_REHLSR_OFFSET)
-#define SAM3U_PIOC_FRLHSR            (SAM3U_PIOC_BASE+SAM3U_PIO_FRLHSR_OFFSET)
-#define SAM3U_PIOC_LOCKSR            (SAM3U_PIOC_BASE+SAM3U_PIO_LOCKSR_OFFSET)
-#define SAM3U_PIOC_WPMR              (SAM3U_PIOC_BASE+SAM3U_PIO_WPMR_OFFSET)
-#define SAM3U_PIOC_WPSR              (SAM3U_PIOC_BASE+SAM3U_PIO_WPSR_OFFSET)
-
-/* PIO register bit definitions *********************************************************/
-
-/* Common bit definitions for ALMOST all IO registers (exceptions follow) */
-
-#define PIO(n)                       (1<<(n)) /* Bit n: PIO n */
-
-/* PIO Write Protect Mode Register */
-
-#define PIO_WPMR_WPEN               (1 << 0)  /* Bit 0:  Write Protect Enable */
-#define PIO_WPMR_WPKEY_SHIFT        (8)       /* Bits 8-31: Write Protect KEY */
-#define PIO_WPMR_WPKEY_MASK         (0xffffff << PIO_WPMR_WPKEY_SHIFT)
-
-/* PIO Write Protect Status Register */
-
-#define PIO_WPSR_WPVS               (1 << 0)  /* Bit 0:  Write Protect Violation Status */
-#define PIO_WPSR_WPVSRC_SHIFT       (8)       /* Bits 8-23: Write Protect Violation Source */
-#define PIO_WPSR_WPVSRC_MASK        (0xffff << PIO_WPSR_WPVSRC_SHIFT)
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Functions
- ****************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_PIO_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_pmc.h b/nuttx/arch/arm/src/sam3u/sam3u_pmc.h
deleted file mode 100644
index 75545f239..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_pmc.h
+++ /dev/null
@@ -1,316 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_pmc.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_PMC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_PMC_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/****************************************************************************************
- * Pre-processor Definitions
- ****************************************************************************************/
-
-/* PMC register offsets *****************************************************************/
-
-#define SAM3U_PMC_SCER_OFFSET         0x0000 /* System Clock Enable Register */
-#define SAM3U_PMC_SCDR_OFFSET         0x0004 /* System Clock Disable Register */
-#define SAM3U_PMC_SCSR_OFFSET         0x0008 /* System Clock Status Register */
-                                             /* 0x000c: Reserved */
-#define SAM3U_PMC_PCER_OFFSET         0x0010 /* Peripheral Clock Enable Register */
-#define SAM3U_PMC_PCDR_OFFSET         0x0014 /* Peripheral Clock Disable Register */
-#define SAM3U_PMC_PCSR_OFFSET         0x0018 /* Peripheral Clock Status Register */
-#define SAM3U_CKGR_UCKR_OFFSET        0x001c /* UTMI Clock Register */
-#define SAM3U_CKGR_MOR_OFFSET         0x0020 /* Main Oscillator Register */
-#define SAM3U_CKGR_MCFR_OFFSET        0x0024 /* Main Clock Frequency Register */
-#define SAM3U_CKGR_PLLAR_OFFSET       0x0028 /* PLLA Register */
-                                             /* 0x002c: Reserved */
-#define SAM3U_PMC_MCKR_OFFSET         0x0030 /* Master Clock Register */
-                                             /* 0x0034-0x003C Reserved */
-#define SAM3U_PMC_PCK_OFFSET(n)       (0x0040+((n)<<2))
-#define SAM3U_PMC_PCK0_OFFSET         0x0040 /* Programmable Clock 0 Register */
-#define SAM3U_PMC_PCK1_OFFSET         0x0044 /* Programmable Clock 1 Register */
-#define SAM3U_PMC_PCK2_OFFSET         0x0048 /* Programmable Clock 2 Register */
-                                             /* 0x004c-0x005c: Reserved */
-#define SAM3U_PMC_IER_OFFSET          0x0060 /* Interrupt Enable Register */
-#define SAM3U_PMC_IDR_OFFSET          0x0064 /* Interrupt Disable Register */
-#define SAM3U_PMC_SR_OFFSET           0x0068 /* Status Register */
-#define SAM3U_PMC_IMR_OFFSET          0x006c /* Interrupt Mask Register */
-#define SAM3U_PMC_FSMR_OFFSET         0x0070 /* Fast Startup Mode Register */
-#define SAM3U_PMC_FSPR_OFFSET         0x0074 /* Fast Startup Polarity Register */
-#define SAM3U_PMC_FOCR_OFFSET         0x0078 /* Fault Output Clear Register */
-                                             /* 0x007c-0x00fc: Reserved */
-#define SAM3U_PMC_WPMR_OFFSET         0x00e4 /* Write Protect Mode Register */
-#define SAM3U_PMC_WPSR_OFFSET         0x00e8 /* Write Protect Status Register */
-
-/* PMC register adresses ****************************************************************/
-
-#define SAM3U_PMC_SCER                (SAM3U_PMC_BASE+SAM3U_PMC_SCER_OFFSET)
-#define SAM3U_PMC_SCDR                (SAM3U_PMC_BASE+SAM3U_PMC_SCDR_OFFSET)
-#define SAM3U_PMC_SCSR                (SAM3U_PMC_BASE+SAM3U_PMC_SCSR_OFFSET)
-#define SAM3U_PMC_PCER                (SAM3U_PMC_BASE+SAM3U_PMC_PCER_OFFSET)
-#define SAM3U_PMC_PCDR                (SAM3U_PMC_BASE+SAM3U_PMC_PCDR_OFFSET)
-#define SAM3U_PMC_PCSR                (SAM3U_PMC_BASE+SAM3U_PMC_PCSR_OFFSET)
-#define SAM3U_CKGR_UCKR               (SAM3U_PMC_BASE+SAM3U_CKGR_UCKR_OFFSET)
-#define SAM3U_CKGR_MOR                (SAM3U_PMC_BASE+SAM3U_CKGR_MOR_OFFSET)
-#define SAM3U_CKGR_MCFR               (SAM3U_PMC_BASE+SAM3U_CKGR_MCFR_OFFSET)
-#define SAM3U_CKGR_PLLAR              (SAM3U_PMC_BASE+SAM3U_CKGR_PLLAR_OFFSET)
-#define SAM3U_PMC_MCKR                (SAM3U_PMC_BASE+SAM3U_PMC_MCKR_OFFSET)
-#define SAM3U_PMC_PCK(n)              (SAM3U_PMC_BASE+SAM3U_PMC_PCK_OFFSET(n))
-#define SAM3U_PMC_PCK0                (SAM3U_PMC_BASE+SAM3U_PMC_PCK0_OFFSET)
-#define SAM3U_PMC_PCK1                (SAM3U_PMC_BASE+SAM3U_PMC_PCK1_OFFSET)
-#define SAM3U_PMC_PCK2                (SAM3U_PMC_BASE+SAM3U_PMC_PCK2_OFFSET)
-#define SAM3U_PMC_IER                 (SAM3U_PMC_BASE+SAM3U_PMC_IER_OFFSET)
-#define SAM3U_PMC_IDR                 (SAM3U_PMC_BASE+SAM3U_PMC_IDR_OFFSET)
-#define SAM3U_PMC_SR                  (SAM3U_PMC_BASE+SAM3U_PMC_SR_OFFSET)
-#define SAM3U_PMC_IMR                 (SAM3U_PMC_BASE+SAM3U_PMC_IMR_OFFSET)
-#define SAM3U_PMC_FSMR                (SAM3U_PMC_BASE+SAM3U_PMC_FSMR_OFFSET)
-#define SAM3U_PMC_FSPR                (SAM3U_PMC_BASE+SAM3U_PMC_FSPR_OFFSET)
-#define SAM3U_PMC_FOCR                (SAM3U_PMC_BASE+SAM3U_PMC_FOCR_OFFSET)
-#define SAM3U_PMC_WPMR                (SAM3U_PMC_BASE+SAM3U_PMC_WPMR_OFFSET)
-#define SAM3U_PMC_WPSR                (SAM3U_PMC_BASE+SAM3U_PMC_WPSR_OFFSET)
-
-/* PMC register bit definitions *********************************************************/
-
-/* PMC System Clock Enable Register, PMC System Clock Disable Register, and PMC System
- * Clock Status Register common bit-field definitions
- */
-
-#define PMC_PCK(n)                    (1 <<((n)+8)
-#define PMC_PCK0                      (1 << 8)  /* Bit 8:  Programmable Clock 0 Output Enable */
-#define PMC_PCK1                      (1 << 9)  /* Bit 9:  Programmable Clock 1 Output Enable */
-#define PMC_PCK2                      (1 << 10) /* Bit 10: Programmable Clock 2 Output Enable */
-
-/* PMC Peripheral Clock Enable Register, PMC Peripheral Clock Disable Register, and PMC
- * Peripheral Clock Status Register common bit-field definitions.
- */
-
-#define PMC_PID(n)                    (1<<(n))
-#define PMC_PID2                      (1 << 2)  /* Bit 2:  Peripheral Clock 2  Enable */
-#define PMC_PID3                      (1 << 3)  /* Bit 3:  Peripheral Clock 3  Enable */
-#define PMC_PID4                      (1 << 4)  /* Bit 4:  Peripheral Clock 4  Enable */
-#define PMC_PID5                      (1 << 5)  /* Bit 5:  Peripheral Clock 5  Enable */
-#define PMC_PID6                      (1 << 6)  /* Bit 6:  Peripheral Clock 6  Enable */
-#define PMC_PID7                      (1 << 7)  /* Bit 7:  Peripheral Clock 7  Enable */
-#define PMC_PID8                      (1 << 8)  /* Bit 8:  Peripheral Clock 8  Enable */
-#define PMC_PID9                      (1 << 9)  /* Bit 9:  Peripheral Clock 9  Enable */
-#define PMC_PID10                     (1 << 10) /* Bit 10: Peripheral Clock 10 Enable */
-#define PMC_PID11                     (1 << 11) /* Bit 11: Peripheral Clock 11 Enable */
-#define PMC_PID12                     (1 << 12) /* Bit 12: Peripheral Clock 12 Enable */
-#define PMC_PID13                     (1 << 13) /* Bit 13: Peripheral Clock 13 Enable */
-#define PMC_PID14                     (1 << 14) /* Bit 14: Peripheral Clock 14 Enable */
-#define PMC_PID15                     (1 << 15) /* Bit 15: Peripheral Clock 15 Enable */
-#define PMC_PID16                     (1 << 16) /* Bit 16: Peripheral Clock 16 Enable */
-#define PMC_PID17                     (1 << 17) /* Bit 17: Peripheral Clock 17 Enable */
-#define PMC_PID18                     (1 << 18) /* Bit 18: Peripheral Clock 18 Enable */
-#define PMC_PID19                     (1 << 19) /* Bit 19: Peripheral Clock 19 Enable */
-#define PMC_PID20                     (1 << 20) /* Bit 20: Peripheral Clock 20 Enable */
-#define PMC_PID21                     (1 << 21) /* Bit 21: Peripheral Clock 21 Enable */
-#define PMC_PID22                     (1 << 22) /* Bit 22: Peripheral Clock 22 Enable */
-#define PMC_PID23                     (1 << 23) /* Bit 23: Peripheral Clock 23 Enable */
-#define PMC_PID24                     (1 << 24) /* Bit 24: Peripheral Clock 24 Enable */
-#define PMC_PID25                     (1 << 25) /* Bit 25: Peripheral Clock 25 Enable */
-#define PMC_PID26                     (1 << 26) /* Bit 26: Peripheral Clock 26 Enable */
-#define PMC_PID27                     (1 << 27) /* Bit 27: Peripheral Clock 27 Enable */
-#define PMC_PID28                     (1 << 28) /* Bit 28: Peripheral Clock 28 Enable */
-#define PMC_PID29                     (1 << 29) /* Bit 29: Peripheral Clock 29 Enable */
-#define PMC_PID30                     (1 << 30) /* Bit 30: Peripheral Clock 30 Enable */
-#define PMC_PID31                     (1 << 31) /* Bit 31: Peripheral Clock 31 Enable */
-
-/* PMC UTMI Clock Configuration Register */
-
-#define CKGR_UCKR_UPLLEN              (1 << 16) /* Bit 16: UTMI PLL Enable */
-#define CKGR_UCKR_UPLLCOUNT_SHIFT     (20)      /* Bits 20-23: UTMI PLL Start-up Time */
-#define CKGR_UCKR_UPLLCOUNT_MASK      (15 << CKGR_UCKR_UPLLCOUNT_SHIFT)
-
-/* PMC Clock Generator Main Oscillator Register */
-
-#define CKGR_MOR_MOSCXTEN             (1 << 0)  /* Bit 0:  Main Crystal Oscillator Enable */
-#define CKGR_MOR_MOSCXTBY             (1 << 1)  /* Bit 1:  Main Crystal Oscillator Bypass */
-#define CKGR_MOR_WAITMODE             (1 << 2)  /* Bit 2:  Wait Mode Command */
-#define CKGR_MOR_MOSCRCEN             (1 << 3)  /* Bit 3:  Main On-Chip RC Oscillator Enable */
-#define CKGR_MOR_MOSCRCF_SHIFT        (4)       /* Bits 4-6: Main On-Chip RC Oscillator Frequency Selection */
-#define CKGR_MOR_MOSCRCF_MASK         (7 << CKGR_MOR_MOSCRCF_SHIFT)
-#define CKGR_MOR_MOSCXTST_SHIFT       (8)       /* Bits 8-16: Main Crystal Oscillator Start-up Time */
-#define CKGR_MOR_MOSCXTST_MASK        (0x1ff << CKGR_MOR_MOSCXTST_SHIFT)
-#define CKGR_MOR_KEY_SHIFT            (16)      /* Bits 16-23: Password */
-#define CKGR_MOR_KEY_MASK             (0xff << CKGR_MOR_KEY_SHIFT)
-#define CKGR_MOR_MOSCSEL              (1 << 24) /* Bit 24: Main Oscillator Selection */
-#define CKGR_MOR_CFDEN                (1 << 25) /* Bit 25: Clock Failure Detector Enable */
-
-
-/* PMC Clock Generator Main Clock Frequency Register */
-
-#define CKGR_MCFR_MAINF_SHIFT         (0)       /* Bits 0-15: Main Clock Frequency */
-#define CKGR_MCFR_MAINF_MASK          (0xffff << CKGR_MCFR_MAINF_SHIFT)
-#define CKGR_MCFR_MAINFRDY            (1 << 16) /* Bit 16: Main Clock Ready */
-
-/* PMC Clock Generator PLLA Register */
-
-#define CKGR_PLLAR_DIVA_SHIFT         (0)       /* Bits 0-7: Divider */
-#define CKGR_PLLAR_DIVA_MASK          (0xff << CKGR_PLLAR_DIVA_SHIFT)
-#  define CKGR_PLLAR_DIVA_ZERO        (0 << CKGR_PLLAR_DIVA_SHIFT)   /* Divider output is 0 */
-#  define CKGR_PLLAR_DIVA_BYPASS      (1 << CKGR_PLLAR_DIVA_SHIFT)   /* Divider is bypassed (DIVA=1) */
-#  define CKGR_PLLAR_DIVA(n)          ((n) << CKGR_PLLAR_DIVA_SHIFT) /* Divider output is DIVA=n, n=2..255 */
-#define CKGR_PLLAR_PLLACOUNT_SHIFT    (8)       /* Bits 8-13: PLLA Counter */
-#define CKGR_PLLAR_PLLACOUNT_MASK     (63 << CKGR_PLLAR_PLLACOUNT_SHIFT)
-#define CKGR_PLLAR_STMODE_SHIFT       (14)      /* Bits 14-15: Start Mode */
-#define CKGR_PLLAR_STMODE_MASK        (3 << CKGR_PLLAR_STMODE_SHIFT)
-#  define CKGR_PLLAR_STMODE_FAST      (0 << CKGR_PLLAR_STMODE_SHIFT) /* Fast Startup */
-#  define CKGR_PLLAR_STMODE_NORMAL    (2 << CKGR_PLLAR_STMODE_SHIFT) /* Normal Startup */
-#define CKGR_PLLAR_MULA_SHIFT         (16)      /* Bits 16-26: PLLA Multiplier */
-#define CKGR_PLLAR_MULA_MASK          (0x7ff << CKGR_PLLAR_MULA_SHIFT)
-#define CKGR_PLLAR_ONE                (1 << 29) /* Bit 29: Always one */
-
-/* PMC Master Clock Register */
-
-#define PMC_MCKR_CSS_SHIFT            (0)       /* Bits 0-1: Master Clock Source Selection */
-#define PMC_MCKR_CSS_MASK             (3 << PMC_MCKR_CSS_SHIFT)
-#  define PMC_MCKR_CSS_SLOW           (0 << PMC_MCKR_CSS_SHIFT) /* Slow Clock */
-#  define PMC_MCKR_CSS_MAIN           (1 << PMC_MCKR_CSS_SHIFT) /* Main Clock */
-#  define PMC_MCKR_CSS_PLLA           (2 << PMC_MCKR_CSS_SHIFT) /* PLLA Clock */
-#  define PMC_MCKR_CSS_UPLL           (3 << PMC_MCKR_CSS_SHIFT) /* UPLL Clock */
-#define PMC_MCKR_PRES_SHIFT           (4)       /* Bits 4-6: Processor Clock Prescaler */
-#define PMC_MCKR_PRES_MASK            (7 << PMC_MCKR_PRES_SHIFT)
-#  define PMC_MCKR_PRES_DIV1          (0 << PMC_MCKR_PRES_SHIFT) /* Selected clock */
-#  define PMC_MCKR_PRES_DIV2          (1 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 2 */
-#  define PMC_MCKR_PRES_DIV4          (2 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 4 */
-#  define PMC_MCKR_PRES_DIV8          (3 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 8 */
-#  define PMC_MCKR_PRES_DIV16         (4 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 16 */
-#  define PMC_MCKR_PRES_DIV32K        (5 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 32 */
-#  define PMC_MCKR_PRES_DIV64         (6 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 64 */
-#  define PMC_MCKR_PRES_DIV3          (7 << PMC_MCKR_PRES_SHIFT) /* Selected clock divided by 3 */
-#define PMC_MCKR_UPLLDIV              (1 << 13) /* Bit 13: UPLL Divider */
-
-/* PMC Programmable Clock Register (0,1,2) */
-
-#define PMC_PCK_CSS_SHIFT             (0)       /* Bits 0-2: Master Clock Source Selection */
-#define PMC_PCK_CSS_MASK              (7 << PMC_PCK_CSS_MASK)
-#  define PMC_PCK_CSS_SLOW            (0 << PMC_PCK_CSS_MASK) /* Slow Clock */
-#  define PMC_PCK_CSS_MAIN            (1 << PMC_PCK_CSS_MASK) /* Main Clock */
-#  define PMC_PCK_CSS_PLLA            (2 << PMC_PCK_CSS_MASK) /* PLLA Clock */
-#  define PMC_PCK_CSS_UPLL            (3 << PMC_PCK_CSS_MASK) /* UPLL Clock */
-#  define PMC_PCK_CSS_MASTER          (4 << PMC_PCK_CSS_MASK) /* Master Clock */
-#define PMC_PCK_PRES_SHIFT            (4)       /* Bits 4-6: Programmable Clock Prescaler */
-#define PMC_PCK_PRES_MASK             (7 << PMC_PCK_PRES_SHIFT)
-#  define PMC_PCK_PRES_DIV1           (0 << PMC_PCK_PRES_SHIFT) /* Selected clock */
-#  define PMC_PCK_PRES_DIV2           (1 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 2 */
-#  define PMC_PCK_PRES_DIV4           (2 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 4 */
-#  define PMC_PCK_PRES_DIV8           (3 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 8 */
-#  define PMC_PCK_PRES_DIV16          (4 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 16 */
-#  define PMC_PCK_PRES_DIV32K         (5 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 32 */
-#  define PMC_PCK_PRES_DIV64          (6 << PMC_PCK_PRES_SHIFT) /* Selected clock divided by 64 */
-
-/* PMC Interrupt Enable Register, PMC Interrupt Disable Register, PMC Status Register,
- * and PMC Interrupt Mask Register common bit-field definitions
- */
-
-#define PMC_INT_MOSCXTS               (1 << 0)  /* Bit 0:  Main Crystal Oscillator Status Interrupt */
-#define PMC_INT_LOCKA                 (1 << 1)  /* Bit 1:  PLL A Lock Interrupt */
-#define PMC_INT_MCKRDY                (1 << 3)  /* Bit 3:  Master Clock Ready Interrupt */
-#define PMC_INT_LOCKU                 (1 << 6)  /* Bit 6:  UTMI PLL Lock Interrupt */
-#define PMC_SR_OSCSELS                (1 << 7)  /* Bit 7: Slow Clock Oscillator Selection (SR only) */
-#define PMC_INT_PCKRDY(n)             (1<<((n)+8)
-#define PMC_INT_PCKRDY0               (1 << 8)  /* Bit 8:  Programmable Clock Ready 0 Interrupt */
-#define PMC_INT_PCKRDY1               (1 << 9)  /* Bit 9:  Programmable Clock Ready 1 Interrupt */
-#define PMC_INT_PCKRDY2               (1 << 10) /* Bit 10: Programmable Clock Ready 2 Interrupt */
-#define PMC_INT_MOSCSELS              (1 << 16) /* Bit 16: Main Oscillator Selection Status Interrupt */
-#define PMC_INT_MOSCRCS               (1 << 17) /* Bit 17: Main On-Chip RC Status Interrupt */
-#define PMC_INT_CFDEV                 (1 << 18) /* Bit 18: Clock Failure Detector Event Interrupt */
-#define PMC_SR_CFDS                   (1 << 19) /* Bit 19: Clock Failure Detector Status (SR only) */
-#define PMC_SR_FOS                    (1 << 20) /* Bit 20: Clock Failure Detector Fault Output Status (SR only) */
-
-/* PMC Fast Startup Mode Register and PMC Fast Startup Polarity Register common bit-field
- * definitions
- */
-
-#define PMC_FSTI(n)                   (1<<(n))
-#define PMC_FSTI0                     (1 << 0)  /* Bit 0:  Fast Startup Input 0 */
-#define PMC_FSTI1                     (1 << 1)  /* Bit 1:  Fast Startup Input 1 */
-#define PMC_FSTI2                     (1 << 2)  /* Bit 2:  Fast Startup Input 2 */
-#define PMC_FSTI3                     (1 << 3)  /* Bit 3:  Fast Startup Input 3 */
-#define PMC_FSTI4                     (1 << 4)  /* Bit 4:  Fast Startup Input 4 */
-#define PMC_FSTI5                     (1 << 5)  /* Bit 5:  Fast Startup Input 5 */
-#define PMC_FSTI6                     (1 << 6)  /* Bit 6:  Fast Startup Input 6 */
-#define PMC_FSTI7                     (1 << 7)  /* Bit 7:  Fast Startup Input 7 */
-#define PMC_FSTI8                     (1 << 8)  /* Bit 8:  Fast Startup Input 8 */
-#define PMC_FSTI9                     (1 << 9)  /* Bit 9:  Fast Startup Input 9 */
-#define PMC_FSTI10                    (1 << 10) /* Bit 10: Fast Startup Input 10 */
-#define PMC_FSTI11                    (1 << 11) /* Bit 11: Fast Startup Input 11 */
-#define PMC_FSTI12                    (1 << 12) /* Bit 12: Fast Startup Input 12 */
-#define PMC_FSTI13                    (1 << 13) /* Bit 13: Fast Startup Input 13 */
-#define PMC_FSTI14                    (1 << 14) /* Bit 14: Fast Startup Input 14 */
-#define PMC_FSTI15                    (1 << 15) /* Bit 15: Fast Startup Input 15 */
-
-#define PMC_FSMR_RTTAL                (1 << 16) /* Bit 16: RTT Alarm Enable (MR only) */
-#define PMC_FSMR_RTCAL                (1 << 17) /* Bit 17: RTC Alarm Enable (MR only) */
-#define PMC_FSMR_USBAL                (1 << 18) /* Bit 18: USB Alarm Enable (MR only) */
-#define PMC_FSMR_LPM                  (1 << 20) /* Bit 20: Low Power Mode (MR only) */
-
-/* PMC Fault Output Clear Register */
-
-#define PMC_FOCLR                     (1 << 0)  /* Bit 0:  Fault Output Clear */
-
-/* PMC Write Protect Mode Register */
-
-#define PMC_WPMR_WPEN                 (1 << 0)  /* Bit 0:  Write Protect Enable */
-#define PMC_WPMR_WPKEY_SHIFT          (8)       /* Bits 8-31: Write Protect KEY */
-#define PMC_WPMR_WPKEY_MASK           (0x00ffffff << PMC_WPMR_WPKEY_SHIFT)
-
-/* PMC Write Protect Status Register */
-
-#define PMC_WPSR_WPVS                 (1 << 0)  /* Bit 0:  Write Protect Violation Status */
-#define PMC_WPSR_WPVSRC_SHIFT         (8)       /* Bits 8-23: Write Protect Violation Source */
-#define PMC_WPSR_WPVSRC_MASK          (0xffff << PMC_WPSR_WPVSRC_SHIFT)
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Functions
- ****************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_PMC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_pwm.h b/nuttx/arch/arm/src/sam3u/sam3u_pwm.h
deleted file mode 100644
index e8278d795..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_pwm.h
+++ /dev/null
@@ -1,633 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_pwm.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_PWM_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_PWM_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/****************************************************************************************
- * Pre-processor Definitions
- ****************************************************************************************/
-
-/* PWM register offsets *****************************************************************/
-
-#define SAM3U_PWM_CLK_OFFSET           0x000 /* PWM Clock Register */
-#define SAM3U_PWM_ENA_OFFSET           0x004 /* PWM Enable Register */
-#define SAM3U_PWM_DIS_OFFSET           0x008 /* PWM Disable Register */
-#define SAM3U_PWM_SR_OFFSET            0x00c /* PWM Status Register */
-#define SAM3U_PWM_IER1_OFFSET          0x010 /* PWM Interrupt Enable Register 1 */
-#define SAM3U_PWM_IDR1_OFFSET          0x014 /* PWM Interrupt Disable Register 1 */
-#define SAM3U_PWM_IMR1_OFFSET          0x018 /* PWM Interrupt Mask Register 1 */
-#define SAM3U_PWM_ISR1_OFFSET          0x01c /* PWM Interrupt Status Register 1 */
-#define SAM3U_PWM_SCM_OFFSET           0x020 /* PWM Sync Channels Mode Register */
-                                             /* 0x024: Reserved */
-#define SAM3U_PWM_SCUC_OFFSET          0x028 /* PWM Sync Channels Update Control Register */
-#define SAM3U_PWM_SCUP_OFFSET          0x02c /* PWM Sync Channels Update Period Register */
-#define SAM3U_PWM_SCUPUPD_OFFSET       0x030 /* PWM Sync Channels Update Period Update Register */
-#define SAM3U_PWM_IER2_OFFSET          0x034 /* PWM Interrupt Enable Register 2 */
-#define SAM3U_PWM_IDR2_OFFSET          0x038 /* PWM Interrupt Disable Register 2 */
-#define SAM3U_PWM_IMR2_OFFSET          0x03c /* PWM Interrupt Mask Register 2 */
-#define SAM3U_PWM_ISR2_OFFSET          0x040 /* PWM Interrupt Status Register 2 */
-#define SAM3U_PWM_OOV_OFFSET           0x044 /* PWM Output Override Value Register */
-#define SAM3U_PWM_OS_OFFSET            0x048 /* PWM Output Selection Register */
-#define SAM3U_PWM_OSS_OFFSET           0x04c /* PWM Output Selection Set Register */
-#define SAM3U_PWM_OSC_OFFSET           0x050 /* PWM Output Selection Clear Register */
-#define SAM3U_PWM_OSSUPD_OFFSET        0x054 /* PWM Output Selection Set Update Register */
-#define SAM3U_PWM_OSCUPD_OFFSET        0x058 /* PWM Output Selection Clear Update Register */
-#define SAM3U_PWM_FMR_OFFSET           0x05c /* PWM Fault Mode Register */
-#define SAM3U_PWM_FSR_OFFSET           0x060 /* PWM Fault Status Register */
-#define SAM3U_PWM_FCR_OFFSET           0x064 /* PWM Fault Clear Register */
-#define SAM3U_PWM_FPV_OFFSET           0x068 /* PWM Fault Protection Value Register */
-#define SAM3U_PWM_FPE_OFFSET           0x06c /* PWM Fault Protection Enable Register */
-                                             /* 0x070-0x078: Reserved */
-#define SAM3U_PWM_EL0MR_OFFSET         0x07c /* PWM Event Line 0 Mode Register */
-#define SAM3U_PWM_EL1MR_OFFSET         0x080 /* PWM Event Line 1 Mode Register */
-                                             /* 0x084-0x0ac: Reserved */
-                                             /* 0x0b4-0x0e0: Reserved */
-#define SAM3U_PWM_WPCR_OFFSET          0x0e4 /* PWM Write Protect Control Register */
-#define SAM3U_PWM_WPSR_OFFSET          0x0e8 /* PWM Write Protect Status Register */
-                                             /* 0x100-0x128: Reserved for PDC registers */
-                                             /* 0x12c: Reserved */
-/* PWM Comparison Registers */
-
-#define SAM3U_PWMCMP_OFFSET(n)        (0x130+((n)<<4))
-#define SAM3U_PWMCMP_V_OFFSET          0x00  /* PWM Comparison Value Register */
-#define SAM3U_PWMCMP_VUPD_OFFSET       0x04  /* PWM Comparison Value Update Register */
-#define SAM3U_PWMCMP_M_OFFSET          0x08  /* PWM Comparison Mode Register */
-#define SAM3U_PWMCMP_MUPD_OFFSET       0x0c  /* PWM Comparison Mode Update Register */
-
-#define SAM3U_PWMCMP0_V_OFFSET         0x130 /* PWM Comparison 0 Value Register */
-#define SAM3U_PWMCMP0_VUPD_OFFSET      0x134 /* PWM Comparison 0 Value Update Register */
-#define SAM3U_PWMCMP0_M_OFFSET         0x138 /* PWM Comparison 0 Mode Register */
-#define SAM3U_PWMCMP0_MUPD_OFFSET      0x13c /* PWM Comparison 0 Mode Update Register */
-
-#define SAM3U_PWMCMP1_V_OFFSET         0x140 /* PWM Comparison 1 Value Register */
-#define SAM3U_PWMCMP1_VUPD_OFFSET      0x144 /* PWM Comparison 1 Value Update Register */
-#define SAM3U_PWMCMP1_M_OFFSET         0x148 /* PWM Comparison 1 Mode Register */
-#define SAM3U_PWMCMP1_MUPD_OFFSET      0x14c /* PWM Comparison 1 Mode Update Register */
-
-#define SAM3U_PWMCMP2_V_OFFSET         0x150 /* PWM Comparison 2 Value Register */
-#define SAM3U_PWMCMP2_VUPD_OFFSET      0x154 /* PWM Comparison 2 Value Update Register */
-#define SAM3U_PWMCMP2_M_OFFSET         0x158 /* PWM Comparison 2 Mode Register */
-#define SAM3U_PWMCMP2_MUPD_OFFSET      0x15c /* PWM Comparison 2 Mode Update Register */
-
-#define SAM3U_PWMCMP3_V_OFFSET         0x160 /* PWM Comparison 3 Value Register */
-#define SAM3U_PWMCMP3_VUPD_OFFSET      0x164 /* PWM Comparison 3 Value Update Register */
-#define SAM3U_PWMCMP3_M_OFFSET         0x168 /* PWM Comparison 3 Mode Register */
-#define SAM3U_PWMCMP3_MUPD_OFFSET      0x16c /* PWM Comparison 3 Mode Update Register */
-
-#define SAM3U_PWMCMP4_V_OFFSET         0x170 /* PWM Comparison 4 Value Register */
-#define SAM3U_PWMCMP4_VUPD_OFFSET      0x174 /* PWM Comparison 4 Value Update Register */
-#define SAM3U_PWMCMP4_M_OFFSET         0x178 /* PWM Comparison 4 Mode Register */
-#define SAM3U_PWMCMP4_MUPD_OFFSET      0x17c /* PWM Comparison 4 Mode Update Register */
-
-#define SAM3U_PWMCMP5_V_OFFSET         0x180 /* PWM Comparison 5 Value Register */
-#define SAM3U_PWMCMP5_VUPD_OFFSET      0x184 /* PWM Comparison 5 Value Update Register */
-#define SAM3U_PWMCMP5_M_OFFSET         0x188 /* PWM Comparison 5 Mode Register */
-#define SAM3U_PWMCMP5_MUPD_OFFSET      0x18c /* PWM Comparison 5 Mode Update Register */
-
-#define SAM3U_PWMCMP6_V_OFFSET         0x190 /* PWM Comparison 6 Value Register */
-#define SAM3U_PWMCMP6_VUPD_OFFSET      0x194 /* PWM Comparison 6 Value Update Register */
-#define SAM3U_PWMCMP6_M_OFFSET         0x198 /* PWM Comparison 6 Mode Register */
-#define SAM3U_PWMCMP6_MUPD_OFFSET      0x19c /* PWM Comparison 6 Mode Update Register */
-
-#define SAM3U_PWMCMP7_V_OFFSET         0x1a0 /* PWM Comparison 7 Value Register */
-#define SAM3U_PWMCMP7_VUPD_OFFSET      0x1a4 /* PWM Comparison 7 Value Update Register */
-#define SAM3U_PWMCMP7_M_OFFSET         0x1a8 /* PWM Comparison 7 Mode Register */
-#define SAM3U_PWMCMP7_MUPD_OFFSET      0x1ac /* PWM Comparison 7 Mode Update Register */
-                                             /* 0x1b0-0x1fc: Reserved */
-/* PWM Channel Registers */
-
-#define SAM3U_PWMCH_OFFSET(n)          (0x200+((n)<< 5))
-#define SAM3U_PWMCH_MR_OFFSET          0x00  /* PWM Channel Mode Register */
-#define SAM3U_PWMCH_DTY_OFFSET         0x04  /* PWM Channel Duty Cycle Register */
-#define SAM3U_PWMCH_DTYUPD_OFFSET      0x08  /* PWM Channel Duty Cycle Update Register */
-#define SAM3U_PWMCH_PRD_OFFSET         0x0c  /* PWM Channel Period Register */
-#define SAM3U_PWMCH_PRDUPD_OFFSET      0x10  /* PWM Channel Period Update Register */
-#define SAM3U_PWMCH_CCNT_OFFSET        0x14  /* PWM Channel Counter Register */
-#define SAM3U_PWMCH_DT_OFFSET          0x18  /* PWM Channel Dead Time Register */
-#define SAM3U_PWMCH_DTUPD_OFFSET       0x1c  /* PWM Channel Dead Time Update Register */
-
-#define SAM3U_PWMCH0_MR_OFFSET         0x200 /* PWM Channel 0 Mode Register */
-#define SAM3U_PWMCH0_DTY_OFFSET        0x204 /* PWM Channel 0 Duty Cycle Register */
-#define SAM3U_PWMCH0_DTYUPD_OFFSET     0x208 /* PWM Channel 0 Duty Cycle Update Register */
-#define SAM3U_PWMCH0_PRD_OFFSET        0x20c /* PWM Channel 0 Period Register */
-#define SAM3U_PWMCH0_PRDUPD_OFFSET     0x210 /* PWM Channel 0 Period Update Register */
-#define SAM3U_PWMCH0_CCNT_OFFSET       0x214 /* PWM Channel 0 Counter Register */
-#define SAM3U_PWMCH0_DT_OFFSET         0x218 /* PWM Channel 0 Dead Time Register */
-#define SAM3U_PWMCH0_DTUPD_OFFSET      0x21c /* PWM Channel 0 Dead Time Update Register */
-
-#define SAM3U_PWMCH1_MR_OFFSET         0x220 /* PWM Channel 1 Mode Register */
-#define SAM3U_PWMCH1_DTY_OFFSET        0x224 /* PWM Channel 1 Duty Cycle Register */
-#define SAM3U_PWMCH1_DTYUPD_OFFSET     0x228 /* PWM Channel 1 Duty Cycle Update Register */
-#define SAM3U_PWMCH1_PRD_OFFSET        0x22c /* PWM Channel 1 Period Register */
-#define SAM3U_PWMCH1_PRDUPD_OFFSET     0x230 /* PWM Channel 1 Period Update Register */
-#define SAM3U_PWMCH1_CCNT_OFFSET       0x234 /* PWM Channel 1 Counter Register */
-#define SAM3U_PWMCH1_DT_OFFSET         0x238 /* PWM Channel 1 Dead Time Register */
-#define SAM3U_PWMCH1_DTUPD_OFFSET      0x23c /* PWM Channel 1 Dead Time Update Register */
-
-#define SAM3U_PWMCH2_MR_OFFSET         0x240 /* PWM Channel 2 Mode Register */
-#define SAM3U_PWMCH2_DTY_OFFSET        0x244 /* PWM Channel 2 Duty Cycle Register */
-#define SAM3U_PWMCH2_DTYUPD_OFFSET     0x248 /* PWM Channel 2 Duty Cycle Update Register */
-#define SAM3U_PWMCH2_PRD_OFFSET        0x24c /* PWM Channel 2 Period Register */
-#define SAM3U_PWMCH2_PRDUPD_OFFSET     0x250 /* PWM Channel 2 Period Update Register */
-#define SAM3U_PWMCH2_CCNT_OFFSET       0x254 /* PWM Channel 2 Counter Register */
-#define SAM3U_PWMCH2_DT_OFFSET         0x258 /* PWM Channel 2 Dead Time Register */
-#define SAM3U_PWMCH2_DTUPD_OFFSET      0x25c /* PWM Channel 2 Dead Time Update Register */
-
-#define SAM3U_PWMCH3_MR_OFFSET         0x260 /* PWM Channel 3 Mode Register */
-#define SAM3U_PWMCH3_DTY_OFFSET        0x264 /* PWM Channel 3 Duty Cycle Register */
-#define SAM3U_PWMCH3_DTYUPD_OFFSET     0x268 /* PWM Channel 3 Duty Cycle Update Register */
-#define SAM3U_PWMCH3_PRD_OFFSET        0x26c /* PWM Channel 3 Period Register */
-#define SAM3U_PWMCH3_PRDUPD_OFFSET     0x270 /* PWM Channel 3 Period Update Register */
-#define SAM3U_PWMCH3_CCNT_OFFSET       0x274 /* PWM Channel 3 Counter Register */
-#define SAM3U_PWMCH3_DT_OFFSET         0x278 /* PWM Channel 3 Dead Time Register */
-#define SAM3U_PWMCH3_DTUPD_OFFSET      0x27c /* PWM Channel 3 Dead Time Update Register */
-
-/* PWM register adresses ****************************************************************/
-
-#define SAM3U_PWM_CLK                  (SAM3U_PWM_BASE+SAM3U_PWM_CLK_OFFSET)
-#define SAM3U_PWM_ENA                  (SAM3U_PWM_BASE+SAM3U_PWM_ENA_OFFSET)
-#define SAM3U_PWM_DIS                  (SAM3U_PWM_BASE+SAM3U_PWM_DIS_OFFSET)
-#define SAM3U_PWM_SR                   (SAM3U_PWM_BASE+SAM3U_PWM_SR_OFFSET)
-#define SAM3U_PWM_IER1                 (SAM3U_PWM_BASE+SAM3U_PWM_IER1_OFFSET)
-#define SAM3U_PWM_IDR1                 (SAM3U_PWM_BASE+SAM3U_PWM_IDR1_OFFSET)
-#define SAM3U_PWM_IMR1                 (SAM3U_PWM_BASE+SAM3U_PWM_IMR1_OFFSET)
-#define SAM3U_PWM_ISR1                 (SAM3U_PWM_BASE+SAM3U_PWM_ISR1_OFFSET)
-#define SAM3U_PWM_SCM                  (SAM3U_PWM_BASE+SAM3U_PWM_SCM_OFFSET)
-#define SAM3U_PWM_SCUC                 (SAM3U_PWM_BASE+SAM3U_PWM_SCUC_OFFSET)
-#define SAM3U_PWM_SCUP                 (SAM3U_PWM_BASE+SAM3U_PWM_SCUP_OFFSET)
-#define SAM3U_PWM_SCUPUPD              (SAM3U_PWM_BASE+SAM3U_PWM_SCUPUPD_OFFSET)
-#define SAM3U_PWM_IER2                 (SAM3U_PWM_BASE+SAM3U_PWM_IER2_OFFSET)
-#define SAM3U_PWM_IDR2                 (SAM3U_PWM_BASE+SAM3U_PWM_IDR2_OFFSET)
-#define SAM3U_PWM_IMR2                 (SAM3U_PWM_BASE+SAM3U_PWM_IMR2_OFFSET)
-#define SAM3U_PWM_ISR2                 (SAM3U_PWM_BASE+SAM3U_PWM_ISR2_OFFSET)
-#define SAM3U_PWM_OOV                  (SAM3U_PWM_BASE+SAM3U_PWM_OOV_OFFSET)
-#define SAM3U_PWM_OS                   (SAM3U_PWM_BASE+SAM3U_PWM_OS_OFFSET)
-#define SAM3U_PWM_OSS                  (SAM3U_PWM_BASE+SAM3U_PWM_OSS_OFFSET)
-#define SAM3U_PWM_OSC                  (SAM3U_PWM_BASE+SAM3U_PWM_OSC_OFFSET)
-#define SAM3U_PWM_OSSUPD               (SAM3U_PWM_BASE+SAM3U_PWM_OSSUPD_OFFSET)
-#define SAM3U_PWM_OSCUPD               (SAM3U_PWM_BASE+SAM3U_PWM_OSCUPD_OFFSET)
-#define SAM3U_PWM_FMR                  (SAM3U_PWM_BASE+SAM3U_PWM_FMR_OFFSET)
-#define SAM3U_PWM_FSR                  (SAM3U_PWM_BASE+SAM3U_PWM_FSR_OFFSET)
-#define SAM3U_PWM_FCR                  (SAM3U_PWM_BASE+SAM3U_PWM_FCR_OFFSET)
-#define SAM3U_PWM_FPV                  (SAM3U_PWM_BASE+SAM3U_PWM_FPV_OFFSET)
-#define SAM3U_PWM_FPE                  (SAM3U_PWM_BASE+SAM3U_PWM_FPE_OFFSET)
-#define SAM3U_PWM_EL0MR                (SAM3U_PWM_BASE+SAM3U_PWM_EL0MR_OFFSET)
-#define SAM3U_PWM_EL1MR                (SAM3U_PWM_BASE+SAM3U_PWM_EL1MR_OFFSET)
-#define SAM3U_PWM_WPCR                 (SAM3U_PWM_BASE+SAM3U_PWM_WPCR_OFFSET)
-#define SAM3U_PWM_WPSR                 (SAM3U_PWM_BASE+SAM3U_PWM_WPSR_OFFSET)
-
-/* PWM Comparison Registers */
-
-#define SAM3U_PWCMP_BASE(n)            (SAM3U_PWM_BASE+SAM3U_PWCMP_OFFSET(n))
-#define SAM3U_PWMCMP0_BASE             (SAM3U_PWM_BASE+0x0130)
-#define SAM3U_PWMCMP1_BASE             (SAM3U_PWM_BASE+0x0140)
-#define SAM3U_PWMCMP2_BASE             (SAM3U_PWM_BASE+0x0150)
-#define SAM3U_PWMCMP3_BASE             (SAM3U_PWM_BASE+0x0160)
-#define SAM3U_PWMCMP4_BASE             (SAM3U_PWM_BASE+0x0170)
-#define SAM3U_PWMCMP5_BASE             (SAM3U_PWM_BASE+0x0180)
-#define SAM3U_PWMCMP6_BASE             (SAM3U_PWM_BASE+0x0190)
-#define SAM3U_PWMCMP7_BASE             (SAM3U_PWM_BASE+0x01a0)
-
-#define SAM3U_PWMCMP0_V                (SAM3U_PWMCMP0_BASE+SAM3U_PWMCMP_V_OFFSET)
-#define SAM3U_PWMCMP0_VUPD             (SAM3U_PWMCMP0_BASE+SAM3U_PWMCMP_VUPD_OFFSET)
-#define SAM3U_PWMCMP0_M                (SAM3U_PWMCMP0_BASE+SAM3U_PWMCMP_M_OFFSET)
-#define SAM3U_PWMCMP0_MUPD             (SAM3U_PWMCMP0_BASE+SAM3U_PWMCMP_MUPD_OFFSET)
-
-#define SAM3U_PWMCMP1_V                (SAM3U_PWMCMP1_BASE+SAM3U_PWMCMP_V_OFFSET)
-#define SAM3U_PWMCMP1_VUPD             (SAM3U_PWMCMP1_BASE+SAM3U_PWMCMP_VUPD_OFFSET)
-#define SAM3U_PWMCMP1_M                (SAM3U_PWMCMP1_BASE+SAM3U_PWMCMP_M_OFFSET)
-#define SAM3U_PWMCMP1_MUPD             (SAM3U_PWMCMP1_BASE+SAM3U_PWMCMP_MUPD_OFFSET)
-
-#define SAM3U_PWMCMP2_V                (SAM3U_PWMCMP2_BASE+SAM3U_PWMCMP_V_OFFSET)
-#define SAM3U_PWMCMP2_VUPD             (SAM3U_PWMCMP2_BASE+SAM3U_PWMCMP_VUPD_OFFSET)
-#define SAM3U_PWMCMP2_M                (SAM3U_PWMCMP2_BASE+SAM3U_PWMCMP_M_OFFSET)
-#define SAM3U_PWMCMP2_MUPD             (SAM3U_PWMCMP2_BASE+SAM3U_PWMCMP_MUPD_OFFSET)
-
-#define SAM3U_PWMCMP3_V                (SAM3U_PWMCMP3_BASE+SAM3U_PWMCMP_V_OFFSET)
-#define SAM3U_PWMCMP3_VUPD             (SAM3U_PWMCMP3_BASE+SAM3U_PWMCMP_VUPD_OFFSET)
-#define SAM3U_PWMCMP3_M                (SAM3U_PWMCMP3_BASE+SAM3U_PWMCMP_M_OFFSET)
-#define SAM3U_PWMCMP3_MUPD             (SAM3U_PWMCMP3_BASE+SAM3U_PWMCMP_MUPD_OFFSET)
-
-#define SAM3U_PWMCMP4_V                (SAM3U_PWMCMP4_BASE+SAM3U_PWMCMP_V_OFFSET)
-#define SAM3U_PWMCMP4_VUPD             (SAM3U_PWMCMP4_BASE+SAM3U_PWMCMP_VUPD_OFFSET)
-#define SAM3U_PWMCMP4_M                (SAM3U_PWMCMP4_BASE+SAM3U_PWMCMP_M_OFFSET)
-#define SAM3U_PWMCMP4_MUPD             (SAM3U_PWMCMP4_BASE+SAM3U_PWMCMP_MUPD_OFFSET)
-
-#define SAM3U_PWMCMP5_V                (SAM3U_PWMCMP5_BASE+SAM3U_PWMCMP_V_OFFSET)
-#define SAM3U_PWMCMP5_VUPD             (SAM3U_PWMCMP5_BASE+SAM3U_PWMCMP_VUPD_OFFSET)
-#define SAM3U_PWMCMP5_M                (SAM3U_PWMCMP5_BASE+SAM3U_PWMCMP_M_OFFSET)
-#define SAM3U_PWMCMP5_MUPD             (SAM3U_PWMCMP5_BASE+SAM3U_PWMCMP_MUPD_OFFSET)
-
-#define SAM3U_PWMCMP6_V                (SAM3U_PWMCMP6_BASE+SAM3U_PWMCMP_V_OFFSET)
-#define SAM3U_PWMCMP6_VUPD             (SAM3U_PWMCMP6_BASE+SAM3U_PWMCMP_VUPD_OFFSET)
-#define SAM3U_PWMCMP6_M                (SAM3U_PWMCMP6_BASE+SAM3U_PWMCMP_M_OFFSET)
-#define SAM3U_PWMCMP6_MUPD             (SAM3U_PWMCMP6_BASE+SAM3U_PWMCMP_MUPD_OFFSET)
-
-#define SAM3U_PWMCMP7_V                (SAM3U_PWMCMP7_BASE+SAM3U_PWMCMP_V_OFFSET)
-#define SAM3U_PWMCMP7_VUPD             (SAM3U_PWMCMP7_BASE+SAM3U_PWMCMP_VUPD_OFFSET)
-#define SAM3U_PWMCMP7_M                (SAM3U_PWMCMP7_BASE+SAM3U_PWMCMP_M_OFFSET)
-#define SAM3U_PWMCMP7_MUPD             (SAM3U_PWMCMP7_BASE+SAM3U_PWMCMP_MUPD_OFFSET)
-
-/* PWM Channel Registers */
-
-#define SAM3U_PWCH_BASE(n)             (SAM3U_PWM_BASE+SAM3U_PWCH_OFFSET(n))
-#define SAM3U_PWMCH0_BASE              (SAM3U_PWM_BASE+0x0200)
-#define SAM3U_PWMCH1_BASE              (SAM3U_PWM_BASE+0x0220)
-#define SAM3U_PWMCH2_BASE              (SAM3U_PWM_BASE+0x0240)
-#define SAM3U_PWMCH3_BASE              (SAM3U_PWM_BASE+0x0260)
-
-#define SAM3U_PWMCH0_MR                (SAM3U_PWMCH0_BASE+SAM3U_PWMCH_MR_OFFSET)
-#define SAM3U_PWMCH0_DTY               (SAM3U_PWMCH0_BASE+SAM3U_PWMCH_DTY_OFFSET)
-#define SAM3U_PWMCH0_DTYUPD            (SAM3U_PWMCH0_BASE+SAM3U_PWMCH_DTYUPD_OFFSET)
-#define SAM3U_PWMCH0_PRD               (SAM3U_PWMCH0_BASE+SAM3U_PWMCH_PRD_OFFSET)
-#define SAM3U_PWMCH0_PRDUPD            (SAM3U_PWMCH0_BASE+SAM3U_PWMCH_PRDUPD_OFFSET)
-#define SAM3U_PWMCH0_CCNT              (SAM3U_PWMCH0_BASE+SAM3U_PWMCH_CCNT_OFFSET)
-#define SAM3U_PWMCH0_DT                (SAM3U_PWMCH0_BASE+SAM3U_PWMCH_DT_OFFSET)
-#define SAM3U_PWMCH0_DTUPD             (SAM3U_PWMCH0_BASE+SAM3U_PWMCH_DTUPD_OFFSET)
-
-#define SAM3U_PWMCH1_MR                (SAM3U_PWMCH1_BASE+SAM3U_PWMCH_MR_OFFSET)
-#define SAM3U_PWMCH1_DTY               (SAM3U_PWMCH1_BASE+SAM3U_PWMCH_DTY_OFFSET)
-#define SAM3U_PWMCH1_DTYUPD            (SAM3U_PWMCH1_BASE+SAM3U_PWMCH_DTYUPD_OFFSET)
-#define SAM3U_PWMCH1_PRD               (SAM3U_PWMCH1_BASE+SAM3U_PWMCH_PRD_OFFSET)
-#define SAM3U_PWMCH1_PRDUPD            (SAM3U_PWMCH1_BASE+SAM3U_PWMCH_PRDUPD_OFFSET)
-#define SAM3U_PWMCH1_CCNT              (SAM3U_PWMCH1_BASE+SAM3U_PWMCH_CCNT_OFFSET)
-#define SAM3U_PWMCH1_DT                (SAM3U_PWMCH1_BASE+SAM3U_PWMCH_DT_OFFSET)
-#define SAM3U_PWMCH1_DTUPD             (SAM3U_PWMCH1_BASE+SAM3U_PWMCH_DTUPD_OFFSET)
-
-#define SAM3U_PWMCH2_MR                (SAM3U_PWMCH2_BASE+SAM3U_PWMCH_MR_OFFSET)
-#define SAM3U_PWMCH2_DTY               (SAM3U_PWMCH2_BASE+SAM3U_PWMCH_DTY_OFFSET)
-#define SAM3U_PWMCH2_DTYUPD            (SAM3U_PWMCH2_BASE+SAM3U_PWMCH_DTYUPD_OFFSET)
-#define SAM3U_PWMCH2_PRD               (SAM3U_PWMCH2_BASE+SAM3U_PWMCH_PRD_OFFSET)
-#define SAM3U_PWMCH2_PRDUPD            (SAM3U_PWMCH2_BASE+SAM3U_PWMCH_PRDUPD_OFFSET)
-#define SAM3U_PWMCH2_CCNT              (SAM3U_PWMCH2_BASE+SAM3U_PWMCH_CCNT_OFFSET)
-#define SAM3U_PWMCH2_DT                (SAM3U_PWMCH2_BASE+SAM3U_PWMCH_DT_OFFSET)
-#define SAM3U_PWMCH2_DTUPD             (SAM3U_PWMCH2_BASE+SAM3U_PWMCH_DTUPD_OFFSET)
-
-#define SAM3U_PWMCH3_MR                (SAM3U_PWMCH3_BASE+SAM3U_PWMCH_MR_OFFSET)
-#define SAM3U_PWMCH3_DTY               (SAM3U_PWMCH3_BASE+SAM3U_PWMCH_DTY_OFFSET)
-#define SAM3U_PWMCH3_DTYUPD            (SAM3U_PWMCH3_BASE+SAM3U_PWMCH_DTYUPD_OFFSET)
-#define SAM3U_PWMCH3_PRD               (SAM3U_PWMCH3_BASE+SAM3U_PWMCH_PRD_OFFSET)
-#define SAM3U_PWMCH3_PRDUPD            (SAM3U_PWMCH3_BASE+SAM3U_PWMCH_PRDUPD_OFFSET)
-#define SAM3U_PWMCH3_CCNT              (SAM3U_PWMCH3_BASE+SAM3U_PWMCH_CCNT_OFFSET)
-#define SAM3U_PWMCH3_DT                (SAM3U_PWMCH3_BASE+SAM3U_PWMCH_DT_OFFSET)
-#define SAM3U_PWMCH3_DTUPD             (SAM3U_PWMCH3_BASE+SAM3U_PWMCH_DTUPD_OFFSET)
-
-/* PWM register bit definitions *********************************************************/
-
-/* PWM Clock Register */
-
-#define PWM_CLK_DIVA_SHIFT             (0)       /* Bits 0-7: CLKA Divide Factor */
-#define PWM_CLK_DIVA_MASK              (0xff << PWM_CLK_DIVA_SHIFT)
-#define PWM_CLK_PREA_SHIFT             (8)       /* Bits 8-11: CLKA Source Clock Selection */
-#define PWM_CLK_PREA_MASK              (15 << PWM_CLK_PREA_SHIFT)
-#  define PWM_CLK_PREA_MCK             (0  << PWM_CLK_PREA_SHIFT) /* MCK */
-#  define PWM_CLK_PREA_MCKDIV2         (1  << PWM_CLK_PREA_SHIFT) /* MCK/2 */
-#  define PWM_CLK_PREA_MCKDIV4         (2  << PWM_CLK_PREA_SHIFT) /* MCK/4 */
-#  define PWM_CLK_PREA_MCKDIV8         (3  << PWM_CLK_PREA_SHIFT) /* MCK/8 */
-#  define PWM_CLK_PREA_MCKDIV16        (4  << PWM_CLK_PREA_SHIFT) /* MCK/16 */
-#  define PWM_CLK_PREA_MCKDIV32        (5  << PWM_CLK_PREA_SHIFT) /* MCK/32 */
-#  define PWM_CLK_PREA_MCKDIV64        (6  << PWM_CLK_PREA_SHIFT) /* MCK/64 */
-#  define PWM_CLK_PREA_MCKDIV128       (7  << PWM_CLK_PREA_SHIFT) /* MCK/128 */
-#  define PWM_CLK_PREA_MCKDIV256       (8  << PWM_CLK_PREA_SHIFT) /* MCK/256 */
-#  define PWM_CLK_PREA_MCKDIV512       (9  << PWM_CLK_PREA_SHIFT) /* MCK/512 */
-#  define PWM_CLK_PREA_MCKDIV1024      (10 << PWM_CLK_PREA_SHIFT) /* MCK/1024 */
-#define PWM_CLK_DIVB_SHIFT             (16)      /* Bits 16-23: CLKB Divide Factor */
-#define PWM_CLK_DIVB_MASK              (0xff << PWM_CLK_DIVB_SHIFT)
-#define PWM_CLK_PREB_SHIFT             (24)      /* Bit 24-27: CLKB Source Clock Selection */
-#define PWM_CLK_PREB_MASK              (15 << PWM_CLK_PREB_SHIFT)
-#  define PWM_CLK_PREB_MCK             (0  << PWM_CLK_PREB_SHIFT) /* MCK */
-#  define PWM_CLK_PREB_MCKDIV2         (1  << PWM_CLK_PREB_SHIFT) /* MCK/2 */
-#  define PWM_CLK_PREB_MCKDIV4         (2  << PWM_CLK_PREB_SHIFT) /* MCK/4 */
-#  define PWM_CLK_PREB_MCKDIV8         (3  << PWM_CLK_PREB_SHIFT) /* MCK/8 */
-#  define PWM_CLK_PREB_MCKDIV16        (4  << PWM_CLK_PREB_SHIFT) /* MCK/16 */
-#  define PWM_CLK_PREB_MCKDIV32        (5  << PWM_CLK_PREB_SHIFT) /* MCK/32 */
-#  define PWM_CLK_PREB_MCKDIV64        (6  << PWM_CLK_PREB_SHIFT) /* MCK/64 */
-#  define PWM_CLK_PREB_MCKDIV128       (7  << PWM_CLK_PREB_SHIFT) /* MCK/128 */
-#  define PWM_CLK_PREB_MCKDIV256       (8  << PWM_CLK_PREB_SHIFT) /* MCK/256 */
-#  define PWM_CLK_PREB_MCKDIV512       (9  << PWM_CLK_PREB_SHIFT) /* MCK/512 */
-#  define PWM_CLK_PREB_MCKDIV1024      (10 << PWM_CLK_PREB_SHIFT) /* MCK/1024 */
-
-/* PWM Enable Register, PWM Disable Register, and PWM Status Register common bit-field definitions */
-
-#define SAM3U_ENAB_CHID(n)             (1 << ((n))
-#define SAM3U_ENAB_CHID0               (1 << 0)  /* Bit 0:  Counter Event Channel 0 Interrupt */
-#define SAM3U_ENAB_CHID1               (1 << 1)  /* Bit 1:  Counter Event Channel 1 Interrupt */
-#define SAM3U_ENAB_CHID2               (1 << 2)  /* Bit 2:  Counter Event Channel 2 Interrupt */
-#define SAM3U_ENAB_CHID3               (1 << 3)  /* Bit 3:  Counter Event Channel 3 Interrupt */
-
-/* PWM Interrupt Enable Register 1, PWM Interrupt Disable Register 1, PWM Interrupt
- * Mask Register 1, and PWM Interrupt Status Register 1 common bit definitions
- */
-
-#define SAM3U_INT_CHID(n)              (1 << (n))
-#define SAM3U_INT_CHID0                (1 << 0)  /* Bit 0:  Counter Event Channel 0 Interrupt */
-#define SAM3U_INT_CHID1                (1 << 1)  /* Bit 1:  Counter Event Channel 1 Interrupt */
-#define SAM3U_INT_CHID2                (1 << 2)  /* Bit 2:  Counter Event Channel 2 Interrupt */
-#define SAM3U_INT_CHID3                (1 << 3)  /* Bit 3:  Counter Event Channel 3 Interrupt */
-#define SAM3U_INT_FCHID(n)             (1 << ((n)+16))
-#define SAM3U_INT_FCHID0               (1 << 16) /* Bit 16: Fault Protection Trigger Channel 0 Interrupt */
-#define SAM3U_INT_FCHID1               (1 << 17) /* Bit 17: Fault Protection Trigger Channel 1 Interrupt */
-#define SAM3U_INT_FCHID2               (1 << 18) /* Bit 18: Fault Protection Trigger Channel 2 Interrupt */
-#define SAM3U_INT_FCHID3               (1 << 19) /* Bit 19: Fault Protection Trigger Channel 3 Interrupt */
-
-/* PWM Sync Channels Mode Register */
-
-#define PWM_SCM_SYNC(n)                (1 << (n))
-#define PWM_SCM_SYNC0                  (1 << 0)  /* Bit 0:  Synchronous Channel 0 */
-#define PWM_SCM_SYNC1                  (1 << 1)  /* Bit 1:  Synchronous Channel 1 */
-#define PWM_SCM_SYNC2                  (1 << 2)  /* Bit 2:  Synchronous Channel 2 */
-#define PWM_SCM_SYNC3                  (1 << 3)  /* Bit 3:  Synchronous Channel 3 */
-#define PWM_SCM_UPDM_SHIFT             (16)      /* Bits 16-17: Synchronous Channels Update Mode */
-#define PWM_SCM_UPDM_MASK              (3 << PWM_SCM_UPDM_SHIFT)
-#  define PWM_SCM_UPDM_MANMAN          (0 << PWM_SCM_UPDM_SHIFT) /* Manual write/manual update */
-#  define PWM_SCM_UPDM_MANAUTO         (1 << PWM_SCM_UPDM_SHIFT) /* Manual write/automatic update */
-#  define PWM_SCM_UPDM_AUTOAUTO        (2 << PWM_SCM_UPDM_SHIFT) /* Auto write/automatic update */
-#define PWM_SCM_PTRM                   (1 << 20) /* Bit 20: PDC Transfer Request Mode */
-#define PWM_SCM_PTRCS_SHIFT            (21)      /* Bits 21-23: PDC Transfer Request Comparison Selection */
-#define PWM_SCM_PTRCS_MASK             (7 << PWM_SCM_PTRCS_SHIFT)
-
-/* PWM Sync Channels Update Control Register */
-
-#define PWM_SCUC_UPDULOCK              (1 << 0)  /* Bit 0:  Synchronous Channels Update Unlock */
-
-/* PWM Sync Channels Update Period Register */
-
-#define PWM_SCUP_UPR_SHIFT             (0)       /* Bits 0-3:  Update Period */
-#define PWM_SCUP_UPR_MASK              (15 << PWM_SCUP_UPR_MASK)
-#define PWM_SCUP_UPRCNT_SHIFT          (4)       /* Bits 4-7:  Update Period Counter */
-#define PWM_SCUP_UPRCNT_MASK           (15 << PWM_SCUP_UPRCNT_SHIFT)
-
-/* PWM Sync Channels Update Period Update Register */
-
-#define PWM_SCUPUPD_SHIFT              (0)       /* Bits 0-3: Update Period Update */
-#define PWM_SCUPUPD_MASK               (15 << PWM_SCUPUPD_SHIFT)
-
-/* PWM Interrupt Enable Register 2, PWM Interrupt Disable Register 2, PWM Interrupt Mask Register 2, and PWM Interrupt Status Register 2 common bit-field definitions */
-
-#define SAM3U_INT_WRDY                 (1 << 0)  /* Bit 0:  Write Ready Update Interrupt */
-#define SAM3U_INT_ENDTX                (1 << 1)  /* Bit 1:  PDC End of TX Buffer Interrupt */
-#define SAM3U_INT_TXBUFE               (1 << 2)  /* Bit 2:  PDC TX Buffer Empty Interrupt */
-#define SAM3U_INT_UNRE                 (1 << 3)  /* Bit 3:  Synch Update Underrun Error Interrupt */
-#define SAM3U_INT_CMPM(n)              (1 << ((n)+8))
-#define SAM3U_INT_CMPM0                (1 << 8)  /* Bit 8:  Comparison 0 Match Interrupt */
-#define SAM3U_INT_CMPM1                (1 << 9)  /* Bit 9:  Comparison 1 Match Interrupt */
-#define SAM3U_INT_CMPM2                (1 << 10) /* Bit 10: Comparison 2 Match Interrupt */
-#define SAM3U_INT_CMPM3                (1 << 11) /* Bit 11: Comparison 3 Match Interrupt */
-#define SAM3U_INT_CMPM4                (1 << 12) /* Bit 12: Comparison 4 Match Interrupt */
-#define SAM3U_INT_CMPM5                (1 << 13) /* Bit 13: Comparison 5 Match Interrupt */
-#define SAM3U_INT_CMPM6                (1 << 14) /* Bit 14: Comparison 6 Match Interrupt */
-#define SAM3U_INT_CMPM7                (1 << 15) /* Bit 15: Comparison 7 Match Interrupt */
-#define SAM3U_INT_CMPU(n)              (1 << ((n)+16))
-#define SAM3U_INT_CMPU0                (1 << 16) /* Bit 16: Comparison o Update Interrupt */
-#define SAM3U_INT_CMPU1                (1 << 17) /* Bit 17: Comparison 1 Update Interrupt */
-#define SAM3U_INT_CMPU2                (1 << 18) /* Bit 18: Comparison 2 Update Interrupt */
-#define SAM3U_INT_CMPU3                (1 << 19) /* Bit 19: Comparison 3 Update Interrupt */
-#define SAM3U_INT_CMPU4                (1 << 20) /* Bit 20: Comparison 4 Update Interrupt */
-#define SAM3U_INT_CMPU5                (1 << 21) /* Bit 21: Comparison 5 Update Interrupt */
-#define SAM3U_INT_CMPU6                (1 << 22) /* Bit 22: Comparison 6 Update Interrupt */
-#define SAM3U_INT_CMPU7                (1 << 23) /* Bit 23: Comparison 7 Update Interrupt */
-
-/* PWM Output Override Value Register, PWM Output Selection Register, PWM Output
- * Selection Set Register, PWM Output Selection Clear Register, PWM Output Selection
- * Set Update Register,  and PWM Output Selection Clear Update Register common bit-field
- * definitions
- */
-
-#define PWM_OUT_OH(n)                  (1 << (n))
-#define PWM_OUT_OH0                    (1 << 0)  /* Bit 0:  Value for PWMH output of the channel 0 */
-#define PWM_OUT_OH1                    (1 << 1)  /* Bit 1:  Value for PWMH output of the channel 1 */
-#define PWM_OUT_OH2                    (1 << 2)  /* Bit 2:  Value for PWMH output of the channel 2 */
-#define PWM_OUT_OH3                    (1 << 3)  /* Bit 3:  Value for PWMH output of the channel 3 */
-#define PWM_OUT_OL(n)                  (1 << ((n)+16))
-#define PWM_OUT_OL0                    (1 << 16) /* Bit 16: Value for PWML output of the channel 0 */
-#define PWM_OUT_OL1                    (1 << 17) /* Bit 17: Value for PWML output of the channel 1 */
-#define PWM_OUT_OL2                    (1 << 18) /* Bit 18: Value for PWML output of the channel 2 */
-#define PWM_OUT_OL3                    (1 << 19) /* Bit 19: Value for PWML output of the channel 3 */
-
-/* PWM Fault Mode Register */
-
-#define PWM_FMR_FPOL(n)                (1 << (n))
-#define PWM_FMR_FPOL0                  (1 << 0)  /* Bit 0:  Fault 0 Polarity */
-#define PWM_FMR_FPOL1                  (1 << 1)  /* Bit 1:  Fault 1 Polarity */
-#define PWM_FMR_FPOL2                  (1 << 2)  /* Bit 2:  Fault 2 Polarity */
-#define PWM_FMR_FPOL3                  (1 << 3)  /* Bit 3:  Fault 3 Polarity */
-#define PWM_FMR_FMOD(n)                (1 << ((n)+8))
-#define PWM_FMR_FMOD0                  (1 << 8)  /* Bit 8:  Fault 0 Activation Mode */
-#define PWM_FMR_FMOD1                  (1 << 9)  /* Bit 9:  Fault 1 Activation Mode */
-#define PWM_FMR_FMOD2                  (1 << 10) /* Bit 10: Fault 2 Activation Mode */
-#define PWM_FMR_FMOD3                  (1 << 11) /* Bit 11: Fault 3 Activation Mode */
-#define PWM_FMR_FFIL(n)                (1 << ((n)+16))
-#define PWM_FMR_FFIL0                  (1 << 16) /* Bit 16: Fault 0 Filter */
-#define PWM_FMR_FFIL1                  (1 << 17) /* Bit 17: Fault 1 Filter */
-#define PWM_FMR_FFIL2                  (1 << 18) /* Bit 18: Fault 2 Filter */
-#define PWM_FMR_FFIL3                  (1 << 19) /* Bit 19: Fault 3 Filter */
-
-/* PWM Fault Status Register */
-
-#define PWM_FSR_FIV(n)                 (1 << (n))
-#define PWM_FSR_FIV0                   (1 << 0)  /* Bit 0:  Fault Input 0 Value */
-#define PWM_FSR_FIV1                   (1 << 1)  /* Bit 1:  Fault Input 1 Value */
-#define PWM_FSR_FIV2                   (1 << 2)  /* Bit 2:  Fault Input 2 Value */
-#define PWM_FSR_FIV3                   (1 << 3)  /* Bit 3:  Fault Input 3 Value */
-#define PWM_FSR_FS(n)                  (1 << ((n)+8))
-#define PWM_FSR_FS0                    (1 << 8)  /* Bit 8:  Fault 0 Status */
-#define PWM_FSR_FS1                    (1 << 9)  /* Bit 9:  Fault 1 Status */
-#define PWM_FSR_FS2                    (1 << 10) /* Bit 10: Fault 2 Status */
-#define PWM_FSR_FS3                    (1 << 11) /* Bit 11: Fault 3 Status */
-
-/* PWM Fault Clear Register */
-
-#define PWM_FCR_FCLR(n)                (1 << (n))
-#define PWM_FCR_FCLR0                  (1 << 0)  /* Bit 0:  Fault 0 Clear */
-#define PWM_FCR_FCLR1                  (1 << 1)  /* Bit 1:  Fault 1 Clear */
-#define PWM_FCR_FCLR2                  (1 << 2)  /* Bit 2:  Fault 2 Clear */
-#define PWM_FCR_FCLR3                  (1 << 3)  /* Bit 3:  Fault 3 Clear */
-
-/* PWM Fault Protection Value Register */
-
-#define PWM_FPV_FPVH(n)                (1 << (n))
-#define PWM_FPV_FPVH0                  (1 << 0)  /* Bit 0:  Fault Protection Value PWMH output channel 0 */
-#define PWM_FPV_FPVH1                  (1 << 1)  /* Bit 1:  Fault Protection Value PWMH output channel 1 */
-#define PWM_FPV_FPVH2                  (1 << 2)  /* Bit 2:  Fault Protection Value PWMH output channel 2 */
-#define PWM_FPV_FPVH3                  (1 << 3)  /* Bit 3:  Fault Protection Value PWMH output channel 3 */
-#define PWM_FPV_FPVL(n)                (1 << ((n)+16))
-#define PWM_FPV_FPVL0                  (1 << 16) /* Bit 16: Fault Protection Value PWML output channel 0 */
-#define PWM_FPV_FPVL1                  (1 << 17) /* Bit 17: Fault Protection Value PWML output channel 1 */
-#define PWM_FPV_FPVL2                  (1 << 18) /* Bit 18: Fault Protection Value PWML output channel 2 */
-#define PWM_FPV_FPVL3                  (1 << 19) /* Bit 19: Fault Protection Value PWML output channel 3 */
-
-/* PWM Fault Protection Enable Register */
-
-#define PWM_FPE_FPEN(n,y)              (1 << (((n)<<8)+y))
-#define PWM_FPE_FPE0(y)                (1 << (y))      /* Bits 0-7:   Fault Protection Enable Fault=y chan=0 */
-#define PWM_FPE_FPE1(y)                (1 << ((y)+8))  /* Bits 8-15:  Fault Protection Enable Fault=y chan=1 */
-#define PWM_FPE_FPE2(y)                (1 << ((y)+16)) /* Bits 16-23: Fault Protection Enable Fault=y chan=2 */
-#define PWM_FPE_FPE3(y)                (1 << ((y)+24)  /* Bits 24-31: Fault Protection Enable Fault=y chan=3 */
-
-/* PWM Event Line 1/2 Register */
-
-#define PWM_ELMR_CSEL(n)               (1 << (n))
-#define PWM_ELMR_CSEL0                 (1 << 0)  /* Bit 0:  Comparison 0 Selection */
-#define PWM_ELMR_CSEL1                 (1 << 1)  /* Bit 1:  Comparison 1 Selection */
-#define PWM_ELMR_CSEL2                 (1 << 2)  /* Bit 2:  Comparison 2 Selection */
-#define PWM_ELMR_CSEL3                 (1 << 3)  /* Bit 3:  Comparison 3 Selection */
-#define PWM_ELMR_CSEL4                 (1 << 4)  /* Bit 4:  Comparison 4 Selection */
-#define PWM_ELMR_CSEL5                 (1 << 5)  /* Bit 5:  Comparison 5 Selection */
-#define PWM_ELMR_CSEL6                 (1 << 6)  /* Bit 6:  Comparison 6 Selection */
-#define PWM_ELMR_CSEL7                 (1 << 7)  /* Bit 7:  Comparison 7 Selection */
-
-/* PWM Write Protect Control Register */
-
-#define PWM_WPCR_WPCMD_SHIFT           (0)       /* Bits 0-1: Write Protect Command */
-#define PWM_WPCR_WPCMD_MASK            (3 << PWM_WPCR_WPCMD_SHIFT)
-#define PWM_WPCR_WPRG(n)               (1 << ((n)+2))
-#define PWM_WPCR_WPRG0                 (1 << 2)  /* Bit 2:  Write Protect Register Group 0 */
-#define PWM_WPCR_WPRG1                 (1 << 3)  /* Bit 3:  Write Protect Register Group 1 */
-#define PWM_WPCR_WPRG2                 (1 << 4)  /* Bit 4:  Write Protect Register Group 2 */
-#define PWM_WPCR_WPRG3                 (1 << 5)  /* Bit 5:  Write Protect Register Group 3 */
-#define PWM_WPCR_WPRG4                 (1 << 6)  /* Bit 6:  Write Protect Register Group 4 */
-#define PWM_WPCR_WPRG5                 (1 << 7)  /* Bit 7:  Write Protect Register Group 5 */
-#define PWM_WPCR_WPKEY_SHIFT           (8)       /* Bits 8-31:  Write Protect Key */
-#define PWM_WPCR_WPKEY_MASK            (0x00ffffff << PWM_WPCR_WPKEY_SHIFT)
-
-/* PWM Write Protect Status Register */
-
-#define PWM_WPSR_WPSWS(n)              (1 << (n))
-#define PWM_WPSR_WPSWS0                (1 << 0)  /* Bit 0:  Write Protect SW Status */
-#define PWM_WPSR_WPSWS1                (1 << 1)  /* Bit 1:  Write Protect SW Status */
-#define PWM_WPSR_WPSWS2                (1 << 2)  /* Bit 2:  Write Protect SW Status */
-#define PWM_WPSR_WPSWS3                (1 << 3)  /* Bit 3:  Write Protect SW Status */
-#define PWM_WPSR_WPSWS4                (1 << 4)  /* Bit 4:  Write Protect SW Status */
-#define PWM_WPSR_WPSWS5                (1 << 5)  /* Bit 5:  Write Protect SW Status */
-#define PWM_WPSR_WPVS                  (1 << 7)  /* Bit 7:  Write Protect Violation Status */
-#define PWM_WPSR_WPHWS(n)              (1 << ((n)+8))
-#define PWM_WPSR_WPHWS0                (1 << 8)  /* Bit 8:  Write Protect HW Status */
-#define PWM_WPSR_WPHWS1                (1 << 9)  /* Bit 9:  Write Protect HW Status */
-#define PWM_WPSR_WPHWS2                (1 << 10) /* Bit 10: Write Protect HW Status */
-#define PWM_WPSR_WPHWS3                (1 << 11) /* Bit 11: Write Protect HW Status */
-#define PWM_WPSR_WPHWS4                (1 << 12) /* Bit 12: Write Protect HW Status */
-#define PWM_WPSR_WPHWS5                (1 << 13) /* Bit 13: Write Protect HW Status */
-#define PWM_WPSR_WPVSRC_SHIFT          (16)      /* Bits 16-31: Write Protect Violation Source */
-#define PWM_WPSR_WPVSRC_MASK           (0xffff << PWM_WPSR_WPVSRC_SHIFT)
-
-/* PWM Comparison x Value Register and PWM Comparison x Value Update Register */
-
-#define PWMCMP_CV_SHIFT                (0)       /* Bits 0-23: Comparison x Value */
-#define PWMCMP_CV_MASK                 (0x00ffffff << PWMCMP_CV_SHIFT)
-#define PWMCMP_CVM                     (1 << 24) /* Bit 24: Comparison x Value Mode */
-
-/* PWM Comparison x Mode Register  and PWM Comparison x Mode Update Register */
-
-#define PWMCMP_CEN                     (1 << 0)  /* Bit 0:  Comparison x Enable */
-#define PWMCMP_CTR_SHIFT               (4)       /* Bits 4-7: Comparison x Trigger */
-#define PWMCMP_CTR_MASK                (15 << PWMCMP_CTR_SHIFT)
-#define PWMCMP_CPR_SHIFT               (8)       /* Bits 8-11: Comparison x Period */
-#define PWMCMP_CPR_MASK                (15 << PWMCMP_CPR_SHIFT)
-#define PWMCMP_M_CPRCNT_SHIFT          (12)      /* Bits 12-15: Comparison x Period Count (M only) */
-#define PWMCMP_M_CPRCNT_MASK           (15 << PWMCMP_M_CPRCNT_SHIFT)
-#define PWMCMP_CUPR_SHIFT              (16)      /* Bits 16-19: Comparison x Update Period */
-#define PWMCMP_CUPR_MASK               (15 << PWMCMP_CUPR_SHIFT)
-#define PWMCMP_M_CUPRCNT_SHIFT         (20)      /* Bits 20-23: Comparison x Update Period Counter (M only) */
-#define PWMCMP_M_CUPRCNT_MASK          (15 << PWMCMP_M_CUPRCNT_SHIFT)
-
-/* PWM Channel Mode Register */
-
-#define PWMCH_MR_CPRE_SHIFT            (0)       /* Bits 0-3: Channel Pre-scaler */
-#define PWMCH_MR_CPRE_MASK             (15 << PWMCH_MR_CPRE_SHIFT)
-#  define PWMCH_MR_CPRE_MCK            (0  << PWMCH_MR_CPRE_SHIFT) /* MCK */
-#  define PWMCH_MR_CPRE_MCKDIV2        (1  << PWMCH_MR_CPRE_SHIFT) /* MCK/2 */
-#  define PWMCH_MR_CPRE_MCKDIV4        (2  << PWMCH_MR_CPRE_SHIFT) /* MCK/4 */
-#  define PWMCH_MR_CPRE_MCKDIV8        (3  << PWMCH_MR_CPRE_SHIFT) /* MCK/8 */
-#  define PWMCH_MR_CPRE_MCKDIV16       (4  << PWMCH_MR_CPRE_SHIFT) /* MCK/16 */
-#  define PWMCH_MR_CPRE_MCKDIV32       (5  << PWMCH_MR_CPRE_SHIFT) /* MCK/32 */
-#  define PWMCH_MR_CPRE_MCKDIV64       (6  << PWMCH_MR_CPRE_SHIFT) /* MCK/64 */
-#  define PWMCH_MR_CPRE_MCKDIV128      (7  << PWMCH_MR_CPRE_SHIFT) /* MCK/128 */
-#  define PWMCH_MR_CPRE_MCKDIV256      (8  << PWMCH_MR_CPRE_SHIFT) /* MCK/256 */
-#  define PWMCH_MR_CPRE_MCKDIV512      (9  << PWMCH_MR_CPRE_SHIFT) /* MCK/512 */
-#  define PWMCH_MR_CPRE_MCKDIV1024     (10 << PWMCH_MR_CPRE_SHIFT) /* MCK/1024 */
-#  define PWMCH_MR_CPRE_CLKA           (11 << PWMCH_MR_CPRE_SHIFT) /*CLKA */
-#  define PWMCH_MR_CPRE_CLKB           (12 << PWMCH_MR_CPRE_SHIFT) /* CLKB */
-#define PWMCH_MR_CALG                  (1 << 8)  /* Bit 8:  Channel Alignment */
-#define PWMCH_MR_CPOL                  (1 << 9)  /* Bit 9:  Channel Polarity */
-#define PWMCH_MR_CES                   (1 << 10) /* Bit 10:  Counter Event Selection */
-#define PWMCH_MR_DTE                   (1 << 16) /* Bit 16: Dead-Time Generator Enable */
-#define PWMCH_MR_DTHI                  (1 << 17) /* Bit 17: Dead-Time PWMHx Output Inverted */
-#define PWMCH_MR_DTLI                  (1 << 18) /* Bit 18: Dead-Time PWMLx Output Inverted */
-
-/* PWM Channel Duty Cycle Register and PWM Channel Duty Cycle Update Register common bit-field definitions */
-
-#define PWMCH_DTY_SHIFT                (0)       /* Bits 0-23: Channel Duty-Cycle */
-#define PWMCH_DTY_MASK                 (0x00ffffff << PWMCH_DTY_SHIFT)
-
-/* PWM Channel Period Register and PWM Channel Period Update Register common bit-field definitions */
-
-#define PWMCH_PRD_SHIFT                (0)       /* Bits 0-23: Channel Period */
-#define PWMCH_PRD_MASK                 (0x00ffffff << PWMCH_PRD_SHIFT)
-
-/* PWM Channel Counter Register */
-
-#define PWMCH_CCNT_SHIFT               (0)       /* Bits 0-23: Channel Counter Register */
-#define PWMCH_CCNT_MASK                (0x00ffffff << PWMCH_CCNT_SHIFT)
-
-/* PWM Channel Dead Time Register and PWM Channel Dead Time Update Register common bit-field definitions */
-
-#define PWMCH_DTH_SHIFT                (0)       /* Bits 0-15: Dead-Time Value for PWMHx Output */
-#define PWMCH_DTH_MASK                 (0xffff << PWMCH_DTH_SHIFT)
-#define PWMCH_DTL_SHIFT                (16)      /* Bits 16-31: Dead-Time Value for PWMLx Output */
-#define PWMCH_DTL_MASK                 (0xffff << PWMCH_DTL_SHIFT)
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Functions
- ****************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_PWM_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_rtc.h b/nuttx/arch/arm/src/sam3u/sam3u_rtc.h
deleted file mode 100644
index 61e6bb68e..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_rtc.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_rtc.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_RTC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_RTC_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/****************************************************************************************
- * Pre-processor Definitions
- ****************************************************************************************/
-
-/* RTC register offsets *****************************************************************/
-
-#define SAM3U_RTC_CR_OFFSET            0x00 /* Control Register */
-#define SAM3U_RTC_MR_OFFSET            0x04 /* Mode Register */
-#define SAM3U_RTC_TIMR_OFFSET          0x08 /* Time Register */
-#define SAM3U_RTC_CALR_OFFSET          0x0c /* Calendar Register */
-#define SAM3U_RTC_TIMALR_OFFSET        0x10 /* Time Alarm Register */
-#define SAM3U_RTC_CALALR_OFFSET        0x14 /* Calendar Alarm Register */
-#define SAM3U_RTC_SR_OFFSET            0x18 /* Status Register */
-#define SAM3U_RTC_SCCR_OFFSET          0x1c /* Status Clear Command Register */
-#define SAM3U_RTC_IER_OFFSET           0x20 /* Interrupt Enable Register */
-#define SAM3U_RTC_IDR_OFFSET           0x24 /* Interrupt Disable Register */
-#define SAM3U_RTC_IMR_OFFSET           0x28 /* Interrupt Mask Register */
-#define SAM3U_RTC_VER_OFFSET           0x2c /* Valid Entry Register */
-
-/* RTC register adresses ****************************************************************/
-
-#define SAM3U_RTC_CR                   (SAM3U_RTC_BASE+SAM3U_RTC_CR_OFFSET)
-#define SAM3U_RTC_MR                   (SAM3U_RTC_BASE+SAM3U_RTC_MR_OFFSET)
-#define SAM3U_RTC_TIMR                 (SAM3U_RTC_BASE+SAM3U_RTC_TIMR_OFFSET)
-#define SAM3U_RTC_CALR                 (SAM3U_RTC_BASE+SAM3U_RTC_CALR_OFFSET)
-#define SAM3U_RTC_TIMALR               (SAM3U_RTC_BASE+SAM3U_RTC_TIMALR_OFFSET)
-#define SAM3U_RTC_CALALR               (SAM3U_RTC_BASE+SAM3U_RTC_CALALR_OFFSET)
-#define SAM3U_RTC_SR                   (SAM3U_RTC_BASE+SAM3U_RTC_SR_OFFSET)
-#define SAM3U_RTC_SCCR                 (SAM3U_RTC_BASE+SAM3U_RTC_SCCR_OFFSET)
-#define SAM3U_RTC_IER                  (SAM3U_RTC_BASE+SAM3U_RTC_IER_OFFSET)
-#define SAM3U_RTC_IDR                  (SAM3U_RTC_BASE+SAM3U_RTC_IDR_OFFSET)
-#define SAM3U_RTC_IMR                  (SAM3U_RTC_BASE+SAM3U_RTC_IMR_OFFSET)
-#define SAM3U_RTC_VER                  (SAM3U_RTC_BASE+SAM3U_RTC_VER_OFFSET)
-
-/* RTC register bit definitions *********************************************************/
-
-#define RTC_CR_UPDTIM                  (1 << 0)  /* Bit 0:  Update Request Time Register */
-#define RTC_CR_UPDCAL                  (1 << 1)  /* Bit 1:  Update Request Calendar Register */
-#define RTC_CR_TIMEVSEL_SHIFT          (8)       /* Bits 8-9:  Time Event Selection */
-#define RTC_CR_TIMEVSEL_MASK           (3 << RTC_CR_TIMEVSEL_SHIFT)
-#  define RTC_CR_TIMEVSEL_MIN          (0 << RTC_CR_TIMEVSEL_SHIFT)
-#  define RTC_CR_TIMEVSEL_HOUR         (1 << RTC_CR_TIMEVSEL_SHIFT)
-#  define RTC_CR_TIMEVSEL_MIDNIGHT     (2 << RTC_CR_TIMEVSEL_SHIFT)
-#  define RTC_CR_TIMEVSEL_NOON         (3 << RTC_CR_TIMEVSEL_SHIFT)
-#define RTC_CR_CALEVSEL_SHIFT          (16)      /* Bits 16-17:  Calendar Event Selection */
-#define RTC_CR_CALEVSEL_MASK           (3 << RTC_CR_CALEVSEL_SHIFT)
-#  define RTC_CR_CALEVSEL_WEEK         (0 << RTC_CR_CALEVSEL_SHIFT)
-#  define RTC_CR_CALEVSEL_MONTH        (1 << RTC_CR_CALEVSEL_SHIFT)
-#  define RTC_CR_CALEVSEL_YEAR         (2 << RTC_CR_CALEVSEL_SHIFT)
-
-#define RTC_MR_HRMOD                   (1 << 0)  /* Bit 0:  12-/24-hour Mode */
-
-#define RTC_TIMR_SEC_SHIFT             (0)       /* Bits 0-6:  Current Second */
-#define RTC_TIMR_SEC_MASK              (0x7f << RTC_TIMR_SEC_SHIFT)
-#define RTC_TIMR_MIN_SHIFT             (8)       /* Bits 8-14:  Current Minute */
-#define RTC_TIMR_MIN_MASK              (0x7f <<  RTC_TIMR_MIN_SHIFT)
-#define RTC_TIMR_HOUR_SHIFT            (16)      /* Bits 16-21: Current Hour */
-#define RTC_TIMR_HOUR_MASK             (0x3f << RTC_TIMR_HOUR_SHIFT)
-#define RTC_TIMR_AMPM                  (1 << 22) /* Bit 22: Ante Meridiem Post Meridiem Indicator */
-
-#define RTC_CALR_CENT_SHIFT            (0)       /* Bits 0-6:  Current Century */
-#define RTC_CALR_CENT_MASK             (0x7f << RTC_TIMR_HOUR_SHIFT)
-#define RTC_CALR_YEAR_SHIFT            (8)       /* Bits 8-15:  Current Year */
-#define RTC_CALR_YEAR_MASK             (0xff << RTC_CALR_YEAR_SHIFT)
-#define RTC_CALR_MONTH_SHIFT           (16)      /* Bits 16-20: Current Month */
-#define RTC_CALR_MONTH_MASK            (0x1f << RTC_CALR_MONTH_SHIFT)
-#define RTC_CALR_DAY_SHIFT             (21)      /* Bits 21-23: Current Day in Current Week */
-#define RTC_CALR_DAY_MASK              (7 << RTC_CALR_DAY_SHIFT)
-#define RTC_CALR_DATE_SHIFT            (24)      /* Bits 24-29: Current Day in Current Month */
-#define RTC_CALR_DATE_MASK             (0x3f << RTC_CALR_DATE_SHIFT)
-
-#define RTC_TIMALR_SEC_SHIFT           (0)       /* Bits 0-6:  Second Alarm */
-#define RTC_TIMALR_SEC_MASK            (0x7f << RTC_TIMALR_SEC_SHIFT)
-#define RTC_TIMALR_SECEN               (1 << 7)  /* Bit 7:  Second Alarm Enable */
-#define RTC_TIMALR_MIN_SHIFT           (8)       /* Bits 8-14:  Minute Alarm */
-#define RTC_TIMALR_MIN_MASK            (0x7f << RTC_TIMALR_MIN_SHIFT)
-#define RTC_TIMALR_MINEN               (1 << 15) /* Bit 15: Minute Alarm Enable */
-#define RTC_TIMALR_HOUR_SHIFT          (16)      /* Bits 16-21:  Hour Alarm */
-#define RTC_TIMALR_HOUR_MASK           (0x3f << RTC_TIMALR_HOUR_SHIFT)
-#define RTC_TIMALR_AMPM                (1 << 22) /* Bit 22: AM/PM Indicator */
-#define RTC_TIMALR_HOUREN              (1 << 23) /* Bit 23: Hour Alarm Enable */
-
-#define RTC_CALALR_MONTH_SHIFT         (16)      /* Bits 16-20:  Month Alarm */
-#define RTC_CALALR_MONTH_MASK          (0x1f << RTC_CALALR_MONTH_SHIFT)
-#define RTC_CALALR_MTHEN               (1 << 23) /* Bit 23: Month Alarm Enable */
-#define RTC_CALALR_DATE_SHIFT          (24)      /* Bits 24-29:  Date Alarm */
-#define RTC_CALALR_DATE_MASK           (0x3c << RTC_CALALR_DATE_SHIFT)
-#define RTC_CALALR_DATEEN              (1 << 31) /* Bit 31: Date Alarm Enable */
-
-#define RTC_SR_ACKUPD                  (1 << 0)  /* Bit 0:  Acknowledge for Update */
-#define RTC_SR_ALARM                   (1 << 1)  /* Bit 1:  Alarm Flag */
-#define RTC_SR_SEC                     (1 << 2)  /* Bit 2:  Second Event */
-#define RTC_SR_TIMEV                   (1 << 3)  /* Bit 3:  Time Event */
-#define RTC_SR_CALEV                   (1 << 4)  /* Bit 4:  Calendar Event */
-
-#define RTC_SCCR_ACKCLR                (1 << 0)  /* Bit 0:  Acknowledge Clear */
-#define RTC_SCCR_ALRCLR                (1 << 1)  /* Bit 1:  Alarm Clear */
-#define RTC_SCCR_SECCLR                (1 << 2)  /* Bit 2:  Second Clear */
-#define RTC_SCCR_TIMCLR                (1 << 3)  /* Bit 3:  Time Clear */
-#define RTC_SCCR_CALCLR                (1 << 4)  /* Bit 4:  Calendar Clear */
-
-#define RTC_IER_ACKEN                  (1 << 0)  /* Bit 0:  Acknowledge Update Interrupt Enable */
-#define RTC_IER_ALREN                  (1 << 1)  /* Bit 1:  Alarm Interrupt Enable */
-#define RTC_IER_SECEN                  (1 << 2)  /* Bit 2:  Second Event Interrupt Enable */
-#define RTC_IER_TIMEN                  (1 << 3)  /* Bit 3:  Time Event Interrupt Enable */
-#define RTC_IER_CALEN                  (1 << 4)  /* Bit 4:  Calendar Event Interrupt Enable */
-
-#define RTC_IDR_ACKDIS                 (1 << 0)  /* Bit 0:  Acknowledge Update Interrupt Disable */
-#define RTC_IDR_ALRDIS                 (1 << 1)  /* Bit 1:  Alarm Interrupt Disable */
-#define RTC_IDR_SECDIS                 (1 << 2)  /* Bit 2:  Second Event Interrupt Disable */
-#define RTC_IDR_TIMDIS                 (1 << 3)  /* Bit 3:  Time Event Interrupt Disable */
-#define RTC_IDR_CALDIS                 (1 << 4)  /* Bit 4:  Calendar Event Interrupt Disable */
-
-#define RTC_IMR_ACK                    (1 << 0)  /* Bit 0:  Acknowledge Update Interrupt Mask */
-#define RTC_IMR_ALR                    (1 << 1)  /* Bit 1:  Alarm Interrupt Mask */
-#define RTC_IMR_SEC                    (1 << 2)  /* Bit 2:  Second Event Interrupt Mask */
-#define RTC_IMR_TIM                    (1 << 3)  /* Bit 3:  Time Event Interrupt Mask */
-#define RTC_IMR_CAL                    (1 << 4)  /* Bit 4:  Calendar Event Interrupt Mask */
-
-#define RTC_VER_NVTIM                  (1 << 0)  /* Bit 0:  Non-valid Time */
-#define RTC_VER_NVCAL                  (1 << 1)  /* Bit 1:  Non-valid Calendar */
-#define RTC_VER_NVTIMALR               (1 << 2)  /* Bit 2:  Non-valid Time Alarm */
-#define RTC_VER_NVCALALR               (1 << 3)  /* Bit 3:  Non-valid Calendar Alarm */
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Functions
- ****************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_RTC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_spi.h b/nuttx/arch/arm/src/sam3u/sam3u_spi.h
deleted file mode 100644
index bce613575..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_spi.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_spi.h
- *
- *   Copyright (C) 2009, 2011 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_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_BITS(n)           (((n)-8) << SPI_CSR_BITS_SHIFT) /* n, n=8-16 */
-#  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_BITS16            (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_ssc.h b/nuttx/arch/arm/src/sam3u/sam3u_ssc.h
deleted file mode 100644
index 5a5df824b..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_ssc.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_ssc.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_SSC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_SSC_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/****************************************************************************************
- * Pre-processor Definitions
- ****************************************************************************************/
-
-/* SSC register offsets *****************************************************************/
-
-#define SAM3U_SSC_CR_OFFSET          0x000 /* Control Register */
-#define SAM3U_SSC_CMR_OFFSET         0x004 /* Clock Mode Register */
-                                           /* 0x008: Reserved */
-                                           /* 0x00c: Reserved */
-#define SAM3U_SSC_RCMR_OFFSET        0x010 /* Receive Clock Mode Register */
-#define SAM3U_SSC_RFMR_OFFSET        0x014 /* Receive Frame Mode Register */
-#define SAM3U_SSC_TCMR_OFFSET        0x018 /* Transmit Clock Mode Register */
-#define SAM3U_SSC_TFMR_OFFSET        0x01c /* Transmit Frame Mode Register */
-#define SAM3U_SSC_RHR_OFFSET         0x020 /* Receive Holding Register */
-#define SAM3U_SSC_THR_OFFSET         0x024 /* Transmit Holding Register */
-                                           /* 0x028: Reserved */
-                                           /* 0x02c: Reserved */
-#define SAM3U_SSC_RSHR_OFFSET        0x030 /* Receive Sync. Holding Register */
-#define SAM3U_SSC_TSHR_OFFSET        0x034 /* Transmit Sync. Holding Register */
-#define SAM3U_SSC_RC0R_OFFSET        0x038 /* Receive Compare 0 Register */
-#define SAM3U_SSC_RC1R_OFFSET        0x03c /* Receive Compare 1 Register */
-#define SAM3U_SSC_SR_OFFSET          0x040 /* Status Register */
-#define SAM3U_SSC_IER_OFFSET         0x044 /* Interrupt Enable Register */
-#define SAM3U_SSC_IDR_OFFSET         0x048 /* Interrupt Disable Register */
-#define SAM3U_SSC_IMR_OFFSET         0x04c /* Interrupt Mask Register */
-#define SAM3U_SSC_WPMR_OFFSET        0x0e4 /* Write Protect Mode Register */
-#define SAM3U_SSC_WPSR_OFFSET        0x0e8 /* Write Protect Status Register */
-                                           /* 0x050-0x0fc: Reserved */
-                                           /* 0x100-0x124: Reserved */
-
-/* SSC register adresses ****************************************************************/
-
-#define SAM3U_SSC_CR                 (SAM3U_SSC_BASE+SAM3U_SSC_CR_OFFSET)
-#define SAM3U_SSC_CMR                (SAM3U_SSC_BASE+SAM3U_SSC_CMR_OFFSET)
-#define SAM3U_SSC_RCMR               (SAM3U_SSC_BASE+SAM3U_SSC_RCMR_OFFSET)
-#define SAM3U_SSC_RFMR               (SAM3U_SSC_BASE+SAM3U_SSC_RFMR_OFFSET)
-#define SAM3U_SSC_TCMR               (SAM3U_SSC_BASE+SAM3U_SSC_TCMR_OFFSET)
-#define SAM3U_SSC_TFMR               (SAM3U_SSC_BASE+SAM3U_SSC_TFMR_OFFSET)
-#define SAM3U_SSC_RHR                (SAM3U_SSC_BASE+SAM3U_SSC_RHR_OFFSET)
-#define SAM3U_SSC_THR                (SAM3U_SSC_BASE+SAM3U_SSC_THR_OFFSET)
-#define SAM3U_SSC_RSHR               (SAM3U_SSC_BASE+SAM3U_SSC_RSHR_OFFSET)
-#define SAM3U_SSC_TSHR               (SAM3U_SSC_BASE+SAM3U_SSC_TSHR_OFFSET)
-#define SAM3U_SSC_RC0R               (SAM3U_SSC_BASE+SAM3U_SSC_RC0R_OFFSET)
-#define SAM3U_SSC_RC1R               (SAM3U_SSC_BASE+SAM3U_SSC_RC1R_OFFSET)
-#define SAM3U_SSC_SR                 (SAM3U_SSC_BASE+SAM3U_SSC_SR_OFFSET)
-#define SAM3U_SSC_IER                (SAM3U_SSC_BASE+SAM3U_SSC_IER_OFFSET)
-#define SAM3U_SSC_IDR                (SAM3U_SSC_BASE+SAM3U_SSC_IDR_OFFSET)
-#define SAM3U_SSC_IMR                (SAM3U_SSC_BASE+SAM3U_SSC_IMR_OFFSET)
-#define SAM3U_SSC_WPMR               (SAM3U_SSC_BASE+SAM3U_SSC_WPMR_OFFSET)
-#define SAM3U_SSC_WPSR               (SAM3U_SSC_BASE+SAM3U_SSC_WPSR_OFFSET)
-
-/* SSC register bit definitions *********************************************************/
-
-/* SSC Control Register */
-
-#define SSC_CR_RXEN                  (1 << 0)  /* Bit 0:  Receive Enable */
-#define SSC_CR_RXDIS                 (1 << 1)  /* Bit 1:  Receive Disable */
-#define SSC_CR_TXEN                  (1 << 8)  /* Bit 8:  Transmit Enable */
-#define SSC_CR_TXDIS                 (1 << 9)  /* Bit 9:  Transmit Disable */
-#define SSC_CR_SWRST                 (1 << 15) /* Bit 15: Software Reset */
-
-/* SSC Clock Mode Register */
-
-#define SSC_CMR_DIV_SHIFT            (0)       /* Bits 0-11:  Clock Divider */
-#define SSC_CMR_DIV_MASK             (0xfff << SSC_CMR_DIV_SHIFT)
-
-/* SSC Receive Clock Mode Register */
-
-#define SSC_RCMR_CKS_SHIFT           (0)       /* Bits 0-1:  Receive Clock Selection */
-#define SSC_RCMR_CKS_MASK            (3 << SSC_RCMR_CKS_SHIFT)
-#  define SSC_RCMR_CKS_DIVIDED       (0 << SSC_RCMR_CKS_SHIFT) /* Divided Clock */
-#  define SSC_RCMR_CKS_TK            (1 << SSC_RCMR_CKS_SHIFT) /* TK Clock signal */
-#  define SSC_RCMR_CKS_RK            (2 << SSC_RCMR_CKS_SHIFT) /* RK pin */
-#define SSC_RCMR_CKO_SHIFT           (2)       /* Bits 2-4:  Receive Clock Output Mode Selection */
-#define SSC_RCMR_CKO_MASK            (7 << SSC_RCMR_CKO_SHIFT)
-#  define SSC_RCMR_CKO_ NONE         (0 << SSC_RCMR_CKO_SHIFT) /* None */
-#  define SSC_RCMR_CKO_CONTINUOUS    (1 << SSC_RCMR_CKO_SHIFT) /* Continuous Receive Clock */
-#  define SSC_RCMR_CKO_XFERS         (2 << SSC_RCMR_CKO_SHIFT) /* Receive Clock only during data transfers */
-#define SSC_RCMR_CKI                 (1 << 5)  /* Bit 5:  Receive Clock Inversion */
-#define SSC_RCMR_CKG_SHIFT           (6)       /* Bits 6-7:  Receive Clock Gating Selection */
-#define SSC_RCMR_CKG_MASK            (3 << SSC_RCMR_CKG_SHIFT)
-#  define SSC_RCMR_CKG_NONE          (0 << SSC_RCMR_CKG_SHIFT) /* None, continuous clock */
-#  define SSC_RCMR_CKG_RFLOW         (1 << SSC_RCMR_CKG_SHIFT) /* Receive Clock enabled only if RF Low */
-#  define SSC_RCMR_CKG_RFHIGH        (2 << SSC_RCMR_CKG_SHIFT) /* Receive Clock enabled only if RF High */
-#define SSC_RCMR_START_SHIFT         (8)      /* Bits 8-11:  Receive Start Selection */
-#define SSC_RCMR_START_MASK          (15 << SSC_RCMR_START_SHIFT)
-#  define SSC_RCMR_START_CONTINOUS   (0 << SSC_RCMR_START_SHIFT) /* Continuous */
-#  define SSC_RCMR_START_START       (1 << SSC_RCMR_START_SHIFT) /* Transmit start */
-#  define SSC_RCMR_START_RFLOW       (2 << SSC_RCMR_START_SHIFT) /* Low level on RF signal */
-#  define SSC_RCMR_START_RFHIGH      (3 << SSC_RCMR_START_SHIFT) /* High level on RF signal */
-#  define SSC_RCMR_START_RFFALL      (4 << SSC_RCMR_START_SHIFT) /* Falling edge on RF signal */
-#  define SSC_RCMR_START_RFRISE      (5 << SSC_RCMR_START_SHIFT) /* Rising edge on RF signal */
-#  define SSC_RCMR_START_ANYLEVEL    (6 << SSC_RCMR_START_SHIFT) /* Any level change on RF signal */
-#  define SSC_RCMR_START_ANYEDGE     (7 << SSC_RCMR_START_SHIFT) /* Any edge on RF signal */
-#  define SSC_RCMR_START_CMP0        (8 << SSC_RCMR_START_SHIFT) /* Compare 0 */
-#define SSC_RCMR_STOP                (1 << 12) /* Bit 12: Receive Stop Select */
-#define SSC_RCMR_STTDLY_SHIFT        (15)      /* Bits 16-23:  Receive Start Delay */
-#define SSC_RCMR_STTDLY_MASK         (0xff << SSC_RCMR_STTDLY_SHIFT)
-#define SSC_RCMR_PERIOD_SHIFT        (24)      /* Bits 24-31:  Receive Period Divider Selection */
-#define SSC_RCMR_PERIOD_MASK         (0xff << SSC_RCMR_PERIOD_SHIFT)
-
-
-/* SSC Receive Frame Mode Register */
-
-#define SSC_RFMR_DATLEN_SHIFT        (0)       /* Bits 0-4:  Data Length */
-#define SSC_RFMR_DATLEN_MASK         (31 << SSC_RFMR_DATLEN_SHIFT)
-#define SSC_RFMR_LOOP                (1 << 5)  /* Bit 5:  Loop Mode */
-#define SSC_RFMR_MSBF                (1 << 7)  /* Bit 7:  Most Significant Bit First */
-#define SSC_RFMR_DATNB_SHIFT         (8)       /* Bits 8-11:  Data Number per Frame */
-#define SSC_RFMR_DATNB_MASK          (15 << SSC_RFMR_DATNB_SHIFT)
-#define SSC_RFMR_FSLEN_SHIFT         (16)      /* Bits 16-19:  Receive Frame Sync Length */
-#define SSC_RFMR_FSLEN_MASK          (15 << SSC_RFMR_FSLEN_SHIFT)
-#define SSC_RFMR_FSOS_SHIFT          (20)      /* Bits 20-22:  Receive Frame Sync Output Selection */
-#define SSC_RFMR_FSOS_MASK           (7 << SSC_RFMR_FSOS_SHIFT)
-#  define SSC_RFMR_FSOS_NONE         (0 << SSC_RFMR_FSOS_SHIFT) /* None */
-#  define SSC_RFMR_FSOS_NEG          (1 << SSC_RFMR_FSOS_SHIFT) /* 0x1 Negative Pulse */
-#  define SSC_RFMR_FSOS_POW          (2 << SSC_RFMR_FSOS_SHIFT) /* 0x2 Positive Pulse */
-#  define SSC_RFMR_FSOS_LOW          (3 << SSC_RFMR_FSOS_SHIFT) /* 0x3 Driven Low during data transfer */
-#  define SSC_RFMR_FSOS_HIGH         (4 << SSC_RFMR_FSOS_SHIFT) /* 0x4 Driven High during data transfer */
-#  define SSC_RFMR_FSOS_TOGGLE       (5 << SSC_RFMR_FSOS_SHIFT) /* 0x5 Toggling at each start of data transfer */
-#define SSC_RFMR_FSEDGE              (1 << 24) /* Bit 24: Frame Sync Edge Detect */
-#define SSC_RFMR_FSLENEXT_SHIFT      (28)      /* Bits 28-31:  FSLEN Field Extension */
-#define SSC_RFMR_FSLENEXT_MASK       (15 << SSC_RFMR_FSLENEXT_SHIFT)
-
-/* SSC Transmit Clock Mode Register */
-
-#define SSC_TCMR_CKS_SHIFT           (0)       /* Bits 0-1:  Transmit Clock Selection */
-#define SSC_TCMR_CKS_MASK            (3 << SSC_TCMR_CKS_SHIFT)
-#  define SSC_TCMR_CKS_DIVIDED       (0 << SSC_TCMR_CKS_SHIFT) /* Divided Clock */
-#  define SSC_TCMR_CKS_TK            (1 << SSC_TCMR_CKS_SHIFT) /* TK Clock signal */
-#  define SSC_TCMR_CKS_RK            (2 << SSC_TCMR_CKS_SHIFT) /* RK pin */
-#define SSC_TCMR_CKO_SHIFT           (2)       /* Bits 2-4:  Transmit Clock Output Mode Selection */
-#define SSC_TCMR_CKO_MASK            (7 << SSC_TCMR_CKO_SHIFT)
-#  define SSC_TCMR_CKO_ NONE         (0 << SSC_TCMR_CKO_SHIFT) /* None */
-#  define SSC_TCMR_CKO_CONTINUOUS    (1 << SSC_TCMR_CKO_SHIFT) /* Continuous Transmit Clock */
-#  define SSC_TCMR_CKO_XFERS         (2 << SSC_TCMR_CKO_SHIFT) /* Transmit Clock only during data transfers */
-#define SSC_TCMR_CKI                 (1 << 5)  /* Bit 5:  Transmit Clock Inversion */
-#define SSC_TCMR_CKG_SHIFT           (6)       /* Bits 6-7:  Transmit Clock Gating Selection */
-#define SSC_TCMR_CKG_MASK            (3 << SSC_TCMR_CKG_SHIFT)
-#  define SSC_TCMR_CKG_NONE          (0 << SSC_TCMR_CKG_SHIFT) /* None, continuous clock */
-#  define SSC_tCMR_CKG_TFLOW         (1 << SSC_TCMR_CKG_SHIFT) /* Receive Clock enabled only if TF Low */
-#  define SSC_TCMR_CKG_TFHIGH        (2 << SSC_TCMR_CKG_SHIFT) /* Receive Clock enabled only if TF High */
-#define SSC_TCMR_START_SHIFT         (8)      /* Bits 8-11:  Transmit Start Selection */
-#define SSC_TCMR_START_MASK          (15 << SSC_TCMR_START_SHIFT)
-#  define SSC_TCMR_START_CONTINOUS   (0 << SSC_TCMR_START_SHIFT) /* Continuous */
-#  define SSC_TCMR_START_START       (1 << SSC_TCMR_START_SHIFT) /* Receive start */
-#  define SSC_TCMR_START_TFLOW       (2 << SSC_TCMR_START_SHIFT) /* Low level on TF signal */
-#  define SSC_TCMR_START_TFHIGH      (3 << SSC_TCMR_START_SHIFT) /* High level on TF signal */
-#  define SSC_TCMR_START_TFFALL      (4 << SSC_TCMR_START_SHIFT) /* Falling edge on TF signal */
-#  define SSC_TCMR_START_TFRISE      (5 << SSC_TCMR_START_SHIFT) /* Rising edge on TF signal */
-#  define SSC_TCMR_START_ANYLEVEL    (6 << SSC_TCMR_START_SHIFT) /* Any level change on TF signal */
-#  define SSC_TCMR_START_ANYEDGE     (7 << SSC_TCMR_START_SHIFT) /* Any edge on TF signal */
-#define SSC_TCMR_STTDLY_SHIFT        (16)      /* Bits 16-23:  Transmit Start Delay */
-#define SSC_TCMR_STTDLY_MASK         (0xff << SSC_TCMR_STTDLY_SHIFT)
-#define SSC_TCMR_PERIOD_SHIFT        (24)      /* Bits 24-31:  Transmit Period Divider Selection */
-#define SSC_TCMR_PERIOD_MASK         (0xff << SSC_TCMR_PERIOD_SHIFT)
-
-/* SSC Transmit Frame Mode Register */
-
-#define SSC_TFMR_DATLEN_SHIFT        (0)       /* Bits 0-4:  Data Length */
-#define SSC_TFMR_DATLEN_MASK         (31 << SSC_TFMR_DATLEN_SHIFT)
-#define SSC_TFMR_DATDEF              (1 << 5)  /* Bit 5:  Data Default Value */
-#define SSC_TFMR_MSBF                (1 << 7)  /* Bit 7:  Most Significant Bit First */
-#define SSC_TFMR_DATNB_SHIFT         (8)       /* Bits 8-11:  Data Number per frame */
-#define SSC_TFMR_DATNB_MASK          (15 << SSC_TFMR_DATNB_SHIFT)
-#define SSC_TFMR_FSLEN_SHIFT         (16)      /* Bits 16-19:  Transmit Frame Syn Length */
-#define SSC_TFMR_FSLEN_MASK          (15 << SSC_TFMR_FSLEN_SHIFT)
-#define SSC_TFMR_FSOS_SHIFT          (20)      /* Bits 20-22:  Transmit Frame Sync Output Selection */
-#define SSC_TFMR_FSOS_MASK           (7 << SSC_TFMR_FSOS_SHIFT)
-#  define SSC_TFMR_FSOS_NONE         (0 << SSC_TFMR_FSOS_SHIFT) /* None */
-#  define SSC_TFMR_FSOS_NEG          (1 << SSC_TFMR_FSOS_SHIFT) /* 0x1 Negative Pulse */
-#  define SSC_TFMR_FSOS_POW          (2 << SSC_TFMR_FSOS_SHIFT) /* 0x2 Positive Pulse */
-#  define SSC_TFMR_FSOS_LOW          (3 << SSC_TFMR_FSOS_SHIFT) /* 0x3 Driven Low during data transfer */
-#  define SSC_TFMR_FSOS_HIGH         (4 << SSC_TFMR_FSOS_SHIFT) /* 0x4 Driven High during data transfer */
-#  define SSC_TFMR_FSOS_TOGGLE       (5 << SSC_TFMR_FSOS_SHIFT) /* 0x5 Toggling at each start of data transfer */
-#define SSC_TFMR_FSDEN               (1 << 23) /* Bit 23: Frame Sync Data Enable */
-#define SSC_TFMR_FSEDGE              (1 << 24) /* Bit 24: Frame Sync Edge Detection */
-#define SSC_TFMR_FSLENEXT_SHIFT      (28)      /* Bits 28-31:  FSLEN Field Extension */
-#define SSC_TFMR_FSLENEXT_MASK       (15 << SSC_TFMR_FSLENEXT_SHIFT)
-
-/* SSC Receive Synchronization Holding Register */
-
-#define SSC_RSHR_RSDAT_SHIFT         (0)       /* Bits 0-15:  Receive Synchronization Data */
-#define SSC_RSHR_RSDAT_MASK          (0xffff << SSC_RSHR_RSDAT_SHIFT)
-
-/* SSC Transmit Synchronization Holding Register */
-
-#define SSC_TSHR_TSDAT_SHIFT         (0)       /* Bits 0-15:  Transmit Synchronization Data */
-#define SSC_TSHR_TSDAT_MASK          (0xffff << SSC_TSHR_TSDAT_SHIFT)
-
-/* SSC Receive Compare 0 Register */
-
-#define SSC_RC0R_CP0_SHIFT           (0)        /* Bits 0-15:  Receive Compare Data 0 */
-#define SSC_RC0R_CP0_MASK            (0xffff << SSC_RC0R_CP0_SHIFT)
-
-/* SSC Receive Compare 1 Register */
-
-#define SSC_RC1R_CP1_SHIFT           (0)      /* Bits 0-15:  Receive Compare Data 1 */
-#define SSC_RC1R_CP1_MASK            (0xffff << SSC_RC1R_CP1_SHIFT)
-
-/* SSC Status Register, SSC Interrupt Enable Register, SSC Interrupt Disable
- * Register, and SSC Interrupt Mask Register commin bit-field definitions
- */
-
-#define SSC_INT_TXRDY                (1 << 0)  /* Bit 0:  Transmit Ready */
-#define SSC_INT_TXEMPTY              (1 << 1)  /* Bit 1:  Transmit Empty */
-#define SSC_INT_ENDTX                (1 << 2)  /* Bit 2:  End of Transmission */
-#define SSC_INT_TXBUFE               (1 << 3)  /* Bit 3:  Transmit Buffer Empty */
-#define SSC_INT_RXRDY                (1 << 4)  /* Bit 4:  Receive Ready */
-#define SSC_INT_OVRUN                (1 << 5)  /* Bit 5:  Receive Overrun */
-#define SSC_INT_ENDRX                (1 << 6)  /* Bit 6:  End of Reception */
-#define SSC_INT_RXBUFF               (1 << 7)  /* Bit 7:  Receive Buffer Full */
-#define SSC_INT_CP0                  (1 << 8)  /* Bit 8:  Compare 0 */
-#define SSC_INT_CP1                  (1 << 9)  /* Bit 9:  Compare 1 */
-#define SSC_INT_TXSYN                (1 << 10) /* Bit 10: Transmit Sync */
-#define SSC_INT_RXSYN                (1 << 11) /* Bit 11: Receive Sync */
-#define SSC_SR_TXEN                  (1 << 16) /* Bit 16: Transmit Enable (SR only) */
-#define SSC_SR_RXEN                  (1 << 17) /* Bit 17: Receive Enable (SR only) */
-
-/* SSC Write Protect Mode Register */
-
-#define SSC_WPMR_WPEN                (1 << 0)  /* Bit 0:  Write Protect Enable */
-#define SSC_WPMR_WPKEY_SHIFT         (8)       /* Bits 8-31:  Write Protect KEY */
-#define SSC_WPMR_WPKEY_MASK          (0x00ffffff << SSC_WPMR_WPKEY_SHIFT)
-
-/* SSC Write Protect Status Register */
-
-#define SSC_WPSR_WPVS                (1 << 0)  /* Bit 0:  Write Protect Violation Status */
-#define SSC_WPSR_WPVSRC_SHIFT        (8)       /* Bits 8-23:  Write Protect Violation Source */
-#define SSC_WPSR_WPVSRC_MASK         (0xffff << SSC_WPSR_WPVSRC_SHIFT)
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Functions
- ****************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_SSC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_tc.h b/nuttx/arch/arm/src/sam3u/sam3u_tc.h
deleted file mode 100644
index 0fb36da97..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_tc.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/************************************************************************************************
- * arch/arm/src/sam3u/sam3u_tc.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_TC_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_TC_H
-
-/************************************************************************************************
- * Included Files
- ************************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/************************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************************/
-
-/* TC register offsets **************************************************************************/
-
-/* Timer channel offsets (with respect to timer base offset 0f 0x00, 0x40, or 0x80 */
-
-#define SAM3U_TCN_OFFSET(n)            (0x00 + ((n)<<6)) /* 0x00, 0x40, 0x80 */
-#define SAM3U_TCN_CCR_OFFSET           0x00 /* Channel Control Register */
-#define SAM3U_TCN_CMR_OFFSET           0x04 /* Channel Mode Register */
-                                            /* 0x08 Reserved */
-                                            /* 0x0c Reserved */
-#define SAM3U_TCN_CV_OFFSET            0x10 /* Counter Value */
-#define SAM3U_TCN_RA_OFFSET            0x14 /* Register A */
-#define SAM3U_TCN_RB_OFFSET            0x18 /* Register B */
-#define SAM3U_TCN_RC_OFFSET            0x1c /* Register C */
-#define SAM3U_TCN_SR_OFFSET            0x20 /* Status Register */
-#define SAM3U_TCN_IER_OFFSET           0x24 /* Interrupt Enable Register */
-#define SAM3U_TCN_IDR_OFFSET           0x28 /* Interrupt Disable Register */
-#define SAM3U_TCN_IMR_OFFSET           0x2c /* Interrupt Mask Register */
-
-/* Timer common registers */
-
-#define SAM3U_TC_BCR_OFFSET            0xc0 /* Block Control Register */
-#define SAM3U_TC_BMR_OFFSET            0xc4 /* Block Mode Register */
-#define SAM3U_TC_QIER_OFFSET           0xc8 /* QDEC Interrupt Enable Register */
-#define SAM3U_TC_QIDR_OFFSET           0xcc /* QDEC Interrupt Disable Register */
-#define SAM3U_TC_QIMR_OFFSET           0xd0 /* QDEC Interrupt Mask Register */
-#define SAM3U_TC_QISR_OFFSET           0xd4 /* QDEC Interrupt Status Register */
-                                            /* 0xd8 Reserved */
-                                            /* 0xe4 Reserved */
-
-/* TC register adresses *************************************************************************/
-
-/* Timer channel offsets (with respect to timer base offset 0f 0x00, 0x40, or 0x80 */
-
-#define SAM3U_TC_CCR(n)                (SAM3U_TCN_BASE(n)+SAM3U_TCN_CCR_OFFSET)
-#define SAM3U_TC_CMR(n)                (SAM3U_TCN_BASE(n)+SAM3U_TCN_CMR_OFFSET)
-#define SAM3U_TC_CV(n)                 (SAM3U_TCN_BASE(n)+SAM3U_TCN_CV_OFFSET)
-#define SAM3U_TC_RA(n)                 (SAM3U_TCN_BASE(n)+SAM3U_TCN_RA_OFFSET)
-#define SAM3U_TC_RB(n)                 (SAM3U_TCN_BASE(n)+SAM3U_TCN_RB_OFFSET)
-#define SAM3U_TC_RC(n)                 (SAM3U_TCN_BASE(n)+SAM3U_TCN_RC_OFFSET)
-#define SAM3U_TC_SR(n)                 (SAM3U_TCN_BASE(n)+SAM3U_TCN_SR_OFFSET)
-#define SAM3U_TC_IER(n)                (SAM3U_TCN_BASE(n)+SAM3U_TCN_IER_OFFSET)
-#define SAM3U_TC_IDR(n)                (SAM3U_TCN_BASE(n)+SAM3U_TCN_IDR_OFFSET)
-#define SAM3U_TC_IMR(n)                (SAM3U_TCN_BASE(n)+SAM3U_TCN_IMR_OFFSET)
-
-#define SAM3U_TC0_CCR                  (SAM3U_TC0_BASE+SAM3U_TCN_CCR_OFFSET)
-#define SAM3U_TC0_CMR                  (SAM3U_TC0_BASE+SAM3U_TCN_CMR_OFFSET)
-#define SAM3U_TC0_CV                   (SAM3U_TC0_BASE+SAM3U_TCN_CV_OFFSET)
-#define SAM3U_TC0_RA                   (SAM3U_TC0_BASE+SAM3U_TCN_RA_OFFSET)
-#define SAM3U_TC0_RB                   (SAM3U_TC0_BASE+SAM3U_TCN_RB_OFFSET)
-#define SAM3U_TC0_RC                   (SAM3U_TC0_BASE+SAM3U_TCN_RC_OFFSET)
-#define SAM3U_TC0_SR                   (SAM3U_TC0_BASE+SAM3U_TCN_SR_OFFSET)
-#define SAM3U_TC0_IER                  (SAM3U_TC0_BASE+SAM3U_TCN_IER_OFFSET)
-#define SAM3U_TC0_IDR                  (SAM3U_TC0_BASE+SAM3U_TCN_IDR_OFFSET)
-#define SAM3U_TC0_IMR                  (SAM3U_TC0_BASE+SAM3U_TCN_IMR_OFFSET)
-
-#define SAM3U_TC1_CCR                  (SAM3U_TC1_BASE+SAM3U_TCN_CCR_OFFSET)
-#define SAM3U_TC1_CMR                  (SAM3U_TC1_BASE+SAM3U_TCN_CMR_OFFSET)
-#define SAM3U_TC1_CV                   (SAM3U_TC1_BASE+SAM3U_TCN_CV_OFFSET)
-#define SAM3U_TC1_RA                   (SAM3U_TC1_BASE+SAM3U_TCN_RA_OFFSET)
-#define SAM3U_TC1_RB                   (SAM3U_TC1_BASE+SAM3U_TCN_RB_OFFSET)
-#define SAM3U_TC1_RC                   (SAM3U_TC1_BASE+SAM3U_TCN_RC_OFFSET)
-#define SAM3U_TC1_SR                   (SAM3U_TC1_BASE+SAM3U_TCN_SR_OFFSET)
-#define SAM3U_TC1_IER                  (SAM3U_TC1_BASE+SAM3U_TCN_IER_OFFSET)
-#define SAM3U_TC1_IDR                  (SAM3U_TC1_BASE+SAM3U_TCN_IDR_OFFSET)
-#define SAM3U_TC1_IMR                  (SAM3U_TC1_BASE+SAM3U_TCN_IMR_OFFSET)
-
-#define SAM3U_TC2_CCR                  (SAM3U_TC2_BASE+SAM3U_TCN_CCR_OFFSET)
-#define SAM3U_TC2_CMR                  (SAM3U_TC2_BASE+SAM3U_TCN_CMR_OFFSET)
-#define SAM3U_TC2_CV                   (SAM3U_TC2_BASE+SAM3U_TCN_CV_OFFSET)
-#define SAM3U_TC2_RA                   (SAM3U_TC2_BASE+SAM3U_TCN_RA_OFFSET)
-#define SAM3U_TC2_RB                   (SAM3U_TC2_BASE+SAM3U_TCN_RB_OFFSET)
-#define SAM3U_TC2_RC                   (SAM3U_TC2_BASE+SAM3U_TCN_RC_OFFSET)
-#define SAM3U_TC2_SR                   (SAM3U_TC2_BASE+SAM3U_TCN_SR_OFFSET)
-#define SAM3U_TC2_IER                  (SAM3U_TC2_BASE+SAM3U_TCN_IER_OFFSET)
-#define SAM3U_TC2_IDR                  (SAM3U_TC2_BASE+SAM3U_TCN_IDR_OFFSET)
-#define SAM3U_TC2_IMR                  (SAM3U_TC2_BASE+SAM3U_TCN_IMR_OFFSET)
-
-/* Timer common registers */
-
-#define SAM3U_TC_BCR                   (SAM3U_TC_BASE+SAM3U_TC_BCR_OFFSET)
-#define SAM3U_TC_BMR                   (SAM3U_TC_BASE+SAM3U_TC_BMR_OFFSET)
-#define SAM3U_TC_QIER                  (SAM3U_TC_BASE+SAM3U_TC_QIER_OFFSET)
-#define SAM3U_TC_QIDR                  (SAM3U_TC_BASE+SAM3U_TC_QIDR_OFFSET)
-#define SAM3U_TC_QIMR                  (SAM3U_TC_BASE+SAM3U_TC_QIMR_OFFSET)
-#define SAM3U_TC_QISR                  (SAM3U_TC_BASE+SAM3U_TC_QISR_OFFSET)
-
-/* TC register bit definitions ******************************************************************/
-
-/* Timer common registers */
-/* TC Block Control Register */
-
-#define TC_BCR_SYNC                    (1 << 0)  /* Bit 0: Synchro Command
-
-/* TC Block Mode Register */
-
-#define TC_BMR_TC0XC0S_SHIFT           (0)       /* Bits 0-1: External Clock Signal 0 Selection */
-#define TC_BMR_TC0XC0S_MASK            (3 << TC_BMR_TC0XC0S_SHIFT)
-#  define TC_BMR_TC0XC0S_TCLK0         (0 << TC_BMR_TC0XC0S_SHIFT)
-#  define TC_BMR_TC0XC0S_NONE          (1 << TC_BMR_TC0XC0S_SHIFT)
-#  define TC_BMR_TC0XC0S_TIOA1         (2 << TC_BMR_TC0XC0S_SHIFT)
-#  define TC_BMR_TC0XC0S_TIOA2         (3 << TC_BMR_TC0XC0S_SHIFT)
-#define TC_BMR_TC1XC1S_SHIFT           (2)       /* Bits 2-3: External Clock Signal 1 Selection */
-#define TC_BMR_TC1XC1S_MASK            (3 << TC_BMR_TC1XC1S_MASK)
-#  define TC_BMR_TC1XC1S_TCLK1         (0 << TC_BMR_TC1XC1S_SHIFT)
-#  define TC_BMR_TC1XC1S_NONE          (1 << TC_BMR_TC1XC1S_SHIFT)
-#  define TC_BMR_TC1XC1S_TIOA0         (2 << TC_BMR_TC1XC1S_SHIFT)
-#  define TC_BMR_TC1XC1S_TIOA2         (3 << TC_BMR_TC1XC1S_SHIFT)
-#define TC_BMR_TC2XC2S_SHIFT           (4)       /* Bits 4-5: External Clock Signal 2 Selection */
-#define TC_BMR_TC2XC2S_MASK            (3 << TC_BMR_TC2XC2S_SHIFT)
-#  define TC_BMR_TC2XC2S_TCLK2         (0 << TC_BMR_TC2XC2S_SHIFT)
-#  define TC_BMR_TC2XC2S_NONE          (1 << TC_BMR_TC2XC2S_SHIFT)
-#  define TC_BMR_TC2XC2S_TIOA0         (2 << TC_BMR_TC2XC2S_SHIFT)
-#  define TC_BMR_TC2XC2S_TIOA1         (3 << TC_BMR_TC2XC2S_SHIFT)
-#define TC_BMR_QDEN                    (1 << 8)  /* Bit 8:  Quadrature Decoder Enabled */
-#define TC_BMR_POSEN                   (1 << 9)  /* Bit 9:  Position Enabled */
-#define TC_BMR_SPEEDEN                 (1 << 10) /* Bit 10: Speed Enabled */
-#define TC_BMR_QDTRANS                 (1 << 11) /* Bit 11: Quadrature Decoding Transparent */
-#define TC_BMR_EDGPHA                  (1 << 12) /* Bit 12: Edge on PHA count mode */
-#define TC_BMR_INVA                    (1 << 13) /* Bit 13: Inverted PHA */
-#define TC_BMR_INVB                    (1 << 14) /* Bit 14: Inverted PHB */
-#define TC_BMR_SWAP                    (1 << 15) /* Bit 15: Swap PHA and PHB */
-#define TC_BMR_INVIDX                  (1 << 16) /* Bit 16: Inverted Index */
-#define TC_BMR_IDXPHB                  (1 << 17) /* Bit 17: Index pin is PHB pin */
-#define TC_BMR_FILTER                  (1 << 19) /* Bit 19 */
-#define TC_BMR_MAXFILT_SHIFT           (20)      /* Bits 20-25: Maximum Filter */
-#define TC_BMR_MAXFILT_MASK            (63 << TC_BMR_MAXFILT_SHIFT)
-
-/* TC QDEC Interrupt Enable Register, TC QDEC Interrupt Disable Register,
- * TC QDEC Interrupt Mask Register, TC QDEC Interrupt Status Register common
- * bit field definitions
- */
- 
-#define TC_QINT_IDX                    (1 << 0)  /* Bit 0: Index (Common) */
-#define TC_QINT_DIRCHG                 (1 << 1)  /* Bit 1: Direction Change (Common) */
-#define TC_QINT_QERR                   (1 << 2)  /* Bit 2: Quadrature Error (Common) */
-#define TC_QISR_DIR                    (1 << 8)  /* Bit 8: Direction (QISR only) */
-
-/* Timer Channel Registers */
-/* TC Channel Control Register */
-
-#define TCN_CCR_CLKEN                  (1 << 0)  /* Bit 0: Counter Clock Enable Command */
-#define TCN_CCR_CLKDIS                 (1 << 1)  /* Bit 1: Counter Clock Disable Command */
-#define TCN_CCR_SWTRG                  (1 << 2)  /* Bit 2: Software Trigger Command */
-
-/* TC Channel Mode Register */
-
-#define TCN_CMR_TCCLKS_SHIFT           (0)       /* Bits 0-2: Clock Selection (Common) */
-#define TCN_CMR_TCCLKS_MASK            (7 << TCN_CMR_TCCLKS_SHIFT)
-#  define TCN_CMR_TCCLKS_TIMERCLOCK1   (0 << TCN_CMR_TCCLKS_SHIFT)
-#  define TCN_CMR_TCCLKS_TIMERCLOCK2   (1 << TCN_CMR_TCCLKS_SHIFT)
-#  define TCN_CMR_TCCLKS_TIMERCLOCK3   (2 << TCN_CMR_TCCLKS_SHIFT)
-#  define TCN_CMR_TCCLKS_TIMERCLOCK4   (3 << TCN_CMR_TCCLKS_SHIFT)
-#  define TCN_CMR_TCCLKS_TIMERCLOCK5   (4 << TCN_CMR_TCCLKS_SHIFT)
-#  define TCN_CMR_TCCLKS_XC0           (5 << TCN_CMR_TCCLKS_SHIFT)
-#  define TCN_CMR_TCCLKS_XC1           (6 << TCN_CMR_TCCLKS_SHIFT)
-#  define TCN_CMR_TCCLKS_XC2           (7 << TCN_CMR_TCCLKS_SHIFT)
-#define TCN_CMR_CLKI                   (1 << 3)  /* Bit 3: Clock Invert (Common) */
-#define TCN_CMR_BURST_SHIFT            (4)       /* Bits 4-5: Burst Signal Selection (Common) */
-#define TCN_CMR_BURST_MASK             (3 << TCN_CMR_BURST_MASK)
-#define TCN_CMR_BURST_MASK             (3 << TCN_CMR_BURST_MASK)
-#  define TCN_CMR_BURST_NOTGATED       (0 << TCN_CMR_BURST_MASK) /* Nott gated by external signal */
-#  define TCN_CMR_BURST_XC0            (1 << TCN_CMR_BURST_MASK) /* XC0 ANDed with selected clock */
-#  define TCN_CMR_BURST_XC1            (2 << TCN_CMR_BURST_MASK) /* XC1 ANDed with selected clock */
-#  define TCN_CMR_BURST_XC2            (3 << TCN_CMR_BURST_MASK) /* XC2 ANDed with selected clock */
-#define TCN_CMR_WAVE                   (1 << 15) /* Bit 15: (Common) */
-
-#define TCN_CMR_LDBSTOP                (1 << 6)  /* Bit 6: Counter stopped with RB Loading (Capture mode) */
-#define TCN_CMR_LDBDIS                 (1 << 7)  /* Bit 7: Counter disable with RB Loading (Capture mode) */
-#define TCN_CMR_ETRGEDG_SHIFT          (8)       /* Bits 8-9: External Trigger Edge Selection (Capture mode) */
-#define TCN_CMR_ETRGEDG_MASK           (3 << TCN_CMR_ETRGEDG_SHIFT)
-#  define TCN_CMR_ETRGEDG_NONE         (0 << TCN_CMR_ETRGEDG_SHIFT) /* None */
-#  define TCN_CMR_ETRGEDG_REDGE        (1 << TCN_CMR_ETRGEDG_SHIFT) /* Rising edge */
-#  define TCN_CMR_ETRGEDG_FEDGE        (2 << TCN_CMR_ETRGEDG_SHIFT) /* Falling edge */
-#  define TCN_CMR_ETRGEDG_EACH         (3 << TCN_CMR_ETRGEDG_SHIFT) /* Each */
-#define TCN_CMR_ABETRG                 (1 << 10) /* Bit 10: TIOA or TIOB External Trigger Selection (Capture mode) */
-#define TCN_CMR_CPCTRG                 (1 << 14) /* Bit 14: RC Compare Trigger Enable (Capture mode) */
-#define TCN_CMR_LDRA_SHIFT             (16)      /* Bits 16-17: RA Loading Selection (Capture mode) */
-#define TCN_CMR_LDRA_MASK              (3 << TCN_CMR_LDRA_SHIFT)
-#  define TCN_CMR_LDRA_NONE            (0 << TCN_CMR_LDRA_SHIFT) /* None */
-#  define TCN_CMR_LDRA_REDGE           (1 << TCN_CMR_LDRA_SHIFT) /* Rising edge of TIOA */
-#  define TCN_CMR_LDRA_FEDGE           (2 << TCN_CMR_LDRA_SHIFT) /* Falling edge of TIOA */
-#  define TCN_CMR_LDRA_EACH            (3 << TCN_CMR_LDRA_SHIFT) /* Each  edge of TIOA */
-#define TCN_CMR_LDRB_SHIFT             (18)      /* Bits 18-19: RB Loading Selection (Capture mode) */
-#define TCN_CMR_LDRB_MASK              (3 << TCN_CMR_LDRB_SHIFT)
-#  define TCN_CMR_LDRB_NONE            (0 << TCN_CMR_LDRB_SHIFT) /* None */
-#  define TCN_CMR_LDRB_REDGE           (1 << TCN_CMR_LDRB_SHIFT) /* Rising edge of TIOB */
-#  define TCN_CMR_LDRB_FEDGE           (2 << TCN_CMR_LDRB_SHIFT) /* Falling edge of TIOB */
-#  define TCN_CMR_LDRB_EACH            (3 << TCN_CMR_LDRB_SHIFT) /* Each  edge of TIOB */
-
-#define TCN_CMR_CPCSTOP                (1 << 6)  /* Bit 6: Counter Clock Stopped with RC Compare (Waveform mode) */
-#define TCN_CMR_CPCDIS                 (1 << 7)  /* Bit 7: Counter Clock Disable with RC Compare (Waveform mode) */
-#define TCN_CMR_EEVTEDG_SHIFT          (8)       /* Bits 8-9: External Event Edge Selection (Waveform mode) */
-#define TCN_CMR_EEVTEDG_MASK           (3 << TCN_CMR_EEVTEDG_SHIFT)
-#  define TCN_CMR_EEVTEDG_NONE         (0 << TCN_CMR_EEVTEDG_SHIFT) /* None */
-#  define TCN_CMR_EEVTEDG_REDGE        (1 << TCN_CMR_EEVTEDG_SHIFT) /* Rising edge */
-#  define TCN_CMR_EEVTEDG_FEDGE        (2 << TCN_CMR_EEVTEDG_SHIFT) /* Falling edge */
-#  define TCN_CMR_EEVTEDG_EACH         (3 << TCN_CMR_EEVTEDG_SHIFT) /* Each edge */
-#define TCN_CMR_EEVT_SHIFT             (10)      /* Bits 10-11: External Event Selection (Waveform mode) */
-#define TCN_CMR_EEVT_MASK              (3 << TCN_CMR_EEVT_SHIFT)
-#  define TCN_CMR_EEVT_TIOB            (0 << TCN_CMR_EEVT_SHIFT) /* TIOB input */
-#  define TCN_CMR_EEVT_XC0             (1 << TCN_CMR_EEVT_SHIFT) /* XC0 output */
-#  define TCN_CMR_EEVT_XC1             (2 << TCN_CMR_EEVT_SHIFT) /* XC1 output */
-#  define TCN_CMR_EEVT_XC2             (3 << TCN_CMR_EEVT_SHIFT) /* XC2 output */
-#define TCN_CMR_ENETRG                 (1 << 12) /* Bit 12: External Event Trigger Enable (Waveform mode) */
-#define TCN_CMR_WAVSEL_SHIFT           (13)      /* Bits 13-14: Waveform Selection (Waveform mode) */
-#define TCN_CMR_WAVSEL_MASK            (3 << TCN_CMR_WAVSEL_SHIFT)
-#  define TCN_CMR_WAVSEL_UP            (0 << TCN_CMR_WAVSEL_SHIFT) /* UP mode w/o auto trigger (Waveform mode) */
-#  define TCN_CMR_WAVSEL_UPAUTO        (1 << TCN_CMR_WAVSEL_SHIFT) /* UP mode with auto trigger (Waveform mode) */
-#  define TCN_CMR_WAVSEL_UPDWN         (2 << TCN_CMR_WAVSEL_SHIFT) /* UPDOWN mode w/o  auto trigger (Waveform mode) */
-#  define TCN_CMR_WAVSEL_UPDWNAUTO     (3 << TCN_CMR_WAVSEL_SHIFT) /* UPDOWN mode with auto trigger (Waveform mode) */
-#define TCN_CMR_ACPA_SHIFT             (16)      /* Bits 16-17: RA Compare Effect on TIOA (Waveform mode) */
-#define TCN_CMR_ACPA_MASK              (3 << TCN_CMR_ACPA_SHIFT)
-#  define TCN_CMR_ACPA_NONE            (0 << TCN_CMR_ACPA_SHIFT)
-#  define TCN_CMR_ACPA_SET             (1 << TCN_CMR_ACPA_SHIFT)
-#  define TCN_CMR_ACPA_CLEAR           (2 << TCN_CMR_ACPA_SHIFT)
-#  define TCN_CMR_ACPA_TOGGLE          (3 << TCN_CMR_ACPA_SHIFT)
-#define TCN_CMR_ACPC_SHIFT             (18)      /* Bits 18-19: RC Compare Effect on TIOA (Waveform mode) */
-#define TCN_CMR_ACPC_MASK              (3 << TCN_CMR_ACPC_SHIFT)
-#  define TCN_CMR_ACPC_NONE            (0 << TCN_CMR_ACPC_SHIFT)
-#  define TCN_CMR_ACPC_SET             (1 << TCN_CMR_ACPC_SHIFT)
-#  define TCN_CMR_ACPC_CLEAR           (2 << TCN_CMR_ACPC_SHIFT)
-#  define TCN_CMR_ACPC_TOGGLE          (3 << TCN_CMR_ACPC_SHIFT)
-#define TCN_CMR_AEEVT_SHIFT            (20)      /* Bits 20-21: External Event Effect on TIOA (Waveform mode) */
-#define TCN_CMR_AEEVT_MASK             (3 << TCN_CMR_AEEVT_SHIFT)
-#  define TCN_CMR_AEEVT_NONE           (0 << TCN_CMR_AEEVT_SHIFT)
-#  define TCN_CMR_AEEVT_SET            (1 << TCN_CMR_AEEVT_SHIFT)
-#  define TCN_CMR_AEEVT_CLEAR          (2 << TCN_CMR_AEEVT_SHIFT)
-#  define TCN_CMR_AEEVT_TOGGLE         (3 << TCN_CMR_AEEVT_SHIFT)
-#define TCN_CMR_ASWTRG_SHIFT           (22)      /* Bits 22-23: Software Trigger Effect on TIOA (Waveform mode) */
-#define TCN_CMR_ASWTRG_MASK            (3 << TCN_CMR_ASWTRG_SHIFT)
-#  define TCN_CMR_ASWTRG_NONE          (0 << TCN_CMR_ASWTRG_SHIFT)
-#  define TCN_CMR_ASWTRG_SET           (1 << TCN_CMR_ASWTRG_SHIFT)
-#  define TCN_CMR_ASWTRG_CLEAR         (2 << TCN_CMR_ASWTRG_SHIFT)
-#  define TCN_CMR_ASWTRG_TOGGLE        (3 << TCN_CMR_ASWTRG_SHIFT)
-#define TCN_CMR_BCPB_SHIFT             (24)      /* Bits 24-25: RB Compare Effect on TIOB (Waveform mode) */
-#define TCN_CMR_BCPB_MASK              (3 << TCN_CMR_BCPB_SHIFT)
-#  define TCN_CMR_BCPB_NONE            (0 << TCN_CMR_BCPB_SHIFT)
-#  define TCN_CMR_BCPB_SET             (1 << TCN_CMR_BCPB_SHIFT)
-#  define TCN_CMR_BCPB_CLEAR           (2 << TCN_CMR_BCPB_SHIFT)
-#  define TCN_CMR_BCPB_TOGGLE          (3 << TCN_CMR_BCPB_SHIFT)
-#define TCN_CMR_BCPC_SHIFT             (26)      /* Bits 26-27: RC Compare Effect on TIOB (Waveform mode) */
-#define TCN_CMR_BCPC_MASK              (3 << TCN_CMR_BCPC_SHIFT)
-#  define TCN_CMR_BCPC_NONE            (0 << TCN_CMR_BCPC_SHIFT)
-#  define TCN_CMR_BCPC_SET             (1 << TCN_CMR_BCPC_SHIFT)
-#  define TCN_CMR_BCPC_CLEAR           (2 << TCN_CMR_BCPC_SHIFT)
-#  define TCN_CMR_BCPC_TOGGLE          (3 << TCN_CMR_BCPC_SHIFT)
-#define TCN_CMR_BEEVT_SHIFT            (28)      /* Bits 28-29: External Event Effect on TIOB (Waveform mode) */
-#define TCN_CMR_BEEVT_MASK             (3 << TCN_CMR_BEEVT_SHIFT)
-#  define TCN_CMR_BEEVT_NONE           (0 << TCN_CMR_BEEVT_SHIFT)
-#  define TCN_CMR_BEEVT_SET            (1 << TCN_CMR_BEEVT_SHIFT)
-#  define TCN_CMR_BEEVT_CLEAR          (2 << TCN_CMR_BEEVT_SHIFT)
-#  define TCN_CMR_BEEVT_TOGGLE         (3 << TCN_CMR_BEEVT_SHIFT)
-#define TCN_CMR_BSWTRG_SHIFT           (30)      /* Bits 30-31: Software Trigger Effect on TIOB (Waveform mode) */
-#define TCN_CMR_BSWTRG_MASK            (3 << TCN_CMR_BSWTRG_SHIFT)
-#  define TCN_CMR_BSWTRG_NONE          (0 << TCN_CMR_BSWTRG_SHIFT)
-#  define TCN_CMR_BSWTRG_SET           (1 << TCN_CMR_BSWTRG_SHIFT)
-#  define TCN_CMR_BSWTRG_CLEAR         (2 << TCN_CMR_BSWTRG_SHIFT)
-#  define TCN_CMR_BSWTRG_TOGGLE        (3 << TCN_CMR_BSWTRG_SHIFT)
-
-/* TC Counter Value Register */
-
-#define TCN_CV_SHIFT                   (0)       /* Bits 0-15: Counter Value */
-#define TCN_CV_MASK                    (0xffff << TCN_CV_SHIFT)
-
-/* TC Register A, B, C */
-
-#define TCN_RVALUE_SHIFT               (0)       /* Bits 0-15: Register A, B, or C value */
-#define TCN_RVALUE_MASK                (0xffff << TCN_RVALUE_SHIFT)
-
-/* TC Status Register, TC Interrupt Enable Register, TC Interrupt Disable Register, and  TC Interrupt Mask Register common bit-field definitions */
-
-#define TCN_INT_COVFS                  (1 << 0)  /* Bit 0:  Counter Overflow */
-#define TCN_INT_LOVRS                  (1 << 1)  /* Bit 1:  Load Overrun */
-#define TCN_INT_CPAS                   (1 << 2)  /* Bit 2:  RA Compare */
-#define TCN_INT_CPBS                   (1 << 3)  /* Bit 3:  RB Compare */
-#define TCN_INT_CPCS                   (1 << 4)  /* Bit 4:  RC Compare */
-#define TCN_INT_LDRAS                  (1 << 5)  /* Bit 5:  RA Loading */
-#define TCN_INT_LDRBS                  (1 << 6)  /* Bit 6:  RB Loading */
-#define TCN_INT_ETRGS                  (1 << 7)  /* Bit 7:  External Trigger */
-#define TCN_INT_CLKSTA                 (1 << 16) /* Bit 16: Clock Enabling (SR only) */
-#define TCN_SR_MTIOA                   (1 << 17) /* Bit 17: TIOA Mirror (SR only) */
-#define TCN_SR_MTIOB                   (1 << 18) /* Bit 18: TIOB Mirror (SR only)*/
-
-/************************************************************************************************
- * Public Types
- ************************************************************************************************/
-
-/************************************************************************************************
- * Public Data
- ************************************************************************************************/
-
-/************************************************************************************************
- * Public Functions
- ************************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_TC_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_twi.h b/nuttx/arch/arm/src/sam3u/sam3u_twi.h
deleted file mode 100644
index 66d1f23b3..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_twi.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/****************************************************************************************
- * arch/arm/src/sam3u/sam3u_twi.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_TWI_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_TWI_H
-
-/****************************************************************************************
- * Included Files
- ****************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/****************************************************************************************
- * Pre-processor Definitions
- ****************************************************************************************/
-
-/* TWI register offsets *****************************************************************/
-
-#define SAM3U_TWI_CR_OFFSET          0x00 /* Control Register */
-#define SAM3U_TWI_MMR_OFFSET         0x04 /* Master Mode Register */
-#define SAM3U_TWI_SMR_OFFSET         0x08 /* Slave Mode Register */
-#define SAM3U_TWI_IADR_OFFSET        0x0c /* Internal Address Register */
-#define SAM3U_TWI_CWGR_OFFSET        0x10 /* Clock Waveform Generator Register */
-#define SAM3U_TWI_SR_OFFSET          0x20 /* Status Register */
-#define SAM3U_TWI_IER_OFFSET         0x24 /* Interrupt Enable Register */
-#define SAM3U_TWI_IDR_OFFSET         0x28 /* Interrupt Disable Register */
-#define SAM3U_TWI_IMR_OFFSET         0x2c /* Interrupt Mask Register */
-#define SAM3U_TWI_RHR_OFFSET         0x30 /* Receive Holding Register */
-#define SAM3U_TWI_THR_OFFSET         0x34 /* Transmit Holding Register */
-                                          /* 0x38-0xfc: Reserved */
-                                          /* 0x100-0x124: Reserved for the PDC */
-
-/* TWI register adresses ****************************************************************/
-
-#define SAM3U_TWI_CR(n)              (SAM3U_TWIN_BASE(n)+SAM3U_TWI_CR_OFFSET)
-#define SAM3U_TWI_MMR(n)             (SAM3U_TWIN_BASE(n)+SAM3U_TWI_MMR_OFFSET)
-#define SAM3U_TWI_SMR(n)             (SAM3U_TWIN_BASE(n)+SAM3U_TWI_SMR_OFFSET)
-#define SAM3U_TWI_IADR(n)            (SAM3U_TWIN_BASE(n)+SAM3U_TWI_IADR_OFFSET)
-#define SAM3U_TWI_CWGR(n)            (SAM3U_TWIN_BASE(n)+SAM3U_TWI_CWGR_OFFSET)
-#define SAM3U_TWI_SR(n)              (SAM3U_TWIN_BASE(n)+SAM3U_TWI_SR_OFFSET)
-#define SAM3U_TWI_IER(n)             (SAM3U_TWIN_BASE(n)+SAM3U_TWI_IER_OFFSET)
-#define SAM3U_TWI_IDR(n)             (SAM3U_TWIN_BASE(n)+SAM3U_TWI_IDR_OFFSET)
-#define SAM3U_TWI_IMR(n)             (SAM3U_TWIN_BASE(n)+SAM3U_TWI_IMR_OFFSET)
-#define SAM3U_TWI_RHR(n)             (SAM3U_TWIN_BASE(n)+SAM3U_TWI_RHR_OFFSET)
-#define SAM3U_TWI_THR(n)             (SAM3U_TWIN_BASE(n)+SAM3U_TWI_THR_OFFSET)
-
-#define SAM3U_TWI0_CR                (SAM3U_TWI0_BASE+SAM3U_TWI_CR_OFFSET)
-#define SAM3U_TWI0_MMR               (SAM3U_TWI0_BASE+SAM3U_TWI_MMR_OFFSET)
-#define SAM3U_TWI0_SMR               (SAM3U_TWI0_BASE+SAM3U_TWI_SMR_OFFSET)
-#define SAM3U_TWI0_IADR              (SAM3U_TWI0_BASE+SAM3U_TWI_IADR_OFFSET)
-#define SAM3U_TWI0_CWGR              (SAM3U_TWI0_BASE+SAM3U_TWI_CWGR_OFFSET)
-#define SAM3U_TWI0_SR                (SAM3U_TWI0_BASE+SAM3U_TWI_SR_OFFSET)
-#define SAM3U_TWI0_IER               (SAM3U_TWI0_BASE+SAM3U_TWI_IER_OFFSET)
-#define SAM3U_TWI0_IDR               (SAM3U_TWI0_BASE+SAM3U_TWI_IDR_OFFSET)
-#define SAM3U_TWI0_IMR               (SAM3U_TWI0_BASE+SAM3U_TWI_IMR_OFFSET)
-#define SAM3U_TWI0_RHR               (SAM3U_TWI0_BASE+SAM3U_TWI_RHR_OFFSET)
-#define SAM3U_TWI0_THR               (SAM3U_TWI0_BASE+SAM3U_TWI_THR_OFFSET)
-
-#define SAM3U_TWI1_CR                (SAM3U_TWI1_BASE+SAM3U_TWI_CR_OFFSET)
-#define SAM3U_TWI1_MMR               (SAM3U_TWI1_BASE+SAM3U_TWI_MMR_OFFSET)
-#define SAM3U_TWI1_SMR               (SAM3U_TWI1_BASE+SAM3U_TWI_SMR_OFFSET)
-#define SAM3U_TWI1_IADR              (SAM3U_TWI1_BASE+SAM3U_TWI_IADR_OFFSET)
-#define SAM3U_TWI1_CWGR              (SAM3U_TWI1_BASE+SAM3U_TWI_CWGR_OFFSET)
-#define SAM3U_TWI1_SR                (SAM3U_TWI1_BASE+SAM3U_TWI_SR_OFFSET)
-#define SAM3U_TWI1_IER               (SAM3U_TWI1_BASE+SAM3U_TWI_IER_OFFSET)
-#define SAM3U_TWI1_IDR               (SAM3U_TWI1_BASE+SAM3U_TWI_IDR_OFFSET)
-#define SAM3U_TWI1_IMR               (SAM3U_TWI1_BASE+SAM3U_TWI_IMR_OFFSET)
-#define SAM3U_TWI1_RHR               (SAM3U_TWI1_BASE+SAM3U_TWI_RHR_OFFSET)
-#define SAM3U_TWI1_THR               (SAM3U_TWI1_BASE+SAM3U_TWI_THR_OFFSET)
-
-/* TWI register bit definitions *********************************************************/
-
-/* TWI Control Register */
-
-#define TWI_CR_START                 (1 << 0)  /* Bit 0:  Send a START Condition */
-#define TWI_CR_STOP                  (1 << 1)  /* Bit 1:  Send a STOP Condition */
-#define TWI_CR_MSEN                  (1 << 2)  /* Bit 2:  TWI Master Mode Enabled */
-#define TWI_CR_MSDIS                 (1 << 3)  /* Bit 3:  TWI Master Mode Disabled */
-#define TWI_CR_SVEN                  (1 << 4)  /* Bit 4:  TWI Slave Mode Enabled */
-#define TWI_CR_SVDIS                 (1 << 5)  /* Bit 5:  TWI Slave Mode Disabled */
-#define TWI_CR_QUICK                 (1 << 6)  /* Bit 6:  SMBUS Quick Command */
-#define TWI_CR_SWRST                 (1 << 7)  /* Bit 7:  Software Reset */
-
-/* TWI Master Mode Register */'
-
-#define TWI_MMR_IADRSZ_SHIFT         (8)      /* Bits 8-9:  Internal Device Address Size */
-#define TWI_MMR_IADRSZ_MASK          (3 << TWI_MMR_IADRSZ_SHIFT)
-#  define TWI_MMR_IADRSZ_NONE        (0 << TWI_MMR_IADRSZ_SHIFT) /* No internal device address */
-#  define TWI_MMR_IADRSZ_1BYTE       (1 << TWI_MMR_IADRSZ_SHIFT) /* One-byte internal device address */
-#  define TWI_MMR_IADRSZ_3BYTE       (2 << TWI_MMR_IADRSZ_SHIFT) /* Two-byte internal device address */
-#  define TWI_MMR_IADRSZ_3BYTE       (3 << TWI_MMR_IADRSZ_SHIFT) /* Three-byte internal device address */
-#define TWI_MMR_MREAD                (1 << 12) /* Bit 12: Master Read Direction */
-#define TWI_MMR_DADR_SHIFT           (16)      /* Bits 16-23:  Device Address */
-#define TWI_MMR_DADR_MASK            (0xff << TWI_MMR_DADR_SHIFT)
-
-/* TWI Slave Mode Register */
-
-#define TWI_SMR_SADR_SHIFT           (16)      /* Bits 16-23:  Slave Address */
-#define TWI_SMR_SADR_MASK            (0xff << TWI_SMR_SADR_SHIFT)
-
-/* TWI Internal Address Register */
-
-#define TWI_IADR_SHIFT               (0)      /* Bits 0-23:  Internal Address */
-#define TWI_IADR_MASK                (0x00ffffff << TWI_IADR_SHIFT)
-
-/* TWI Clock Waveform Generator Register */
-
-#define TWI_CWGR_CLDIV_SHIFT         (0)       /* Bits 0-7:  Clock Low Divider */
-#define TWI_CWGR_CLDIV_MASK          (0xff << TWI_CWGR_CLDIV_SHIFT)
-#define TWI_CWGR_CHDIV_SHIFT         (8)       /* Bits 8-15:  Clock High Divider */
-#define TWI_CWGR_CHDIV_MASK          (0xff << TWI_CWGR_CLDIV_SHIFT)
-#define TWI_CWGR_CKDIV_SHIFT         (16)      /* Bits 16-18:  Clock Divider */
-#define TWI_CWGR_CKDIV_MASK          (7 << TWI_CWGR_CLDIV_SHIFT)
-
-/* TWI Status Register, TWI Interrupt Enable Register, TWI Interrupt Disable
- * Register, and TWI Interrupt Mask Register common bit fields.
- */
-
-#define TWI_INT_TXCOMP               (1 << 0)  /* Bit 0:  Transmission Completed */
-#define TWI_INT_RXRDY                (1 << 1)  /* Bit 1:  Receive Holding Register */
-#define TWI_INT_TXRDY                (1 << 2)  /* Bit 2:  Transmit Holding Register Ready */
-#define TWI_SR_SVREAD                (1 << 3)  /* Bit 3:  Slave Read (SR only) */
-#define TWI_INT_SVACC                (1 << 4)  /* Bit 4:  Slave Access */
-#define TWI_INT_GACC                 (1 << 5)  /* Bit 5:  General Call Access */
-#define TWI_INT_OVRE                 (1 << 6)  /* Bit 6:  Overrun Error */
-#define TWI_INT_NACK                 (1 << 8)  /* Bit 8:  Not Acknowledged */
-#define TWI_INT_ARBLST               (1 << 9)  /* Bit 9:  Arbitration Lost */
-#define TWI_INT_SCLWS                (1 << 10) /* Bit 10: Clock Wait State */
-#define TWI_INT_EOSACC               (1 << 11) /* Bit 11: End Of Slave Access */
-#define TWI_INT_ENDRX                (1 << 12) /* Bit 12: End of RX buffer */
-#define TWI_INT_ENDTX                (1 << 13) /* Bit 13: End of TX buffer */
-#define TWI_INT_RXBUFF               (1 << 14) /* Bit 14: RX Buffer */
-#define TWI_INT_TXBUFE               (1 << 15) /* Bit 15: TX Buffer Empty */
-
-/* TWI Receive Holding Register */
-
-#define TWI_RHR_RXDATA_SHIFT         (0)       /* Bits 0-7:  Master or Slave Receive Holding Data */
-#define TWI_RHR_RXDATA_MASK          (0xff << TWI_RHR_RXDATA_SHIFT)
-
-/* TWI Transmit Holding Register */
-
-#define TWI_THR_TXDATA_SHIFT         (0)       /* Bits 0-7:  Master or Slave Transmit Holding Data */
-#define TWI_THR_TXDATA_MASK          (0xff << TWI_THR_TXDATA_SHIFT)
-
-/****************************************************************************************
- * Public Types
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Data
- ****************************************************************************************/
-
-/****************************************************************************************
- * Public Functions
- ****************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_TWI_H */
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_uart.h b/nuttx/arch/arm/src/sam3u/sam3u_uart.h
deleted file mode 100644
index 1103cbfad..000000000
--- a/nuttx/arch/arm/src/sam3u/sam3u_uart.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/************************************************************************************************
- * arch/arm/src/sam3u/sam3u_uart.h
- *
- *   Copyright (C) 2009 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_SAM3U_SAM3U_UART_H
-#define __ARCH_ARM_SRC_SAM3U_SAM3U_UART_H
-
-/************************************************************************************************
- * Included Files
- ************************************************************************************************/
-
-#include <nuttx/config.h>
-
-#include "chip.h"
-#include "sam3u_memorymap.h"
-
-/************************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************************/
-
-/* UART register offsets ************************************************************************/
-
-#define SAM3U_UART_CR_OFFSET           0x0000 /* Control Register (Common) */
-#define SAM3U_UART_MR_OFFSET           0x0004 /* Mode Register (Common) */
-#define SAM3U_UART_IER_OFFSET          0x0008 /* Interrupt Enable Register (Common) */
-#define SAM3U_UART_IDR_OFFSET          0x000c /* Interrupt Disable Register (Common) */
-#define SAM3U_UART_IMR_OFFSET          0x0010 /* Interrupt Mask Register (Common) */
-#define SAM3U_UART_SR_OFFSET           0x0014 /* Status Register (Common) */
-#define SAM3U_UART_RHR_OFFSET          0x0018 /* Receive Holding Register (Common) */
-#define SAM3U_UART_THR_OFFSET          0x001c /* Transmit Holding Register (Common) */
-#define SAM3U_UART_BRGR_OFFSET         0x0020 /* Baud Rate Generator Register (Common) */
-                                              /* 0x0024-0x003c: Reserved (UART) */
-#define SAM3U_USART_RTOR_OFFSET        0x0024 /* Receiver Time-out Register (USART only) */
-#define SAM3U_USART_TTGR_OFFSET        0x0028 /* Transmitter Timeguard Register (USART only) */
-                                              /* 0x002c-0x003c: Reserved (UART) */       
-#define SAM3U_USART_FIDI_OFFSET        0x0040 /* FI DI Ratio Register (USART only) */
-#define SAM3U_USART_NER_OFFSET         0x0044 /* Number of Errors Register ((USART only) */
-                                              /* 0x0048: Reserved (USART) */
-#define SAM3U_USART_IF_OFFSET          0x004c /* IrDA Filter Register (USART only) */
-#define SAM3U_USART_MAN_OFFSET         0x0050 /* Manchester Encoder Decoder Register (USART only) */
-#define SAM3U_USART_WPMR_OFFSET        0x00e4 /* Write Protect Mode Register (USART only) */
-#define SAM3U_USART_WPSR_OFFSET        0x00e8 /* Write Protect Status Register (USART only) */
-                                              /* 0x005c-0xf008: Reserved (USART) */
-#define SAM3U_USART_VERSION_OFFSET     0x00fc /* Version Register (USART only) */
-                                              /* 0x0100-0x0124: PDC Area (Common) */
-
-/* UART register adresses ***********************************************************************/
-
-#define SAM3U_UART_CR                  (SAM3U_UART_BASE+SAM3U_UART_CR_OFFSET)
-#define SAM3U_UART_MR                  (SAM3U_UART_BASE+SAM3U_UART_MR_OFFSET)
-#define SAM3U_UART_IER                 (SAM3U_UART_BASE+SAM3U_UART_IER_OFFSET)
-#define SAM3U_UART_IDR                 (SAM3U_UART_BASE+SAM3U_UART_IDR_OFFSET)
-#define SAM3U_UART_IMR                 (SAM3U_UART_BASE+SAM3U_UART_IMR_OFFSET)
-#define SAM3U_UART_SR                  (SAM3U_UART_BASE+SAM3U_UART_SR_OFFSET)
-#define SAM3U_UART_RHR                 (SAM3U_UART_BASE+SAM3U_UART_RHR_OFFSET)
-#define SAM3U_UART_THR                 (SAM3U_UART_BASE+SAM3U_UART_THR_OFFSET)
-#define SAM3U_UART_BRGR                (SAM3U_UART_BASE+SAM3U_UART_BRGR_OFFSET)
-
-#define SAM3U_USART_CR(n)              (SAM3U_USARTN_BASE(n)+SAM3U_UART_CR_OFFSET)
-#define SAM3U_USART_MR(n)              (SAM3U_USARTN_BASE(n)+SAM3U_UART_MR_OFFSET)
-#define SAM3U_USART_IER(n)             (SAM3U_USARTN_BASE(n)+SAM3U_UART_IER_OFFSET)
-#define SAM3U_USART_IDR(n)             (SAM3U_USARTN_BASE(n)+SAM3U_UART_IDR_OFFSET)
-#define SAM3U_USART_IMR(n)             (SAM3U_USARTN_BASE(n)+SAM3U_UART_IMR_OFFSET)
-#define SAM3U_USART_SR(n)              (SAM3U_USARTN_BASE(n)+SAM3U_UART_SR_OFFSET)
-#define SAM3U_USART_RHR(n)             (SAM3U_USARTN_BASE(n)+SAM3U_UART_RHR_OFFSET)
-#define SAM3U_USART_THR(n)             (SAM3U_USARTN_BASE(n)+SAM3U_UART_THR_OFFSET)
-#define SAM3U_USART_BRGR(n)            (SAM3U_USARTN_BASE(n)+SAM3U_UART_BRGR_OFFSET)
-#define SAM3U_USART_RTOR(n)            (SAM3U_USARTN_BASE(n)+SAM3U_USART_RTOR_OFFSET)
-#define SAM3U_USART_TTGR(n)            (SAM3U_USARTN_BASE(n)+SAM3U_USART_TTGR_OFFSET)
-#define SAM3U_USART_FIDI(n)            (SAM3U_USARTN_BASE(n)+SAM3U_USART_FIDI_OFFSET)
-#define SAM3U_USART_NER(n)             (SAM3U_USARTN_BASE(n)+SAM3U_USART_NER_OFFSET)
-#define SAM3U_USART_IF(n)              (SAM3U_USARTN_BASE(n)+SAM3U_USART_IF_OFFSET)
-#define SAM3U_USART_MAN(n)             (SAM3U_USARTN_BASE(n)+SAM3U_USART_MAN_OFFSET)
-#define SAM3U_USART_WPMR(n)            (SAM3U_USARTN_BASE(n)+SAM3U_USART_WPMR_OFFSET)
-#define SAM3U_USART_WPSR(n)            (SAM3U_USARTN_BASE(n)+SAM3U_USART_WPSR_OFFSET)
-#define SAM3U_USART_VERSION(n)         (SAM3U_USARTN_BASE(n)+SAM3U_USART_VERSION_OFFSET)
-
-#define SAM3U_USART0_CR                (SAM3U_USART0_BASE+SAM3U_UART_CR_OFFSET)
-#define SAM3U_USART0_MR_               (SAM3U_USART0_BASE+SAM3U_UART_MR_OFFSET)
-#define SAM3U_USART0_IER               (SAM3U_USART0_BASE+SAM3U_UART_IER_OFFSET)
-#define SAM3U_USART0_IDR               (SAM3U_USART0_BASE+SAM3U_UART_IDR_OFFSET)
-#define SAM3U_USART0_IMR               (SAM3U_USART0_BASE+SAM3U_UART_IMR_OFFSET)
-#define SAM3U_USART0_SR                (SAM3U_USART0_BASE+SAM3U_UART_SR_OFFSET)
-#define SAM3U_USART0_RHR               (SAM3U_USART0_BASE+SAM3U_UART_RHR_OFFSET)
-#define SAM3U_USART0_THR               (SAM3U_USART0_BASE+SAM3U_UART_THR_OFFSET)
-#define SAM3U_USART0_BRGR              (SAM3U_USART0_BASE+SAM3U_UART_BRGR_OFFSET)
-#define SAM3U_USART0_RTOR              (SAM3U_USART0_BASE+SAM3U_USART_RTOR_OFFSET)
-#define SAM3U_USART0_TTGR              (SAM3U_USART0_BASE+SAM3U_USART_TTGR_OFFSET)
-#define SAM3U_USART0_FIDI              (SAM3U_USART0_BASE+SAM3U_USART_FIDI_OFFSET)
-#define SAM3U_USART0_NER               (SAM3U_USART0_BASE+SAM3U_USART_NER_OFFSET)
-#define SAM3U_USART0_IF                (SAM3U_USART0_BASE+SAM3U_USART_IF_OFFSET)
-#define SAM3U_USART0_MAN               (SAM3U_USART0_BASE+SAM3U_USART_MAN_OFFSET)
-#define SAM3U_USART0_WPMR              (SAM3U_USART0_BASE+SAM3U_USART_WPMR_OFFSET)
-#define SAM3U_USART0_WPSR              (SAM3U_USART0_BASE+SAM3U_USART_WPSR_OFFSET)
-#define SAM3U_USART0_VERSION           (SAM3U_USART0_BASE+SAM3U_USART_VERSION_OFFSET)
-
-#define SAM3U_USART1_CR                (SAM3U_USART1_BASE+SAM3U_UART_CR_OFFSET)
-#define SAM3U_USART1_MR_               (SAM3U_USART1_BASE+SAM3U_UART_MR_OFFSET)
-#define SAM3U_USART1_IER               (SAM3U_USART1_BASE+SAM3U_UART_IER_OFFSET)
-#define SAM3U_USART1_IDR               (SAM3U_USART1_BASE+SAM3U_UART_IDR_OFFSET)
-#define SAM3U_USART1_IMR               (SAM3U_USART1_BASE+SAM3U_UART_IMR_OFFSET)
-#define SAM3U_USART1_SR                (SAM3U_USART1_BASE+SAM3U_UART_SR_OFFSET)
-#define SAM3U_USART1_RHR               (SAM3U_USART1_BASE+SAM3U_UART_RHR_OFFSET)
-#define SAM3U_USART1_THR               (SAM3U_USART1_BASE+SAM3U_UART_THR_OFFSET)
-#define SAM3U_USART1_BRGR              (SAM3U_USART1_BASE+SAM3U_UART_BRGR_OFFSET)
-#define SAM3U_USART1_RTOR              (SAM3U_USART1_BASE+SAM3U_USART_RTOR_OFFSET)
-#define SAM3U_USART1_TTGR              (SAM3U_USART1_BASE+SAM3U_USART_TTGR_OFFSET)
-#define SAM3U_USART1_FIDI              (SAM3U_USART1_BASE+SAM3U_USART_FIDI_OFFSET)
-#define SAM3U_USART1_NER               (SAM3U_USART1_BASE+SAM3U_USART_NER_OFFSET)
-#define SAM3U_USART1_IF                (SAM3U_USART1_BASE+SAM3U_USART_IF_OFFSET)
-#define SAM3U_USART1_MAN               (SAM3U_USART1_BASE+SAM3U_USART_MAN_OFFSET)
-#define SAM3U_USART1_WPMR              (SAM3U_USART1_BASE+SAM3U_USART_WPMR_OFFSET)
-#define SAM3U_USART1_WPSR              (SAM3U_USART1_BASE+SAM3U_USART_WPSR_OFFSET)
-#define SAM3U_USART1_VERSION           (SAM3U_USART1_BASE+SAM3U_USART_VERSION_OFFSET)
-
-#define SAM3U_USART2_CR                (SAM3U_USART2_BASE+SAM3U_UART_CR_OFFSET)
-#define SAM3U_USART2_MR_               (SAM3U_USART2_BASE+SAM3U_UART_MR_OFFSET)
-#define SAM3U_USART2_IER               (SAM3U_USART2_BASE+SAM3U_UART_IER_OFFSET)
-#define SAM3U_USART2_IDR               (SAM3U_USART2_BASE+SAM3U_UART_IDR_OFFSET)
-#define SAM3U_USART2_IMR               (SAM3U_USART2_BASE+SAM3U_UART_IMR_OFFSET)
-#define SAM3U_USART2_SR                (SAM3U_USART2_BASE+SAM3U_UART_SR_OFFSET)
-#define SAM3U_USART2_RHR               (SAM3U_USART2_BASE+SAM3U_UART_RHR_OFFSET)
-#define SAM3U_USART2_THR               (SAM3U_USART2_BASE+SAM3U_UART_THR_OFFSET)
-#define SAM3U_USART2_BRGR              (SAM3U_USART2_BASE+SAM3U_UART_BRGR_OFFSET)
-#define SAM3U_USART2_RTOR              (SAM3U_USART2_BASE+SAM3U_USART_RTOR_OFFSET)
-#define SAM3U_USART2_TTGR              (SAM3U_USART2_BASE+SAM3U_USART_TTGR_OFFSET)
-#define SAM3U_USART2_FIDI              (SAM3U_USART2_BASE+SAM3U_USART_FIDI_OFFSET)
-#define SAM3U_USART2_NER               (SAM3U_USART2_BASE+SAM3U_USART_NER_OFFSET)
-#define SAM3U_USART2_IF                (SAM3U_USART2_BASE+SAM3U_USART_IF_OFFSET)
-#define SAM3U_USART2_MAN               (SAM3U_USART2_BASE+SAM3U_USART_MAN_OFFSET)
-#define SAM3U_USART2_WPMR              (SAM3U_USART2_BASE+SAM3U_USART_WPMR_OFFSET)
-#define SAM3U_USART2_WPSR              (SAM3U_USART2_BASE+SAM3U_USART_WPSR_OFFSET)
-#define SAM3U_USART2_VERSION           (SAM3U_USART2_BASE+SAM3U_USART_VERSION_OFFSET)
-
-#define SAM3U_USART3_CR                (SAM3U_USART3_BASE+SAM3U_UART_CR_OFFSET)
-#define SAM3U_USART3_MR_               (SAM3U_USART3_BASE+SAM3U_UART_MR_OFFSET)
-#define SAM3U_USART3_IER               (SAM3U_USART3_BASE+SAM3U_UART_IER_OFFSET)
-#define SAM3U_USART3_IDR               (SAM3U_USART3_BASE+SAM3U_UART_IDR_OFFSET)
-#define SAM3U_USART3_IMR               (SAM3U_USART3_BASE+SAM3U_UART_IMR_OFFSET)
-#define SAM3U_USART3_SR                (SAM3U_USART3_BASE+SAM3U_UART_SR_OFFSET)
-#define SAM3U_USART3_RHR               (SAM3U_USART3_BASE+SAM3U_UART_RHR_OFFSET)
-#define SAM3U_USART3_THR               (SAM3U_USART3_BASE+SAM3U_UART_THR_OFFSET)
-#define SAM3U_USART3_BRGR              (SAM3U_USART3_BASE+SAM3U_UART_BRGR_OFFSET)
-#define SAM3U_USART3_RTOR              (SAM3U_USART3_BASE+SAM3U_USART_RTOR_OFFSET)
-#define SAM3U_USART3_TTGR              (SAM3U_USART3_BASE+SAM3U_USART_TTGR_OFFSET)
-#define SAM3U_USART3_FIDI              (SAM3U_USART3_BASE+SAM3U_USART_FIDI_OFFSET)
-#define SAM3U_USART3_NER               (SAM3U_USART3_BASE+SAM3U_USART_NER_OFFSET)
-#define SAM3U_USART3_IF                (SAM3U_USART3_BASE+SAM3U_USART_IF_OFFSET)
-#define SAM3U_USART3_MAN               (SAM3U_USART3_BASE+SAM3U_USART_MAN_OFFSET)
-#define SAM3U_USART3_WPMR              (SAM3U_USART3_BASE+SAM3U_USART_WPMR_OFFSET)
-#define SAM3U_USART3_WPSR              (SAM3U_USART3_BASE+SAM3U_USART_WPSR_OFFSET)
-#define SAM3U_USART3_VERSION           (SAM3U_USART3_BASE+SAM3U_USART_VERSION_OFFSET)
-
-/* UART register bit definitions ****************************************************************/
-
-/* UART Control Register */
-
-#define UART_CR_RSTRX                  (1 << 2)  /* Bit 2:  Reset Receiver (Common) */
-#define UART_CR_RSTTX                  (1 << 3)  /* Bit 3:  Reset Transmitter (Common) */
-#define UART_CR_RXEN                   (1 << 4)  /* Bit 4:  Receiver Enable (Common) */
-#define UART_CR_RXDIS                  (1 << 5)  /* Bit 5:  Receiver Disable (Common) */
-#define UART_CR_TXEN                   (1 << 6)  /* Bit 6:  Transmitter Enable (Common) */
-#define UART_CR_TXDIS                  (1 << 7)  /* Bit 7:  Transmitter Disable (Common) */
-#define UART_CR_RSTSTA                 (1 << 8)  /* Bit 8:  Reset Status Bits (Common) */
-#define USART_CR_STTBRK                (1 << 9)  /* Bit 9:  Start Break (USART only) */
-#define USART_CR_STPBRK                (1 << 10) /* Bit 10: Stop Break (USART only) */
-#define USART_CR_STTTO                 (1 << 11) /* Bit 11: Start Time-out (USART only) */
-#define USART_CR_SENDA                 (1 << 12) /* Bit 12: Send Address (USART only) */
-#define USART_CR_RSTIT                 (1 << 13) /* Bit 13: Reset Iterations (USART only) */
-#define USART_CR_RSTNACK               (1 << 14) /* Bit 14: Reset Non Acknowledge (USART only) */
-#define USART_CR_RETTO                 (1 << 15) /* Bit 15: Rearm Time-out (USART only) */
-#define USART_CR_RTSEN                 (1 << 18) /* Bit 18: Request to Send Enable (USART only) */
-#define USART_CR_FCS                   (1 << 18) /* Bit 18: Force SPI Chip Select (USART only) */
-#define USART_CR_RTSDIS                (1 << 19) /* Bit 19: Request to Send Disable (USART only) */
-#define USART_CR_RCS                   (1 << 19) /* Bit 19: Release SPI Chip Select (USART only) */
-
-/* UART Mode Register */
-
-#define USART_MR_MODE_SHIFT            (0)       /* Bits 0-3: (USART only) */
-#define USART_MR_MODE_MASK             (15 << USART_MR_MODE_SHIFT)
-#  define USART_MR_MODE_NORMAL         (0  << USART_MR_MODE_SHIFT) /* Normal */
-#  define USART_MR_MODE_RS485          (1  << USART_MR_MODE_SHIFT) /* RS485 */
-#  define USART_MR_MODE_HWHS           (2  << USART_MR_MODE_SHIFT) /* Hardware Handshaking */
-#  define USART_MR_MODE_ISO7816_0      (4  << USART_MR_MODE_SHIFT) /* IS07816 Protocol: T = 0 */
-#  define USART_MR_MODE_ISO7816_1      (6  << USART_MR_MODE_SHIFT) /* IS07816 Protocol: T = 1 */
-#  define USART_MR_MODE_IRDA           (8  << USART_MR_MODE_SHIFT) /* IrDA */
-#  define USART_MR_MODE_SPIMSTR        (14 << USART_MR_MODE_SHIFT) /* SPI Master */
-#  define USART_MR_MODE_SPISLV         (15 << USART_MR_MODE_SHIFT) /* SPI Slave */
-#define USART_MR_USCLKS_SHIFT          (4)       /* Bits 4-5: Clock Selection (USART only) */
-#define USART_MR_USCLKS_MASK           (3 << USART_MR_USCLKS_SHIFT)
-#  define USART_MR_USCLKS_MCK          (0 << USART_MR_USCLKS_SHIFT) /* MCK */
-#  define USART_MR_USCLKS_MCKDIV       (1 << USART_MR_USCLKS_SHIFT) /* MCK/DIV (DIV = 8) */
-#  define USART_MR_USCLKS_SCK          (3 << USART_MR_USCLKS_SHIFT) /* SCK */
-#define USART_MR_CHRL_SHIFT            (6)       /* Bits 6-7: Character Length (USART only) */
-#define USART_MR_CHRL_MASK             (3 << USART_MR_CHRL_SHIFT)
-#  define USART_MR_CHRL_5BITS          (0 << USART_MR_CHRL_SHIFT) /* 5 bits */
-#  define USART_MR_CHRL_6BITS          (1 << USART_MR_CHRL_SHIFT) /* 6 bits */
-#  define USART_MR_CHRL_7BITS          (2 << USART_MR_CHRL_SHIFT) /* 7 bits */
-#  define USART_MR_CHRL_8BITS          (3 << USART_MR_CHRL_SHIFT) /* 8 bits */
-#define USART_MR_YNC                   (1 << 8)  /* Bit 8: Synchronous Mode Select (USART only) */
-#define USART_MR_CPHA                  (1 << 8)  /* Bit 8: SPI Clock Phase (USART only) */
-#define UART_MR_PAR_SHIFT              (9)       /* Bits 9-11: Parity Type (Common) */
-#define UART_MR_PAR_MASK               (7 << UART_MR_PAR_SHIFT)
-#  define UART_MR_PAR_EVEN             (0 << UART_MR_PAR_SHIFT) /* Even parity (Common) */
-#  define UART_MR_PAR_ODD              (1 << UART_MR_PAR_SHIFT) /* Odd parity (Common) */
-#  define UART_MR_PAR_SPACE            (2 << UART_MR_PAR_SHIFT) /* Space: parity forced to 0 (Common) */
-#  define UART_MR_PAR_MARK             (3 << UART_MR_PAR_SHIFT) /* Mark: parity forced to 1 (Common) */
-#  define UART_MR_PAR_NONE             (4 << UART_MR_PAR_SHIFT) /* No parity (Common) */
-#  define UART_MR_PAR_MULTIDROP        (6 << UART_MR_PAR_SHIFT) /* Multidrop mode (USART only) */
-#define USART_MR_NBSTOP_SHIFT          (12)      /* Bits 12-13: Number of Stop Bits (USART only) */
-#define USART_MR_NBSTOP_MASK           (3 << USART_MR_NBSTOP_SHIFT)
-#  define USART_MR_NBSTOP_1            (0 << USART_MR_NBSTOP_SHIFT) /* 1 stop bit 1 stop bit */
-#  define USART_MR_NBSTOP_1p5          (1 << USART_MR_NBSTOP_SHIFT) /* 1.5 stop bits */
-#  define USART_MR_NBSTOP_2            (2 << USART_MR_NBSTOP_SHIFT) /* 2 stop bits 2 stop bits */
-#define UART_MR_CHMODE_SHIFT           (14)      /* Bits 14-15: Channel Mode (Common) */
-#define UART_MR_CHMODE_MASK            (3 << UART_MR_CHMODE_SHIFT)
-#  define UART_MR_CHMODE_NORMAL        (0 << UART_MR_CHMODE_SHIFT) /* Normal Mode */
-#  define UART_MR_CHMODE_ECHO          (1 << UART_MR_CHMODE_SHIFT) /* Automatic Echo */
-#  define UART_MR_CHMODE_LLPBK         (2 << UART_MR_CHMODE_SHIFT) /* Local Loopback */
-#  define UART_MR_CHMODE_RLPBK         (3 << UART_MR_CHMODE_SHIFT) /* Remote Loopback */
-#define USART_MR_MSBF                  (1 << 16) /* Bit 16: Bit Order or SPI Clock Polarity (USART only) */
-#define USART_MR_CPOL                  (1 << 16)
-#define USART_MR_MODE9                 (1 << 17) /* Bit 17: 9-bit Character Length (USART only) */
-#define USART_MR_CLKO                  (1 << 18) /* Bit 18: Clock Output Select (USART only) */
-#define USART_MR_OVER                  (1 << 19) /* Bit 19: Oversampling Mode (USART only) */
-#define USART_MR_INACK                 (1 << 20) /* Bit 20: Inhibit Non Acknowledge (USART only) */
-#define USART_MR_DSNACK                (1 << 21) /* Bit 21: Disable Successive NACK (USART only) */
-#define USART_MR_VARSYNC               (1 << 22) /* Bit 22: Variable Synchronization of Command/Data Sync Start Frame Delimiter (USART only) */
-#define USART_MR_INVDATA               (1 << 23) /* Bit 23: INverted Data (USART only) */
-#define USART_MR_MAXITER_SHIFT         (24)      /* Bits 24-26: Max iterations (ISO7816 T=0 (USART only) */
-#define USART_MR_MAXITER_MASK          (7 << USART_MR_MAXITER_SHIFT)
-#define USART_MR_FILTER                (1 << 28) /* Bit 28: Infrared Receive Line Filter (USART only) */
-#define USART_MR_MAN                   (1 << 29) /* Bit 29: Manchester Encoder/Decoder Enable (USART only) */
-#define USART_MR_MODSYNC               (1 << 30) /* Bit 30: Manchester Synchronization Mode (USART only) */
-#define USART_MR_ONEBIT                (1 << 31) /* Bit 31: Start Frame Delimiter Selector (USART only) */
-
-/* UART Interrupt Enable Register, UART Interrupt Disable Register, UART Interrupt Mask
- * Register, and UART Status Register common bit field definitions
- */
-
-#define UART_INT_RXRDY                 (1 << 0)  /* Bit 0:  RXRDY Interrupt (Common) */
-#define UART_INT_TXRDY                 (1 << 1)  /* Bit 1:  TXRDY Interrupt (Common) */
-#define UART_INT_RXBRK                 (1 << 2)  /* Bit 2:  Break Received/End of Break */
-#define UART_INT_ENDRX                 (1 << 3)  /* Bit 3:  End of Receive Transfer Interrupt (Common) */
-#define UART_INT_ENDTX                 (1 << 4)  /* Bit 4:  End of Transmit Interrupt (Common) */
-#define UART_INT_OVRE                  (1 << 5)  /* Bit 5:  Overrun Error Interrupt (Common) */
-#define UART_INT_FRAME                 (1 << 6)  /* Bit 6:  Framing Error Interrupt (Common) */
-#define UART_INT_PARE                  (1 << 7)  /* Bit 7:  Parity Error Interrupt (Common) */
-#define USART_INT_TIMEOUT              (1 << 8)  /* Bit 8:  Time-out Interrupt (USART only) */
-#define UART_INT_TXEMPTY               (1 << 9)  /* Bit 9:  TXEMPTY Interrupt (Common) */
-#define USART_INT_ITER                 (1 << 10) /* Bit 10: Iteration Interrupt (USART only) */
-#define USART_INT_UNRE                 (1 << 10) /* Bit 10: SPI Underrun Error Interrupt (USART only) */
-#define UART_INT_TXBUFE                (1 << 11) /* Bit 11: Buffer Empty Interrupt (Common) */
-#define UART_INT_RXBUFF                (1 << 12) /* Bit 12: Buffer Full Interrupt (Common) */
-#define USART_INT_NACK                 (1 << 13) /* Bit 13: Non Acknowledge Interrupt (USART only) */
-#define USART_INT_CTSIC                (1 << 19) /* Bit 19: Clear to Send Input Change Interrupt (USART only) */
-#define USART_INT_MANE                 (1 << 24) /* Bit 24: Manchester Error Interrupt (USART only) */
-
-/* UART Receiver Holding Register */
-
-#define UART_RHR_RXCHR_SHIFT           (0)       /* Bits 0-7: Received Character (UART only) */
-#define UART_RHR_RXCHR_MASK            (0xff << UART_RHR_RXCHR_SHIFT)
-#define USART_RHR_RXCHR_SHIFT          (0)       /* Bits 0-8: Received Character (USART only) */
-#define USART_RHR_RXCHR_MASK           (0x1ff << UART_RHR_RXCHR_SHIFT)
-#define USART_RHR_RXSYNH               (1 << 15) /* Bit 15: Received Sync (USART only) */
-
-/* UART Transmit Holding Register */
-
-#define UART_THR_TXCHR_SHIFT           (0)       /* Bits 0-7: Character to be Transmitted (UART only) */
-#define UART_THR_TXCHR_MASK            (0xff << UART_THR_TXCHR_SHIFT)
-#define USART_THR_TXCHR_SHIFT          (0)       /* Bits 0-8: Character to be Transmitted (USART only) */
-#define USART_THR_TXCHR_MASK           (0x1ff << USART_THR_TXCHR_SHIFT)
-#define USART_THR_TXSYNH               (1 << 15) /* Bit 15: Sync Field to be tran (USART only) */
-
-/* UART Baud Rate Generator Register */
-
-#define UART_BRGR_CD_SHIFT             (0)      /* Bits 0-15: Clock Divisor (Common) */
-#define UART_BRGR_CD_MASK              (0xffff << UART_BRGR_CD_SHIFT)
-#define UART_BRGR_FP_SHIFT             (16)      /* Bits 16-18: Fractional Part (USART only) */
-#define UART_BRGR_FP_MASK              (7 << UART_BRGR_FP_SHIFT)
-
-/* USART Receiver Time-out Register (USART only) */
-
-#define USART_RTOR_TO_SHIFT            (0)       /* Bits 0-15: Time-out Value (USART only) */
-#define USART_RTOR_TO_MASK             (0xffff << USART_RTOR_TO_SHIFT)
-
-/* USART Transmitter Timeguard Register (USART only) */
-
-#define USART_TTGR_TG_SHIFT            (0)       /* Bits 0-7: Timeguard Value (USART only) */
-#define USART_TTGR_TG_MASK             (0xff << USART_TTGR_TG_SHIFT)
-
-/* USART FI DI RATIO Register (USART only) */
-
-#define USART_FIDI_RATIO_SHIFT         (0)       /* Bits 0-10: FI Over DI Ratio Value (USART only) */
-#define USART_FIDI_RATIO_MASK          (0x7ff << USART_FIDI_RATIO_SHIFT)
-
-/* USART Number of Errors Register (USART only) */
-
-#define USART_NER_NBERRORS_SHIFT       (0)       /* Bits 0-7: Number of Errrors (USART only) */
-#define USART_NER_NBERRORS_MASK        (0xff << USART_NER_NBERRORS_SHIFT)
-
-/* USART IrDA FILTER Register (USART only) */
-
-#define USART_IF_IRDAFILTER_SHIFT      (0)       /* Bits 0-7: IrDA Filter (USART only) */
-#define USART_IF_IRDAFILTER_MASK       (0xff << USART_IF_IRDAFILTER_SHIFT)
-
-/* USART Manchester Configuration Register (USART only) */
-
-#define USART_MAN_TXPL_SHIFT           (0)       /* Bits 0-3: Transmitter Preamble Length (USART only) */
-#define USART_MAN_TXPL_MASK            (15 << USART_MAN_TXPL_SHIFT)
-#define USART_MAN_TXPP_SHIFT           (8)       /* Bits 8-9: Transmitter Preamble Pattern (USART only) */
-#define USART_MAN_TXPP_MASK            (3 << USART_MAN_TXPP_SHIFT)
-#  define USART_MAN_TXPP_ALLONE        (0 << USART_MAN_TXPP_SHIFT) /* ALL_ONE */
-#  define USART_MAN_TXPP_ALLZERO       (1 << USART_MAN_TXPP_SHIFT) /* ALL_ZERO */
-#  define USART_MAN_TXPP_ZEROONE       (2 << USART_MAN_TXPP_SHIFT) /* ZERO_ONE */
-#  define USART_MAN_TXPP_ONEZERO       (3 << USART_MAN_TXPP_SHIFT) /* ONE_ZERO */
-#define USART_MAN_TXMPOL               (1 << 12) /* Bit 12: Transmitter Manchester Polarity (USART only) */
-#define USART_MAN_RXPL_SHIFT           (16)      /* Bits 16-19: Receiver Preamble Length (USART only) */
-#define USART_MAN_RXPL_MASK            (15 << USART_MAN_RXPL_SHIFT)
-#define USART_MAN_RXPP_SHIFT           (24)      /* Bits 24-25: Receiver Preamble Pattern detected (USART only) */
-#define USART_MAN_RXPP_MASK            (3 << USART_MAN_RXPP_SHIFT)
-#  define USART_MAN_RXPP_ALLONE        (0 << USART_MAN_RXPP_SHIFT) /* ALL_ONE */
-#  define USART_MAN_RXPP_ALLZERO       (1 << USART_MAN_RXPP_SHIFT) /* ALL_ZERO */
-#  define USART_MAN_RXPP_ZEROONE       (2 << USART_MAN_RXPP_SHIFT) /* ZERO_ONE */
-#  define USART_MAN_RXPP_ONEZERO       (3 << USART_MAN_RXPP_SHIFT) /* ONE_ZERO */
-#define USART_MAN_RXMPOL               (1 << 28) /* Bit 28: Receiver Manchester Polarity (USART only) */
-#define USART_MAN_DRIFT                (1 << 30) /* Bit 30: Drift compensation (USART only) */
-
-/* USART Write Protect Mode Register (USART only) */
-
-#define USART_WPMR_WPEN                (1 << 0)  /* Bit 0: Write Protect Enable (USART only) */
-#define USART_WPMR_WPKEY_SHIFT         (8)       /* Bits 8-31: Write Protect KEY (USART only) */
-#define USART_WPMR_WPKEY_MASK          (0x00ffffff << USART_WPMR_WPKEY_SHIFT)
-
-/* USART Write Protect Status Register (USART only) */
-
-#define USART_WPSR_WPVS                (1 << 0)  /* Bit 0: Write Protect Violation Status (USART only) */
-#define USART_WPSR_WPVSRC_SHIFT        (8)       /* Bits 8-23: Write Protect Violation Source (USART only) */
-#define USART_WPSR_WPVSRC_MASK         (0xffff << USART_WPSR_WPVSRC_SHIFT)
-
-/* USART Version Register */
-
-#define USART_VERSION_VERSION_SHIFT    (0)       /* Bits 0-11: Macrocell version number (USART only) */
-#define USART_VERSION_VERSION_MASK     (0xfff << USART_VERSION_VERSION_SHIFT)
-#define USART_VERSION_MFN_SHIFT        (16)      /* Bits 16-18: Reserved (USART only) */
-#define USART_VERSION_MFN_MASK         (7 << USART_VERSION_MFN_SHIFT)
-
-/************************************************************************************************
- * Public Types
- ************************************************************************************************/
-
-/************************************************************************************************
- * Public Data
- ************************************************************************************************/
-
-/************************************************************************************************
- * Public Functions
- ************************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_SAM3U_SAM3U_UART_H */
diff --git a/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h b/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h
index 632bb3373..9760a1ca8 100644
--- a/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h
+++ b/nuttx/arch/arm/src/stm32/chip/stm32l15xxx_vectors.h
@@ -56,7 +56,7 @@
 
 #ifdef CONFIG_ARMV7M_CMNVECTOR
 
-/* Reserve 61 interrupt table entries for I/O interrupts. */
+/* Reserve 45 interrupt table entries for I/O interrupts. */
 
 # define ARMV7M_PERIPHERAL_INTERRUPTS 45
 
diff --git a/nuttx/arch/arm/src/stm32/stm32f20xxx_rcc.c b/nuttx/arch/arm/src/stm32/stm32f20xxx_rcc.c
index ac72fb60b..dd796f86c 100644
--- a/nuttx/arch/arm/src/stm32/stm32f20xxx_rcc.c
+++ b/nuttx/arch/arm/src/stm32/stm32f20xxx_rcc.c
@@ -631,7 +631,7 @@ static void stm32_stdclockconfig(void)
 
       /* Enable FLASH prefetch, instruction cache, data cache, and 5 wait states */
 
-#ifdef STM32_FLASH_PREFETCH
+#ifdef CONFIG_STM32_FLASH_PREFETCH
       regval = (FLASH_ACR_LATENCY_5 | FLASH_ACR_ICEN | FLASH_ACR_DCEN | FLASH_ACR_PRFTEN);
 #else
       regval = (FLASH_ACR_LATENCY_5 | FLASH_ACR_ICEN | FLASH_ACR_DCEN);
diff --git a/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c b/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c
index fc7fe1697..82757c43f 100644
--- a/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c
+++ b/nuttx/arch/arm/src/stm32/stm32f40xxx_rcc.c
@@ -669,7 +669,7 @@ static void stm32_stdclockconfig(void)
  
       /* Enable FLASH prefetch, instruction cache, data cache, and 5 wait states */
 
-#ifdef STM32_FLASH_PREFETCH
+#ifdef CONFIG_STM32_FLASH_PREFETCH
       regval = (FLASH_ACR_LATENCY_5 | FLASH_ACR_ICEN | FLASH_ACR_DCEN | FLASH_ACR_PRFTEN);
 #else
       regval = (FLASH_ACR_LATENCY_5 | FLASH_ACR_ICEN | FLASH_ACR_DCEN);
diff --git a/nuttx/configs/mikroe-stm32f4/src/up_clockconfig.c b/nuttx/configs/mikroe-stm32f4/src/up_clockconfig.c
index 9618cf8dd..3c55bd950 100644
--- a/nuttx/configs/mikroe-stm32f4/src/up_clockconfig.c
+++ b/nuttx/configs/mikroe-stm32f4/src/up_clockconfig.c
@@ -128,7 +128,7 @@ void stm32_board_clockconfig(void)
 
   /* Enable FLASH prefetch, instruction cache, data cache, and 5 wait states */
 
-#ifdef STM32_FLASH_PREFETCH
+#ifdef CONFIG_STM32_FLASH_PREFETCH
   regval = (FLASH_ACR_LATENCY_5 | FLASH_ACR_ICEN | FLASH_ACR_DCEN | FLASH_ACR_PRFTEN);
 #else
   regval = (FLASH_ACR_LATENCY_5 | FLASH_ACR_ICEN | FLASH_ACR_DCEN);
diff --git a/nuttx/configs/sam3u-ek/README.txt b/nuttx/configs/sam3u-ek/README.txt
index 2e0c50f9d..fbda5d92c 100644
--- a/nuttx/configs/sam3u-ek/README.txt
+++ b/nuttx/configs/sam3u-ek/README.txt
@@ -41,12 +41,12 @@ GNU Toolchain Options
   add one of the following configuration options to your .config (or defconfig)
   file:
 
-    CONFIG_SAM3U_CODESOURCERYW=y  : CodeSourcery under Windows
-    CONFIG_SAM3U_CODESOURCERYL=y  : CodeSourcery under Linux
-    CONFIG_SAM3U_DEVKITARM=y      : devkitARM under Windows
-    CONFIG_SAM3U_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
+    CONFIG_SAM34_CODESOURCERYW=y  : CodeSourcery under Windows
+    CONFIG_SAM34_CODESOURCERYL=y  : CodeSourcery under Linux
+    CONFIG_SAM34_DEVKITARM=y      : devkitARM under Windows
+    CONFIG_SAM34_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
 
-  If you are not using CONFIG_SAM3U_BUILDROOT, then you may also have to modify
+  If you are not using CONFIG_SAM34_BUILDROOT, then you may also have to modify
   the PATH in the setenv.h file if your make cannot find the tools.
 
   NOTE: the CodeSourcery (for Windows), devkitARM, and Raisonance toolchains are
@@ -108,13 +108,13 @@ IDEs
   2) Start the NuttX build at least one time from the Cygwin command line
      before trying to create your project.  This is necessary to create
      certain auto-generated files and directories that will be needed.
-  3) Set up include pathes:  You will need include/, arch/arm/src/sam3u,
+  3) Set up include pathes:  You will need include/, arch/arm/src/sam34,
      arch/arm/src/common, arch/arm/src/armv7-m, and sched/.
   4) All assembly files need to have the definition option -D __ASSEMBLY__
      on the command line.
 
   Startup files will probably cause you some headaches.  The NuttX startup file
-  is arch/arm/src/sam3u/sam3u_vectors.S.  You may need to build NuttX
+  is arch/arm/src/sam34/sam_vectors.S.  You may need to build NuttX
   one time from the Cygwin command line in order to obtain the pre-built
   startup object needed by RIDE.
 
@@ -256,17 +256,19 @@ SAM3U-EK-specific Configuration Options
 
     CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-       CONFIG_ARCH_CHIP=sam3u
+       CONFIG_ARCH_CHIP="sam34"
 
     CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
        chip:
 
+       CONFIG_ARCH_CHIP_SAM34
+       CONFIG_ARCH_CHIP_SAM3U
        CONFIG_ARCH_CHIP_AT91SAM3U4
 
     CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
        hence, the board that supports the particular chip or SoC.
 
-       CONFIG_ARCH_BOARD=sam3u_ek (for the SAM3U-EK development board)
+       CONFIG_ARCH_BOARD=sam3u-ek (for the SAM3U-EK development board)
 
     CONFIG_ARCH_BOARD_name - For use in C code
 
@@ -311,15 +313,15 @@ SAM3U-EK-specific Configuration Options
 
   Individual subsystems can be enabled:
 
-    CONFIG_SAM3U_DMA
-    CONFIG_SAM3U_HSMCI
-    CONFIG_SAM3U_NAND
-    CONFIG_SAM3U_SPI
-    CONFIG_SAM3U_UART
-    CONFIG_SAM3U_USART0
-    CONFIG_SAM3U_USART1
-    CONFIG_SAM3U_USART2
-    CONFIG_SAM3U_USART3
+    CONFIG_SAM34_DMA
+    CONFIG_SAM34_HSMCI
+    CONFIG_SAM34_NAND
+    CONFIG_SAM34_SPI
+    CONFIG_SAM34_UART
+    CONFIG_SAM34_USART0
+    CONFIG_SAM34_USART1
+    CONFIG_SAM34_USART2
+    CONFIG_SAM34_USART3
 
   Some subsystems can be configured to operate in different ways. The drivers
   need to know how to configure the subsystem.
diff --git a/nuttx/configs/sam3u-ek/include/board.h b/nuttx/configs/sam3u-ek/include/board.h
index 01817c784..213a6f4e4 100644
--- a/nuttx/configs/sam3u-ek/include/board.h
+++ b/nuttx/configs/sam3u-ek/include/board.h
@@ -2,7 +2,7 @@
  * configs/sam3u-ek/include/board.h
  * include/arch/board/board.h
  *
- *   Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,6 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "sam3u_internal.h"
 
 #ifndef __ASSEMBLY__
 #  include <stdint.h>
@@ -82,10 +81,10 @@
 
 /* Resulting frequencies */
 
-#define SAM3U_MAINOSC_FREQUENCY    (12000000)
-#define SAM3U_MCK_FREQUENCY        (48000000)
-#define SAM3U_PLLA_FREQUENCY       (96000000)
-#define SAM3U_CPU_FREQUENCY        (48000000)
+#define SAM_MAINOSC_FREQUENCY      (12000000)
+#define SAM_MCK_FREQUENCY          (48000000)
+#define SAM_PLLA_FREQUENCY         (96000000)
+#define SAM_CPU_FREQUENCY          (48000000)
 
 /* HSMCI clocking
  *
@@ -97,12 +96,12 @@
  */
 
 /* MCK = 48MHz, CLKDIV = 59, MCI_SPEED = 48MHz / 2 * (59+1) = 400 KHz */
-  
+
 #define HSMCI_INIT_CLKDIV      (59 << HSMCI_MR_CLKDIV_SHIFT)
 
 /* MCK = 48MHz, CLKDIV = 1, MCI_SPEED = 48MHz / 2 * (1+1) = 12 MHz */
 
-#define HSMCI_MMCXFR_CLKDIV    (3 << HSMCI_MR_CLKDIV_SHIFT) 
+#define HSMCI_MMCXFR_CLKDIV    (3 << HSMCI_MR_CLKDIV_SHIFT)
 
 /* MCK = 48MHz, CLKDIV = 0, MCI_SPEED = 48MHz / 2 * (0+1) = 24 MHz */
 
@@ -144,7 +143,7 @@ extern "C" {
  * Public Function Prototypes
  ************************************************************************************/
 /************************************************************************************
- * Name: sam3u_boardinitialize
+ * Name: sam_boardinitialize
  *
  * Description:
  *   All SAM3U architectures must provide the following entry point.  This entry point
@@ -153,7 +152,7 @@ extern "C" {
  *
  ************************************************************************************/
 
-EXTERN void sam3u_boardinitialize(void);
+void sam_boardinitialize(void);
 
 /************************************************************************************
  * Name: up_buttoninit
@@ -166,7 +165,7 @@ EXTERN void sam3u_boardinitialize(void);
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_BUTTONS
-EXTERN void up_buttoninit(void);
+void up_buttoninit(void);
 
 /************************************************************************************
  * Name: up_buttons
@@ -179,7 +178,7 @@ EXTERN void up_buttoninit(void);
  *
  ************************************************************************************/
 
-EXTERN uint8_t up_buttons(void);
+uint8_t up_buttons(void);
 
 /************************************************************************************
  * Name: up_irqbutton
@@ -193,7 +192,7 @@ EXTERN uint8_t up_buttons(void);
  ************************************************************************************/
 
 #ifdef CONFIG_GPIOA_IRQ
-EXTERN xcpt_t up_irqbutton(int id, xcpt_t irqhandler);
+xcpt_t up_irqbutton(int id, xcpt_t irqhandler);
 #endif
 #endif /* CONFIG_ARCH_BUTTONS */
 
diff --git a/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig
index 71c646083..82bb5d021 100755..100644
--- a/nuttx/configs/sam3u-ek/knsh/defconfig
+++ b/nuttx/configs/sam3u-ek/knsh/defconfig
@@ -70,6 +70,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
+# CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
@@ -77,15 +78,16 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_LPC31XX is not set
 # CONFIG_ARCH_CHIP_LPC43XX is not set
 # CONFIG_ARCH_CHIP_NUC1XX is not set
-CONFIG_ARCH_CHIP_SAM3U=y
+CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_FAMILY="armv7-m"
-CONFIG_ARCH_CHIP="sam3u"
+CONFIG_ARCH_CHIP="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_MPU=y
 CONFIG_ARMV7M_MPU=y
+CONFIG_ARMV7M_MPU_NREGIONS=8
 
 #
 # ARMV7M Configuration Options
@@ -99,21 +101,22 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 # CONFIG_SDIO_WIDTH_D1_ONLY is not set
 
 #
-# AT91SAM3 Configuration Options
+# AT91SAM3/SAM4 Configuration Options
 #
 CONFIG_ARCH_CHIP_AT91SAM3U4E=y
+CONFIG_ARCH_CHIP_SAM3U=y
 
 #
 # AT91SAM3 Peripheral Support
 #
-# CONFIG_SAM3U_DMA is not set
-# CONFIG_SAM3U_NAND is not set
-# CONFIG_SAM3U_HSMCI is not set
-CONFIG_SAM3U_UART=y
-# CONFIG_SAM3U_USART0 is not set
-# CONFIG_SAM3U_USART1 is not set
-# CONFIG_SAM3U_USART2 is not set
-# CONFIG_SAM3U_USART3 is not set
+# CONFIG_SAM34_DMA is not set
+# CONFIG_SAM34_NAND is not set
+# CONFIG_SAM34_HSMCI is not set
+CONFIG_SAM34_UART=y
+# CONFIG_SAM34_USART0 is not set
+# CONFIG_SAM34_USART1 is not set
+# CONFIG_SAM34_USART2 is not set
+# CONFIG_SAM34_USART3 is not set
 
 #
 # AT91SAM3 UART Configuration
@@ -143,6 +146,8 @@ CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
 
 #
 # Board Settings
@@ -249,7 +254,12 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
+
+#
+# System call configuration
+#
 CONFIG_SYS_RESERVED=8
+CONFIG_SYS_NNEST=2
 
 #
 # Device Drivers
@@ -266,6 +276,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_LCD is not set
@@ -283,7 +294,6 @@ CONFIG_SDIO_BLOCKSETUP=y
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
 # CONFIG_SENSORS is not set
-# CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
@@ -336,6 +346,7 @@ CONFIG_FS_FAT=y
 # CONFIG_FAT_DMAMEMORY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_SMARTFS is not set
 
 #
 # System Logging
@@ -359,6 +370,11 @@ CONFIG_MM_REGIONS=3
 # CONFIG_GRAN is not set
 
 #
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
 # Binary Formats
 #
 # CONFIG_BINFMT_DISABLE is not set
@@ -383,6 +399,7 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_LIBM is not set
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
 # CONFIG_EOL_IS_BOTH_CRLF is not set
@@ -408,6 +425,7 @@ CONFIG_SCHED_WORKSTACKSIZE=1024
 # CONFIG_SCHED_LPWORK is not set
 # CONFIG_SCHED_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
 
 #
 # Basic CXX Support
@@ -441,8 +459,9 @@ CONFIG_SCHED_WORKSTACKSIZE=1024
 # CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MM is not set
-# CONFIG_EXAMPLES_MOUNT is not set
 # CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
@@ -463,6 +482,9 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
@@ -558,6 +580,11 @@ CONFIG_NSH_DISABLE_PS=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+
+#
+# Configure Command Options
+#
+# CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
@@ -595,6 +622,10 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_INSTALL is not set
 
 #
+# FLASH Erase-all Command
+#
+
+#
 # readline()
 #
 CONFIG_SYSTEM_READLINE=y
diff --git a/nuttx/configs/sam3u-ek/nsh/appconfig b/nuttx/configs/sam3u-ek/nsh/appconfig
deleted file mode 100644
index 3e94f548d..000000000
--- a/nuttx/configs/sam3u-ek/nsh/appconfig
+++ /dev/null
@@ -1,44 +0,0 @@
-############################################################################
-# configs/sam3u-ek/nsh/appconfig
-#
-#   Copyright (C) 2011-2012 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/nsh
-
-# The NSH library
-
-CONFIGURED_APPS += system/readline
-CONFIGURED_APPS += nshlib
-
diff --git a/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig
index 7a6c12eab..ef2475c1b 100755..100644
--- a/nuttx/configs/sam3u-ek/nsh/defconfig
+++ b/nuttx/configs/sam3u-ek/nsh/defconfig
@@ -1,223 +1,226 @@
-############################################################################
-# configs/sam3u-ek/nsh/defconfig
-#
-#   Copyright (C) 2010 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
-# POSPIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-#
-# Architecture Selection
 #
-CONFIG_ARCH="arm"
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+CONFIG_NUTTX_NEWCONFIG=y
+
+#
+# Build Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_HOST_LINUX=y
+# CONFIG_HOST_OSX is not set
+# CONFIG_HOST_WINDOWS is not set
+# CONFIG_HOST_OTHER is not set
+
+#
+# Build Configuration
+#
+# CONFIG_APPS_DIR="../apps"
+# CONFIG_BUILD_2PASS is not set
+
+#
+# Binary Output Formats
+#
+# CONFIG_RRLOAD_BINARY is not set
+# CONFIG_INTELHEX_BINARY is not set
+# CONFIG_MOTOROLA_SREC is not set
+CONFIG_RAW_BINARY=y
+
+#
+# Customize Header Files
+#
+# CONFIG_ARCH_STDBOOL_H is not set
+# CONFIG_ARCH_MATH_H is not set
+# CONFIG_ARCH_FLOAT_H is not set
+# CONFIG_ARCH_STDARG_H is not set
+
+#
+# Debug Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_SYMBOLS is not set
+
+#
+# System Type
+#
+# CONFIG_ARCH_8051 is not set
 CONFIG_ARCH_ARM=y
+# CONFIG_ARCH_AVR is not set
+# CONFIG_ARCH_HC is not set
+# CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_RGMP is not set
+# CONFIG_ARCH_SH is not set
+# CONFIG_ARCH_SIM is not set
+# CONFIG_ARCH_X86 is not set
+# CONFIG_ARCH_Z16 is not set
+# CONFIG_ARCH_Z80 is not set
+CONFIG_ARCH="arm"
+
+#
+# ARM Options
+#
+# CONFIG_ARCH_CHIP_C5471 is not set
+# CONFIG_ARCH_CHIP_CALYPSO is not set
+# CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_IMX is not set
+# CONFIG_ARCH_CHIP_KINETIS is not set
+# CONFIG_ARCH_CHIP_KL is not set
+# CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_LPC17XX is not set
+# CONFIG_ARCH_CHIP_LPC214X is not set
+# CONFIG_ARCH_CHIP_LPC2378 is not set
+# CONFIG_ARCH_CHIP_LPC31XX is not set
+# CONFIG_ARCH_CHIP_LPC43XX is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+CONFIG_ARCH_CHIP_SAM34=y
+# CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP="sam3u"
-CONFIG_ARCH_CHIP_AT91SAM3U4E=y
-CONFIG_ARCH_BOARD="sam3u-ek"
-CONFIG_ARCH_BOARD_SAM3UEK=y
-CONFIG_BOARD_LOOPSPERMSEC=4768
-CONFIG_DRAM_SIZE=32768
-CONFIG_DRAM_START=0x20000000
-CONFIG_ARCH_IRQPRIO=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CALIBRATION=n
-CONFIG_ARCH_DMA=n
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARMV7M_MPU is not set
 
 #
-# Identify toolchain and linker options
+# ARMV7M Configuration Options
 #
-CONFIG_SAM3U_CODESOURCERYW=n
-CONFIG_SAM3U_CODESOURCERYL=n
-CONFIG_SAM3U_DEVKITARM=n
-CONFIG_SAM3U_BUILDROOT=y
+CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set
+CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 
 #
-# Individual subsystems can be enabled:
+# AT91SAM3/SAM4 Configuration Options
 #
-CONFIG_SAM3U_DMA=n
-CONFIG_SAM3U_NAND=n
-CONFIG_SAM3U_HSMCI=n
-CONFIG_SAM3U_UART=y
-CONFIG_SAM3U_USART0=n
-CONFIG_SAM3U_USART1=n
-CONFIG_SAM3U_USART2=n
-CONFIG_SAM3U_USART3=n
+CONFIG_ARCH_CHIP_AT91SAM3U4E=y
+CONFIG_ARCH_CHIP_SAM3U=y
 
 #
-# Some subsystems can be configured to operate in different ways..
-# The drivers need to know how to configure the subsystem.
+# AT91SAM3 Peripheral Support
 #
+# CONFIG_SAM34_DMA is not set
+# CONFIG_SAM34_NAND is not set
+# CONFIG_SAM34_HSMCI is not set
+CONFIG_SAM34_UART=y
+# CONFIG_SAM34_USART0 is not set
+# CONFIG_SAM34_USART1 is not set
+# CONFIG_SAM34_USART2 is not set
+# CONFIG_SAM34_USART3 is not set
 
-CONFIG_GPIOA_IRQ=n
-CONFIG_GPIOB_IRQ=n
-CONFIG_GPIOC_IRQ=n
-CONFIG_USART0_ISUART=y
-CONFIG_USART1_ISUART=y
-CONFIG_USART2_ISUART=y
-CONFIG_USART3_ISUART=y
+#
+# AT91SAM3 UART Configuration
+#
 
 #
-# SAM3U specific serial device driver settings
+# AT91SAM3 GPIO Interrupt Configuration
 #
-CONFIG_UART_SERIAL_CONSOLE=Y
-CONFIG_USART0_SERIAL_CONSOLE=n
-CONFIG_USART1_SERIAL_CONSOLE=n
-CONFIG_USART2_SERIAL_CONSOLE=n
-CONFIG_USART3_SERIAL_CONSOLE=n
+# CONFIG_GPIOA_IRQ is not set
+# CONFIG_GPIOB_IRQ is not set
+# CONFIG_GPIOC_IRQ is not set
 
-CONFIG_UART_TXBUFSIZE=256
-CONFIG_USART0_TXBUFSIZE=256
-CONFIG_USART1_TXBUFSIZE=256
-CONFIG_USART2_TXBUFSIZE=256
-CONFIG_USART3_TXBUFSIZE=256
+#
+# External Memory Configuration
+#
 
-CONFIG_UART_RXBUFSIZE=256
-CONFIG_USART0_RXBUFSIZE=256
-CONFIG_USART1_RXBUFSIZE=256
-CONFIG_USART2_RXBUFSIZE=256
-CONFIG_USART3_RXBUFSIZE=256
+#
+# Architecture Options
+#
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_IRQPRIO=y
+# CONFIG_CUSTOM_STACK is not set
+# CONFIG_ADDRENV is not set
+CONFIG_ARCH_HAVE_VFORK=y
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
 
-CONFIG_UART_BAUD=115200
-CONFIG_USART0_BAUD=115200
-CONFIG_USART1_BAUD=115200
-CONFIG_USART2_BAUD=115200
-CONFIG_USART3_BAUD=115200
+#
+# Board Settings
+#
+CONFIG_BOARD_LOOPSPERMSEC=4768
+# CONFIG_ARCH_CALIBRATION is not set
+CONFIG_DRAM_START=0x20000000
+CONFIG_DRAM_SIZE=32768
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
 
-CONFIG_UART_BITS=8
-CONFIG_USART0_BITS=8
-CONFIG_USART1_BITS=8
-CONFIG_USART2_BITS=8
-CONFIG_USART3_BITS=8
+#
+# Boot options
+#
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
 
-CONFIG_UART_PARITY=0
-CONFIG_USART0_PARITY=0
-CONFIG_USART1_PARITY=0
-CONFIG_USART2_PARITY=0
-CONFIG_USART3_PARITY=0
+#
+# Board Selection
+#
+CONFIG_ARCH_BOARD_SAM3UEK=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD="sam3u-ek"
 
-CONFIG_UART_2STOP=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+#
+# Common Board Options
+#
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
+# CONFIG_ARCH_IRQBUTTONS is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
-# General build options
+# Board-Specific Options
 #
-CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=n
-CONFIG_MOTOROLA_SREC=n
-CONFIG_RAW_BINARY=y
 
 #
-# General OS setup
+# RTOS Features
 #
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_DEBUG=n
-CONFIG_DEBUG_VERBOSE=n
-CONFIG_DEBUG_SYMBOLS=n
-CONFIG_MM_REGIONS=3
-CONFIG_ARCH_LOWPUTC=y
+# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_MSEC_PER_TICK=10
 CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_INSTRUMENTATION=n
+# CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=9
 CONFIG_START_DAY=21
-CONFIG_GREGORIAN_TIME=n
-CONFIG_JULIAN_TIME=n
 CONFIG_DEV_CONSOLE=y
-CONFIG_DEV_LOWCONSOLE=n
-CONFIG_MUTEX_TYPES=n
-CONFIG_PRIORITY_INHERITANCE=n
-CONFIG_SEM_PREALLOCHOLDERS=0
-CONFIG_SEM_NNESTPRIO=0
-CONFIG_FDCLONE_DISABLE=n
-CONFIG_FDCLONE_STDIO=n
+# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PRIORITY_INHERITANCE is not set
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_NXFLAT=n
-CONFIG_SCHED_WORKQUEUE=n
-CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=1024
-CONFIG_SIG_SIGWORK=17
-
-#
-# The following can be used to disable categories of
-# APIs supported by the OS.  If the compiler supports
-# weak functions, then it should not be necessary to
-# disable functions unless you want to restrict usage
-# of those APIs.
-#
-# There are certain dependency relationships in these
-# features.
-#
-# o mq_notify logic depends on signals to awaken tasks
-#   waiting for queues to become full or empty.
-# o pthread_condtimedwait() depends on signals to wake
-#   up waiting tasks.
-#
-CONFIG_DISABLE_CLOCK=n
-CONFIG_DISABLE_POSIX_TIMERS=n
-CONFIG_DISABLE_PTHREAD=n
-CONFIG_DISABLE_SIGNALS=n
-CONFIG_DISABLE_MQUEUE=n
-CONFIG_DISABLE_MOUNTPOINT=n
-CONFIG_DISABLE_ENVIRON=n
-CONFIG_DISABLE_POLL=y
-
-#
-# Misc libc settings
-#
-CONFIG_NOPRINTF_FIELDWIDTH=n
+# CONFIG_SCHED_WAITPID is not set
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_CLOCK is not set
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
 
 #
-# Allow for architecture optimized implementations
-#
-# The architecture can provide optimized versions of the
-# following to improve system performance
+# Signal Numbers
 #
-CONFIG_ARCH_MEMCPY=n
-CONFIG_ARCH_MEMCMP=n
-CONFIG_ARCH_MEMMOVE=n
-CONFIG_ARCH_MEMSET=n
-CONFIG_ARCH_STRCMP=n
-CONFIG_ARCH_STRCPY=n
-CONFIG_ARCH_STRNCPY=n
-CONFIG_ARCH_STRLEN=n
-CONFIG_ARCH_STRNLEN=n
-CONFIG_ARCH_BZERO=n
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
 
 #
 # Sizes of configurable things (0 disables)
@@ -228,8 +231,6 @@ CONFIG_NPTHREAD_KEYS=4
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NAME_MAX=32
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_NUNGET_CHARS=2
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
 CONFIG_MAX_WDOGPARMS=2
@@ -237,225 +238,387 @@ CONFIG_PREALLOC_WDOGS=4
 CONFIG_PREALLOC_TIMERS=4
 
 #
-# Filesystem configuration
+# Stack and heap information
+#
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
+
+#
+# Device Drivers
+#
+CONFIG_DISABLE_POLL=y
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_LOOP is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_PWM is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_RTC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_BCH is not set
+# CONFIG_INPUT is not set
+# CONFIG_LCD is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MTD is not set
+# CONFIG_PIPES is not set
+# CONFIG_PM is not set
+# CONFIG_POWER is not set
+# CONFIG_SENSORS is not set
+CONFIG_SERIAL=y
+# CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_16550_UART is not set
+CONFIG_ARCH_HAVE_UART=y
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+CONFIG_UART_SERIAL_CONSOLE=y
+# CONFIG_NO_SERIAL_CONSOLE is not set
+
+#
+# UART Configuration
+#
+CONFIG_UART_RXBUFSIZE=256
+CONFIG_UART_TXBUFSIZE=256
+CONFIG_UART_BAUD=115200
+CONFIG_UART_BITS=8
+CONFIG_UART_PARITY=0
+CONFIG_UART_2STOP=0
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_WIRELESS is not set
+
+#
+# System Logging Device Options
+#
+
+#
+# System Logging
+#
+# CONFIG_RAMLOG is not set
+
+#
+# Networking Support
+#
+# CONFIG_NET is not set
+
+#
+# File Systems
+#
+
+#
+# File system configuration
 #
+# CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
-CONFIG_FS_ROMFS=n
+# CONFIG_FAT_LCNAMES is not set
+# CONFIG_FAT_LFN is not set
+# CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FS_NXFFS is not set
+# CONFIG_FS_ROMFS is not set
+# CONFIG_FS_SMARTFS is not set
 
 #
-# Maintain legacy build behavior (revisit)
+# System Logging
 #
+# CONFIG_SYSLOG_ENABLE is not set
+# CONFIG_SYSLOG is not set
 
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
-CONFIG_MTD=y
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
+#
+# Memory Management
+#
+# CONFIG_MM_MULTIHEAP is not set
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=3
+# CONFIG_GRAN is not set
 
 #
-# SPI-based MMC/SD driver
+# Audio Support
 #
-CONFIG_MMCSD_NSLOTS=1
-CONFIG_MMCSD_READONLY=n
-CONFIG_MMCSD_SPICLOCK=12500000
+# CONFIG_AUDIO is not set
 
 #
-# Block driver buffering
+# Binary Formats
 #
-CONFIG_FS_READAHEAD=n
-CONFIG_FS_WRITEBUFFER=n
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_BINFMT_EXEPATH is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
+# CONFIG_BUILTIN is not set
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
 
 #
-# SDIO-based MMC/SD driver
+# Library Routines
+#
+
 #
-CONFIG_SDIO_DMA=n
-CONFIG_SDIO_BLOCKSETUP=y
-CONFIG_MMCSD_MMCSUPPORT=n
-CONFIG_MMCSD_HAVECARDDETECT=n
-
-#
-# TCP/IP and UDP support via uIP
-#
-CONFIG_NET=n
-CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
-CONFIG_NET_TCP=n
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_UDP=n
-CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
-CONFIG_NET_ICMP=n
-CONFIG_NET_ICMP_PING=n
-#CONFIG_NET_PINGADDRCONF=0
-CONFIG_NET_STATISTICS=y
-#CONFIG_NET_RECEIVE_WINDOW=
-#CONFIG_NET_ARPTAB_SIZE=8
-CONFIG_NET_BROADCAST=n
+# Standard C Library Options
+#
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=y
+CONFIG_NUNGET_CHARS=2
+CONFIG_LIB_HOMEDIR="/"
+# CONFIG_LIBM is not set
+# CONFIG_NOPRINTF_FIELDWIDTH is not set
+# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIB_RAND_ORDER=1
+# CONFIG_EOL_IS_CR is not set
+# CONFIG_EOL_IS_LF is not set
+# CONFIG_EOL_IS_BOTH_CRLF is not set
+CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+# CONFIG_LIBC_STRERROR is not set
+# CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_ARCH_LOWPUTC=y
+CONFIG_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 
 #
-# UIP Network Utilities
+# Non-standard Library Support
 #
-CONFIG_NET_DHCP_LIGHT=n
-CONFIG_NET_RESOLV_ENTRIES=4
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
 
 #
-# USB Device Configuration
+# Basic CXX Support
 #
-CONFIG_USBDEV=n
-CONFIG_USBDEV_ISOCHRONOUS=n
-CONFIG_USBDEV_DUALSPEED=n
-CONFIG_USBDEV_SELFPOWERED=y
-CONFIG_USBDEV_REMOTEWAKEUP=n
-CONFIG_USBDEV_MAXPOWER=100
-CONFIG_USBDEV_TRACE=n
-CONFIG_USBDEV_TRACE_NRECORDS=128
+# CONFIG_C99_BOOL8 is not set
+# CONFIG_HAVE_CXX is not set
 
 #
-# USB Serial Device Configuration
+# Application Configuration
 #
-CONFIG_PL2303=n
-CONFIG_PL2303_EPINTIN=1
-CONFIG_PL2303_EPBULKOUT=2
-CONFIG_PL2303_EPBULKIN=3
-CONFIG_PL2303_NWRREQS=4
-CONFIG_PL2303_NRDREQS=4
-CONFIG_PL2303_VENDORID=0x067b
-CONFIG_PL2303_PRODUCTID=0x2303
-CONFIG_PL2303_VENDORSTR="Nuttx"
-CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
-CONFIG_PL2303_RXBUFSIZE=512
-CONFIG_PL2303_TXBUFSIZE=512
 
 #
-# USB Storage Device Configuration
+# Built-In Applications
 #
-CONFIG_USBMSC=n
-CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBMSC_REMOVABLE=y
 
 #
-# Graphics related configuration settings
-#
-CONFIG_NX=n
-CONFIG_NX_MULTIUSER=n
-CONFIG_NX_NPLANES=1
-CONFIG_NX_DISABLE_1BPP=y
-CONFIG_NX_DISABLE_2BPP=y
-CONFIG_NX_DISABLE_4BPP=y
-CONFIG_NX_DISABLE_8BPP=y
-CONFIG_NX_DISABLE_16BPP=n
-CONFIG_NX_DISABLE_24BPP=y
-CONFIG_NX_DISABLE_32BPP=y
-CONFIG_NX_PACKEDMSFIRST=n
-CONFIG_NX_LCDDRIVER=y
-CONFIG_LCD_MAXPOWER=31
-CONFIG_LCD_MAXCONTRAST=1
-CONFIG_NX_MOUSE=y
-CONFIG_NX_KBD=y
-#CONFIG_NXTK_BORDERWIDTH=4
-#CONFIG_NXTK_BORDERCOLOR1
-#CONFIG_NXTK_BORDERCOLOR2
-CONFIG_NXTK_AUTORAISE=n
-CONFIG_NXFONT_SANS23X27=y
-CONFIG_NXFONTS_CHARBITS=7
-CONFIG_NX_BLOCKING=y
-CONFIG_NX_MXSERVERMSGS=32
-CONFIG_NX_MXCLIENTMSGS=16
-
-#
-# Settings for examples/uip
-#
-CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLES_UIP_DHCPC=n
-
-#
-# Settings for examples/nettest
-CONFIG_EXAMPLES_NETTEST_SERVER=n
-CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLES_NETTEST_NOMAC=n
-CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
-
-#
-# Settings for examples/ostest
-#
-CONFIG_EXAMPLES_OSTEST_LOOPS=1
-CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
-CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
-
-#
-# Settings for apps/nshlib
+# Examples
 #
+# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_COMPOSITE is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+# CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MM is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
+CONFIG_EXAMPLES_NSH=y
+# CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
+# CONFIG_EXAMPLES_NXCONSOLE is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXFLAT is not set
+# CONFIG_EXAMPLES_NXHELLO is not set
+# CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTEXT is not set
+# CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POLL is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_ROMFS is not set
+# CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
+# CONFIG_EXAMPLES_TELNETD is not set
+# CONFIG_EXAMPLES_THTTPD is not set
+# CONFIG_EXAMPLES_TIFF is not set
+# CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_UDP is not set
+# CONFIG_EXAMPLES_UIP is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
+
+#
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+
+#
+# Interpreters
+#
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_PCODE is not set
+
+#
+# Network Utilities
+#
+
+#
+# Networking Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_DHCPC is not set
+# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_FTPC is not set
+# CONFIG_NETUTILS_FTPD is not set
+# CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TELNETD is not set
+# CONFIG_NETUTILS_TFTPC is not set
+# CONFIG_NETUTILS_THTTPD is not set
+# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_WEBCLIENT is not set
+
+#
+# FreeModBus
+#
+# CONFIG_MODBUS is not set
+
+#
+# NSH Library
+#
+CONFIG_NSH_LIBRARY=y
+
+#
+# Disable Individual commands
+#
+# CONFIG_NSH_DISABLE_CAT is not set
+# CONFIG_NSH_DISABLE_CD is not set
+# CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_DD is not set
+# CONFIG_NSH_DISABLE_ECHO is not set
+# CONFIG_NSH_DISABLE_EXEC is not set
+# CONFIG_NSH_DISABLE_EXIT is not set
+# CONFIG_NSH_DISABLE_FREE is not set
+# CONFIG_NSH_DISABLE_GET is not set
+# CONFIG_NSH_DISABLE_HELP is not set
+# CONFIG_NSH_DISABLE_HEXDUMP is not set
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_KILL is not set
+# CONFIG_NSH_DISABLE_LOSETUP is not set
+# CONFIG_NSH_DISABLE_LS is not set
+# CONFIG_NSH_DISABLE_MB is not set
+# CONFIG_NSH_DISABLE_MKDIR is not set
+# CONFIG_NSH_DISABLE_MKFATFS is not set
+# CONFIG_NSH_DISABLE_MKFIFO is not set
+# CONFIG_NSH_DISABLE_MKRD is not set
+# CONFIG_NSH_DISABLE_MH is not set
+# CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_NSFMOUNT is not set
+# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_NSH_DISABLE_PING is not set
+# CONFIG_NSH_DISABLE_PUT is not set
+# CONFIG_NSH_DISABLE_PWD is not set
+# CONFIG_NSH_DISABLE_RM is not set
+# CONFIG_NSH_DISABLE_RMDIR is not set
+# CONFIG_NSH_DISABLE_SET is not set
+# CONFIG_NSH_DISABLE_SH is not set
+# CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TEST is not set
+# CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNSET is not set
+# CONFIG_NSH_DISABLE_USLEEP is not set
+# CONFIG_NSH_DISABLE_WGET is not set
+# CONFIG_NSH_DISABLE_XD is not set
+
+#
+# Configure Command Options
+#
+# CONFIG_NSH_CMDOPT_DF_H is not set
+CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_STRERROR=n
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_NESTDEPTH=3
-CONFIG_NSH_DISABLESCRIPT=n
-CONFIG_NSH_DISABLEBG=n
-CONFIG_NSH_ROMFSETC=n
+# CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-CONFIG_NSH_TELNET=n
-CONFIG_NSH_ARCHINIT=n
-CONFIG_NSH_IOBUFFER_SIZE=512
-CONFIG_NSH_DHCPC=n
-CONFIG_NSH_NOMAC=n
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-CONFIG_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_NSH_ROMFSDEVNO=0
-CONFIG_NSH_ROMFSSECTSIZE=64
-CONFIG_NSH_FATDEVNO=1
-CONFIG_NSH_FATSECTSIZE=512
-CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT="/tmp"
-
-#
-# Architecture-specific NSH options
-#
-CONFIG_NSH_MMCSDSPIPORTNO=0
-CONFIG_NSH_MMCSDSLOTNO=0
-CONFIG_NSH_MMCSDMINOR=0
 
 #
-# Settings for examples/usbserial
+# USB Trace Support
 #
-CONFIG_EXAMPLES_USBSERIAL_INONLY=n
-CONFIG_EXAMPLES_USBSERIAL_OUTONLY=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
+# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ARCHINIT is not set
 
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
+#
+# NxWidgets/NxWM
+#
 
 #
-# Stack and heap information
+# System NSH Add-Ons
+#
+
+#
+# Custom Free Memory Command
+#
+# CONFIG_SYSTEM_FREE is not set
+
+#
+# I2C tool
+#
+
+#
+# FLASH Program Installation
+#
+# CONFIG_SYSTEM_INSTALL is not set
+
+#
+# FLASH Erase-all Command
+#
+
+#
+# readline()
+#
+CONFIG_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+
+#
+# Power Off
+#
+# CONFIG_SYSTEM_POWEROFF is not set
+
+#
+# RAMTRON
+#
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
 #
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
diff --git a/nuttx/configs/sam3u-ek/nx/appconfig b/nuttx/configs/sam3u-ek/nx/appconfig
deleted file mode 100644
index a5ea3cccc..000000000
--- a/nuttx/configs/sam3u-ek/nx/appconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# configs/sam3u-ek/nx/appconfig
-#
-#   Copyright (C) 2011 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/nx
-
diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig
index e7c85ee93..7329bd2a4 100755..100644
--- a/nuttx/configs/sam3u-ek/nx/defconfig
+++ b/nuttx/configs/sam3u-ek/nx/defconfig
@@ -1,224 +1,225 @@
-############################################################################
-# configs/sam3u-ek/nx/defconfig
-#
-#   Copyright (C) 2010 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
-# POSPIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-#
-# Architecture Selection
 #
-CONFIG_ARCH="arm"
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+CONFIG_NUTTX_NEWCONFIG=y
+
+#
+# Build Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_HOST_LINUX=y
+# CONFIG_HOST_OSX is not set
+# CONFIG_HOST_WINDOWS is not set
+# CONFIG_HOST_OTHER is not set
+
+#
+# Build Configuration
+#
+# CONFIG_APPS_DIR="../apps"
+# CONFIG_BUILD_2PASS is not set
+
+#
+# Binary Output Formats
+#
+# CONFIG_RRLOAD_BINARY is not set
+# CONFIG_INTELHEX_BINARY is not set
+# CONFIG_MOTOROLA_SREC is not set
+CONFIG_RAW_BINARY=y
+
+#
+# Customize Header Files
+#
+# CONFIG_ARCH_STDBOOL_H is not set
+# CONFIG_ARCH_MATH_H is not set
+# CONFIG_ARCH_FLOAT_H is not set
+# CONFIG_ARCH_STDARG_H is not set
+
+#
+# Debug Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_SYMBOLS is not set
+
+#
+# System Type
+#
+# CONFIG_ARCH_8051 is not set
 CONFIG_ARCH_ARM=y
+# CONFIG_ARCH_AVR is not set
+# CONFIG_ARCH_HC is not set
+# CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_RGMP is not set
+# CONFIG_ARCH_SH is not set
+# CONFIG_ARCH_SIM is not set
+# CONFIG_ARCH_X86 is not set
+# CONFIG_ARCH_Z16 is not set
+# CONFIG_ARCH_Z80 is not set
+CONFIG_ARCH="arm"
+
+#
+# ARM Options
+#
+# CONFIG_ARCH_CHIP_C5471 is not set
+# CONFIG_ARCH_CHIP_CALYPSO is not set
+# CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_IMX is not set
+# CONFIG_ARCH_CHIP_KINETIS is not set
+# CONFIG_ARCH_CHIP_KL is not set
+# CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_LPC17XX is not set
+# CONFIG_ARCH_CHIP_LPC214X is not set
+# CONFIG_ARCH_CHIP_LPC2378 is not set
+# CONFIG_ARCH_CHIP_LPC31XX is not set
+# CONFIG_ARCH_CHIP_LPC43XX is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+CONFIG_ARCH_CHIP_SAM34=y
+# CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP="sam3u"
-CONFIG_ARCH_CHIP_AT91SAM3U4E=y
-CONFIG_ARCH_BOARD="sam3u-ek"
-CONFIG_ARCH_BOARD_SAM3UEK=y
-CONFIG_BOARD_LOOPSPERMSEC=4768
-CONFIG_DRAM_SIZE=32768
-CONFIG_DRAM_START=0x20000000
-CONFIG_ARCH_IRQPRIO=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CALIBRATION=n
-CONFIG_ARCH_DMA=n
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARMV7M_MPU is not set
 
 #
-# Identify toolchain and linker options
+# ARMV7M Configuration Options
 #
-CONFIG_SAM3U_CODESOURCERYW=n
-CONFIG_SAM3U_CODESOURCERYL=n
-CONFIG_SAM3U_DEVKITARM=n
-CONFIG_SAM3U_BUILDROOT=y
+CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set
+CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 
 #
-# Individual subsystems can be enabled:
+# AT91SAM3/SAM4 Configuration Options
 #
-CONFIG_SAM3U_DMA=n
-CONFIG_SAM3U_NAND=n
-CONFIG_SAM3U_HSMCI=n
-CONFIG_SAM3U_UART=y
-CONFIG_SAM3U_USART0=n
-CONFIG_SAM3U_USART1=n
-CONFIG_SAM3U_USART2=n
-CONFIG_SAM3U_USART3=n
+CONFIG_ARCH_CHIP_AT91SAM3U4E=y
+CONFIG_ARCH_CHIP_SAM3U=y
 
 #
-# Some subsystems can be configured to operate in different ways..
-# The drivers need to know how to configure the subsystem.
+# AT91SAM3 Peripheral Support
 #
+# CONFIG_SAM34_DMA is not set
+# CONFIG_SAM34_NAND is not set
+# CONFIG_SAM34_HSMCI is not set
+CONFIG_SAM34_UART=y
+# CONFIG_SAM34_USART0 is not set
+# CONFIG_SAM34_USART1 is not set
+# CONFIG_SAM34_USART2 is not set
+# CONFIG_SAM34_USART3 is not set
 
-CONFIG_GPIOA_IRQ=n
-CONFIG_GPIOB_IRQ=n
-CONFIG_GPIOC_IRQ=n
-CONFIG_USART0_ISUART=y
-CONFIG_USART1_ISUART=y
-CONFIG_USART2_ISUART=y
-CONFIG_USART3_ISUART=y
+#
+# AT91SAM3 UART Configuration
+#
 
 #
-# SAM3U specific serial device driver settings
+# AT91SAM3 GPIO Interrupt Configuration
 #
-CONFIG_UART_SERIAL_CONSOLE=Y
-CONFIG_USART0_SERIAL_CONSOLE=n
-CONFIG_USART1_SERIAL_CONSOLE=n
-CONFIG_USART2_SERIAL_CONSOLE=n
-CONFIG_USART3_SERIAL_CONSOLE=n
+# CONFIG_GPIOA_IRQ is not set
+# CONFIG_GPIOB_IRQ is not set
+# CONFIG_GPIOC_IRQ is not set
 
-CONFIG_UART_TXBUFSIZE=256
-CONFIG_USART0_TXBUFSIZE=256
-CONFIG_USART1_TXBUFSIZE=256
-CONFIG_USART2_TXBUFSIZE=256
-CONFIG_USART3_TXBUFSIZE=256
+#
+# External Memory Configuration
+#
 
-CONFIG_UART_RXBUFSIZE=256
-CONFIG_USART0_RXBUFSIZE=256
-CONFIG_USART1_RXBUFSIZE=256
-CONFIG_USART2_RXBUFSIZE=256
-CONFIG_USART3_RXBUFSIZE=256
+#
+# Architecture Options
+#
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_IRQPRIO=y
+# CONFIG_CUSTOM_STACK is not set
+# CONFIG_ADDRENV is not set
+CONFIG_ARCH_HAVE_VFORK=y
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
 
-CONFIG_UART_BAUD=115200
-CONFIG_USART0_BAUD=115200
-CONFIG_USART1_BAUD=115200
-CONFIG_USART2_BAUD=115200
-CONFIG_USART3_BAUD=115200
+#
+# Board Settings
+#
+CONFIG_BOARD_LOOPSPERMSEC=4768
+# CONFIG_ARCH_CALIBRATION is not set
+CONFIG_DRAM_START=0x20000000
+CONFIG_DRAM_SIZE=32768
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
 
-CONFIG_UART_BITS=8
-CONFIG_USART0_BITS=8
-CONFIG_USART1_BITS=8
-CONFIG_USART2_BITS=8
-CONFIG_USART3_BITS=8
+#
+# Boot options
+#
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
 
-CONFIG_UART_PARITY=0
-CONFIG_USART0_PARITY=0
-CONFIG_USART1_PARITY=0
-CONFIG_USART2_PARITY=0
-CONFIG_USART3_PARITY=0
+#
+# Board Selection
+#
+CONFIG_ARCH_BOARD_SAM3UEK=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD="sam3u-ek"
 
-CONFIG_UART_2STOP=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+#
+# Common Board Options
+#
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
+# CONFIG_ARCH_IRQBUTTONS is not set
 
 #
-# General build options
+# Board-Specific Options
 #
-CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=n
-CONFIG_MOTOROLA_SREC=n
-CONFIG_RAW_BINARY=y
 
 #
-# General OS setup
+# RTOS Features
 #
-CONFIG_USER_ENTRYPOINT="nx_main"
-CONFIG_DEBUG=n
-CONFIG_DEBUG_VERBOSE=n
-CONFIG_DEBUG_SYMBOLS=n
-CONFIG_DEBUG_GRAPHICS=n
-CONFIG_MM_REGIONS=3
-CONFIG_ARCH_LOWPUTC=y
+# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_MSEC_PER_TICK=10
 CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_INSTRUMENTATION=n
+# CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2010
 CONFIG_START_MONTH=4
 CONFIG_START_DAY=18
-CONFIG_GREGORIAN_TIME=n
-CONFIG_JULIAN_TIME=n
 CONFIG_DEV_CONSOLE=y
-CONFIG_DEV_LOWCONSOLE=n
-CONFIG_MUTEX_TYPES=n
-CONFIG_PRIORITY_INHERITANCE=n
-CONFIG_SEM_PREALLOCHOLDERS=0
-CONFIG_SEM_NNESTPRIO=0
-CONFIG_FDCLONE_DISABLE=n
-CONFIG_FDCLONE_STDIO=n
+# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PRIORITY_INHERITANCE is not set
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_NXFLAT=n
-CONFIG_SCHED_WORKQUEUE=n
-CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=1024
-CONFIG_SIG_SIGWORK=17
-
-#
-# The following can be used to disable categories of
-# APIs supported by the OS.  If the compiler supports
-# weak functions, then it should not be necessary to
-# disable functions unless you want to restrict usage
-# of those APIs.
-#
-# There are certain dependency relationships in these
-# features.
-#
-# o mq_notify logic depends on signals to awaken tasks
-#   waiting for queues to become full or empty.
-# o pthread_condtimedwait() depends on signals to wake
-#   up waiting tasks.
-#
-CONFIG_DISABLE_CLOCK=n
+# CONFIG_SCHED_WAITPID is not set
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+CONFIG_USER_ENTRYPOINT="nx_main"
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_CLOCK is not set
 CONFIG_DISABLE_POSIX_TIMERS=y
-CONFIG_DISABLE_PTHREAD=n
-CONFIG_DISABLE_SIGNALS=n
-CONFIG_DISABLE_MQUEUE=n
-CONFIG_DISABLE_MOUNTPOINT=y
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
 CONFIG_DISABLE_ENVIRON=y
-CONFIG_DISABLE_POLL=y
 
 #
-# Misc libc settings
+# Signal Numbers
 #
-CONFIG_NOPRINTF_FIELDWIDTH=n
-
-#
-# Allow for architecture optimized implementations
-#
-# The architecture can provide optimized versions of the
-# following to improve system performance
-#
-CONFIG_ARCH_MEMCPY=n
-CONFIG_ARCH_MEMCMP=n
-CONFIG_ARCH_MEMMOVE=n
-CONFIG_ARCH_MEMSET=n
-CONFIG_ARCH_STRCMP=n
-CONFIG_ARCH_STRCPY=n
-CONFIG_ARCH_STRNCPY=n
-CONFIG_ARCH_STRLEN=n
-CONFIG_ARCH_STRNLEN=n
-CONFIG_ARCH_BZERO=n
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
 
 #
 # Sizes of configurable things (0 disables)
@@ -229,8 +230,6 @@ CONFIG_NPTHREAD_KEYS=4
 CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NFILE_STREAMS=12
 CONFIG_NAME_MAX=32
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_NUNGET_CHARS=2
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
 CONFIG_MAX_WDOGPARMS=2
@@ -238,250 +237,413 @@ CONFIG_PREALLOC_WDOGS=4
 CONFIG_PREALLOC_TIMERS=4
 
 #
-# Framebuffer driver options
-CONFIG_FB_CMAP=n
-CONFIG_FB_HWCURSOR=n
-CONFIG_FB_HWCURSORIMAGE=n
-#CONFIG_FB_HWCURSORSIZE
-#CONFIG_FB_TRANSPARENCY
+# Stack and heap information
+#
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
 
 #
-# Filesystem configuration
+# Device Drivers
 #
-CONFIG_FS_FAT=n
-CONFIG_FS_ROMFS=n
+CONFIG_DISABLE_POLL=y
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_LOOP is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_PWM is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_RTC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_BCH is not set
+# CONFIG_INPUT is not set
+CONFIG_LCD=y
+
+#
+# Common LCD Settings
+#
+# CONFIG_LCD_NOGETRUN is not set
+CONFIG_LCD_MAXCONTRAST=1
+CONFIG_LCD_MAXPOWER=31
 
 #
-# Maintain legacy build behavior (revisit)
+# Graphic LCD Devices
 #
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
-CONFIG_MTD=y
+# CONFIG_LCD_P14201 is not set
+# CONFIG_LCD_NOKIA6100 is not set
+# CONFIG_LCD_MIO283QT2 is not set
+# CONFIG_LCD_UG9664HSWAG01 is not set
+# CONFIG_LCD_ST7567 is not set
+# CONFIG_LCD_UG2864AMBAG01 is not set
+# CONFIG_LCD_SSD1289 is not set
+CONFIG_LCD_LANDSCAPE=y
+# CONFIG_LCD_PORTRAIT is not set
+# CONFIG_LCD_RPORTRAIT is not set
+# CONFIG_LCD_RLANDSCAPE is not set
 
 #
-# SPI-based MMC/SD driver
+# Alphanumeric/Segment LCD Devices
 #
-CONFIG_MMCSD_NSLOTS=1
-CONFIG_MMCSD_READONLY=n
-CONFIG_MMCSD_SPICLOCK=12500000
+# CONFIG_LCD_LCD1602 is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MTD is not set
+# CONFIG_PIPES is not set
+# CONFIG_PM is not set
+# CONFIG_POWER is not set
+# CONFIG_SENSORS is not set
+CONFIG_SERIAL=y
+# CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_16550_UART is not set
+CONFIG_ARCH_HAVE_UART=y
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+CONFIG_UART_SERIAL_CONSOLE=y
+# CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
-# Block driver buffering
+# UART Configuration
 #
-CONFIG_FS_READAHEAD=n
-CONFIG_FS_WRITEBUFFER=n
+CONFIG_UART_RXBUFSIZE=256
+CONFIG_UART_TXBUFSIZE=256
+CONFIG_UART_BAUD=115200
+CONFIG_UART_BITS=8
+CONFIG_UART_PARITY=0
+CONFIG_UART_2STOP=0
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_WIRELESS is not set
 
 #
-# SDIO-based MMC/SD driver
+# System Logging Device Options
 #
-CONFIG_SDIO_DMA=n
-CONFIG_SDIO_BLOCKSETUP=y
-CONFIG_MMCSD_MMCSUPPORT=n
-CONFIG_MMCSD_HAVECARDDETECT=n
 
 #
-# TCP/IP and UDP support via uIP
+# System Logging
 #
-CONFIG_NET=n
-CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
-CONFIG_NET_TCP=n
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_UDP=n
-CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
-CONFIG_NET_ICMP=n
-CONFIG_NET_ICMP_PING=n
-#CONFIG_NET_PINGADDRCONF=0
-CONFIG_NET_STATISTICS=y
-#CONFIG_NET_RECEIVE_WINDOW=
-#CONFIG_NET_ARPTAB_SIZE=8
-CONFIG_NET_BROADCAST=n
+# CONFIG_RAMLOG is not set
 
 #
-# UIP Network Utilities
+# Networking Support
 #
-CONFIG_NET_DHCP_LIGHT=n
-CONFIG_NET_RESOLV_ENTRIES=4
+# CONFIG_NET is not set
 
 #
-# USB Device Configuration
+# File Systems
 #
-CONFIG_USBDEV=n
-CONFIG_USBDEV_ISOCHRONOUS=n
-CONFIG_USBDEV_DUALSPEED=n
-CONFIG_USBDEV_SELFPOWERED=y
-CONFIG_USBDEV_REMOTEWAKEUP=n
-CONFIG_USBDEV_MAXPOWER=100
-CONFIG_USBDEV_TRACE=n
-CONFIG_USBDEV_TRACE_NRECORDS=128
 
 #
-# USB Serial Device Configuration
+# File system configuration
 #
-CONFIG_PL2303=n
-CONFIG_PL2303_EPINTIN=1
-CONFIG_PL2303_EPBULKOUT=2
-CONFIG_PL2303_EPBULKIN=3
-CONFIG_PL2303_NWRREQS=4
-CONFIG_PL2303_NRDREQS=4
-CONFIG_PL2303_VENDORID=0x067b
-CONFIG_PL2303_PRODUCTID=0x2303
-CONFIG_PL2303_VENDORSTR="Nuttx"
-CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
-CONFIG_PL2303_RXBUFSIZE=512
-CONFIG_PL2303_TXBUFSIZE=512
+CONFIG_DISABLE_MOUNTPOINT=y
+# CONFIG_FS_RAMMAP is not set
 
 #
-# USB Storage Device Configuration
+# System Logging
 #
-CONFIG_USBMSC=n
-CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBMSC_REMOVABLE=y
+# CONFIG_SYSLOG_ENABLE is not set
+# CONFIG_SYSLOG is not set
 
 #
-# Graphics related configuration settings
+# Graphics Support
 #
 CONFIG_NX=y
-CONFIG_NX_MULTIUSER=n
+CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
+# CONFIG_NX_WRITEONLY is not set
+
+#
+# Supported Pixel Depths
+#
 CONFIG_NX_DISABLE_1BPP=y
 CONFIG_NX_DISABLE_2BPP=y
 CONFIG_NX_DISABLE_4BPP=y
 CONFIG_NX_DISABLE_8BPP=y
-CONFIG_NX_DISABLE_16BPP=n
+# CONFIG_NX_DISABLE_16BPP is not set
 CONFIG_NX_DISABLE_24BPP=y
 CONFIG_NX_DISABLE_32BPP=y
-CONFIG_NX_PACKEDMSFIRST=n
-CONFIG_NX_LCDDRIVER=y
-CONFIG_LCD_MAXPOWER=31
-CONFIG_LCD_MAXCONTRAST=1
+# CONFIG_NX_PACKEDMSFIRST is not set
+
+#
+# Input Devices
+#
 CONFIG_NX_MOUSE=y
 CONFIG_NX_KBD=y
-#CONFIG_NXTK_BORDERWIDTH=4
-#CONFIG_NXTK_BORDERCOLOR1
-#CONFIG_NXTK_BORDERCOLOR2
-CONFIG_NXTK_AUTORAISE=n
-CONFIG_NXFONT_SANS23X27=y
+
+#
+# Framed Window Borders
+#
+CONFIG_NXTK_BORDERWIDTH=4
+CONFIG_NXTK_BORDERCOLOR1=0
+CONFIG_NXTK_BORDERCOLOR2=0
+CONFIG_NXTK_BORDERCOLOR3=0
+# CONFIG_NXTK_AUTORAISE is not set
+
+#
+# Font Selections
+#
 CONFIG_NXFONTS_CHARBITS=7
-CONFIG_NX_BLOCKING=y
-CONFIG_NX_MXSERVERMSGS=32
-CONFIG_NX_MXCLIENTMSGS=16
+# CONFIG_NXFONT_MONO5X8 is not set
+# CONFIG_NXFONT_SANS17X22 is not set
+# CONFIG_NXFONT_SANS20X26 is not set
+CONFIG_NXFONT_SANS23X27=y
+# CONFIG_NXFONT_SANS22X29 is not set
+# CONFIG_NXFONT_SANS28X37 is not set
+# CONFIG_NXFONT_SANS39X48 is not set
+# CONFIG_NXFONT_SANS17X23B is not set
+# CONFIG_NXFONT_SANS20X27B is not set
+# CONFIG_NXFONT_SANS22X29B is not set
+# CONFIG_NXFONT_SANS28X37B is not set
+# CONFIG_NXFONT_SANS40X49B is not set
+# CONFIG_NXFONT_SERIF22X29 is not set
+# CONFIG_NXFONT_SERIF29X37 is not set
+# CONFIG_NXFONT_SERIF38X48 is not set
+# CONFIG_NXFONT_SERIF22X28B is not set
+# CONFIG_NXFONT_SERIF27X38B is not set
+# CONFIG_NXFONT_SERIF38X49B is not set
+# CONFIG_NXCONSOLE is not set
+
+#
+# NX Multi-user only options
+#
+# CONFIG_NX_MULTIUSER is not set
+
+#
+# Memory Management
+#
+# CONFIG_MM_MULTIHEAP is not set
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=3
+# CONFIG_GRAN is not set
 
 #
-# Settings for examples/uip
+# Audio Support
 #
-CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLES_UIP_DHCPC=n
+# CONFIG_AUDIO is not set
 
 #
-# Settings for examples/nettest
-CONFIG_EXAMPLES_NETTEST_SERVER=n
-CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLES_NETTEST_NOMAC=n
-CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
+# Binary Formats
+#
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
+# CONFIG_BUILTIN is not set
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
+
+#
+# Library Routines
+#
 
 #
-# Settings for examples/ostest
+# Standard C Library Options
 #
-CONFIG_EXAMPLES_OSTEST_LOOPS=1
-CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
-CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=y
+CONFIG_NUNGET_CHARS=2
+# CONFIG_LIBM is not set
+# CONFIG_NOPRINTF_FIELDWIDTH is not set
+# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIB_RAND_ORDER=1
+# CONFIG_EOL_IS_CR is not set
+# CONFIG_EOL_IS_LF is not set
+# CONFIG_EOL_IS_BOTH_CRLF is not set
+CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+# CONFIG_LIBC_STRERROR is not set
+# CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_ARCH_LOWPUTC=y
+CONFIG_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 
 #
-# Settings for apps/nshlib
+# Non-standard Library Support
 #
-CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_STRERROR=n
-CONFIG_NSH_LINELEN=64
-CONFIG_NSH_NESTDEPTH=3
-CONFIG_NSH_DISABLESCRIPT=n
-CONFIG_NSH_DISABLEBG=n
-CONFIG_NSH_ROMFSETC=n
-CONFIG_NSH_CONSOLE=y
-CONFIG_NSH_TELNET=n
-CONFIG_NSH_ARCHINIT=n
-CONFIG_NSH_IOBUFFER_SIZE=512
-CONFIG_NSH_DHCPC=n
-CONFIG_NSH_NOMAC=n
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-CONFIG_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_NSH_ROMFSDEVNO=0
-CONFIG_NSH_ROMFSSECTSIZE=64
-CONFIG_NSH_FATDEVNO=1
-CONFIG_NSH_FATSECTSIZE=512
-CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT="/tmp"
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
 
 #
-# Architecture-specific NSH options
+# Basic CXX Support
 #
-CONFIG_NSH_MMCSDSPIPORTNO=0
-CONFIG_NSH_MMCSDSLOTNO=0
-CONFIG_NSH_MMCSDMINOR=0
+# CONFIG_C99_BOOL8 is not set
+# CONFIG_HAVE_CXX is not set
 
 #
-# Settings for examples/usbserial
+# Application Configuration
 #
-CONFIG_EXAMPLES_USBSERIAL_INONLY=n
-CONFIG_EXAMPLES_USBSERIAL_OUTONLY=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
 
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
+#
+# Built-In Applications
+#
 
 #
-# Settings for examples/nx
+# Examples
 #
+# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_COMPOSITE is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+# CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MM is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
+# CONFIG_EXAMPLES_NSH is not set
+# CONFIG_EXAMPLES_NULL is not set
+CONFIG_EXAMPLES_NX=y
 CONFIG_EXAMPLES_NX_VPLANE=0
 CONFIG_EXAMPLES_NX_DEVNO=0
+# CONFIG_EXAMPLES_NX_DEFAULT_COLORS is not set
 CONFIG_EXAMPLES_NX_BGCOLOR=0x7b5d
 CONFIG_EXAMPLES_NX_COLOR1=0xe73f
 CONFIG_EXAMPLES_NX_COLOR2=0xdefb
 CONFIG_EXAMPLES_NX_TBCOLOR=0xad55
 CONFIG_EXAMPLES_NX_FONTCOLOR=0x0000
+CONFIG_EXAMPLES_NX_DEFAULT_FONT=y
 CONFIG_EXAMPLES_NX_BPP=16
-CONFIG_EXAMPLES_NX_RAWWINDOWS=n
-CONFIG_EXAMPLES_NX_STACKSIZE=2048
-CONFIG_EXAMPLES_NX_CLIENTPRIO=80
-CONFIG_EXAMPLES_NX_SERVERPRIO=120
-CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
+# CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
+# CONFIG_EXAMPLES_NX_EXTERNINIT is not set
+# CONFIG_EXAMPLES_NXCONSOLE is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXFLAT is not set
+# CONFIG_EXAMPLES_NXHELLO is not set
+# CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTEXT is not set
+# CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POLL is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_ROMFS is not set
+# CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
+# CONFIG_EXAMPLES_TELNETD is not set
+# CONFIG_EXAMPLES_THTTPD is not set
+# CONFIG_EXAMPLES_TIFF is not set
+# CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_UDP is not set
+# CONFIG_EXAMPLES_UIP is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
 
 #
-# Stack and heap information
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+
+#
+# Interpreters
+#
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_PCODE is not set
+
+#
+# Network Utilities
+#
+
+#
+# Networking Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_DHCPC is not set
+# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_FTPC is not set
+# CONFIG_NETUTILS_FTPD is not set
+# CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TELNETD is not set
+# CONFIG_NETUTILS_TFTPC is not set
+# CONFIG_NETUTILS_THTTPD is not set
+# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_WEBCLIENT is not set
+
+#
+# FreeModBus
+#
+# CONFIG_MODBUS is not set
+
+#
+# NSH Library
+#
+# CONFIG_NSH_LIBRARY is not set
+
+#
+# NxWidgets/NxWM
+#
+
+#
+# System NSH Add-Ons
+#
+
+#
+# Custom Free Memory Command
+#
+# CONFIG_SYSTEM_FREE is not set
+
+#
+# I2C tool
+#
+
+#
+# FLASH Program Installation
+#
+# CONFIG_SYSTEM_INSTALL is not set
+
+#
+# FLASH Erase-all Command
+#
+
+#
+# readline()
+#
+# CONFIG_SYSTEM_READLINE is not set
+
+#
+# Power Off
+#
+# CONFIG_SYSTEM_POWEROFF is not set
+
+#
+# RAMTRON
+#
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
 #
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
diff --git a/nuttx/configs/sam3u-ek/ostest/appconfig b/nuttx/configs/sam3u-ek/ostest/appconfig
deleted file mode 100644
index 687a5c13f..000000000
--- a/nuttx/configs/sam3u-ek/ostest/appconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-############################################################################
-# configs/sam3u-ek/ostest/appconfig
-#
-#   Copyright (C) 2011 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/ostest
-
diff --git a/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig
index 82510c7d4..9152a0528 100755..100644
--- a/nuttx/configs/sam3u-ek/ostest/defconfig
+++ b/nuttx/configs/sam3u-ek/ostest/defconfig
@@ -1,224 +1,225 @@
-############################################################################
-# configs/sam3u-ek/ostest/defconfig
-#
-#   Copyright (C) 2009-2010 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
-# POSPIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-#
-# Architecture Selection
 #
-CONFIG_ARCH="arm"
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+CONFIG_NUTTX_NEWCONFIG=y
+
+#
+# Build Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_HOST_LINUX=y
+# CONFIG_HOST_OSX is not set
+# CONFIG_HOST_WINDOWS is not set
+# CONFIG_HOST_OTHER is not set
+
+#
+# Build Configuration
+#
+# CONFIG_APPS_DIR="../apps"
+# CONFIG_BUILD_2PASS is not set
+
+#
+# Binary Output Formats
+#
+# CONFIG_RRLOAD_BINARY is not set
+# CONFIG_INTELHEX_BINARY is not set
+# CONFIG_MOTOROLA_SREC is not set
+CONFIG_RAW_BINARY=y
+
+#
+# Customize Header Files
+#
+# CONFIG_ARCH_STDBOOL_H is not set
+# CONFIG_ARCH_MATH_H is not set
+# CONFIG_ARCH_FLOAT_H is not set
+# CONFIG_ARCH_STDARG_H is not set
+
+#
+# Debug Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_SYMBOLS is not set
+
+#
+# System Type
+#
+# CONFIG_ARCH_8051 is not set
 CONFIG_ARCH_ARM=y
+# CONFIG_ARCH_AVR is not set
+# CONFIG_ARCH_HC is not set
+# CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_RGMP is not set
+# CONFIG_ARCH_SH is not set
+# CONFIG_ARCH_SIM is not set
+# CONFIG_ARCH_X86 is not set
+# CONFIG_ARCH_Z16 is not set
+# CONFIG_ARCH_Z80 is not set
+CONFIG_ARCH="arm"
+
+#
+# ARM Options
+#
+# CONFIG_ARCH_CHIP_C5471 is not set
+# CONFIG_ARCH_CHIP_CALYPSO is not set
+# CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_IMX is not set
+# CONFIG_ARCH_CHIP_KINETIS is not set
+# CONFIG_ARCH_CHIP_KL is not set
+# CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_LPC17XX is not set
+# CONFIG_ARCH_CHIP_LPC214X is not set
+# CONFIG_ARCH_CHIP_LPC2378 is not set
+# CONFIG_ARCH_CHIP_LPC31XX is not set
+# CONFIG_ARCH_CHIP_LPC43XX is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+CONFIG_ARCH_CHIP_SAM34=y
+# CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP="sam3u"
-CONFIG_ARCH_CHIP_AT91SAM3U4E=y
-CONFIG_ARCH_BOARD="sam3u-ek"
-CONFIG_ARCH_BOARD_SAM3UEK=y
-CONFIG_BOARD_LOOPSPERMSEC=4768
-CONFIG_DRAM_SIZE=32768
-CONFIG_DRAM_START=0x20000000
-CONFIG_ARCH_IRQPRIO=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CALIBRATION=n
-CONFIG_ARCH_DMA=n
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARMV7M_MPU is not set
 
 #
-# Identify toolchain and linker options
+# ARMV7M Configuration Options
 #
-CONFIG_SAM3U_CODESOURCERYW=n
-CONFIG_SAM3U_CODESOURCERYL=n
-CONFIG_SAM3U_DEVKITARM=n
-CONFIG_SAM3U_BUILDROOT=y
+CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set
+CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 
 #
-# Individual subsystems can be enabled:
+# AT91SAM3/SAM4 Configuration Options
 #
-CONFIG_SAM3U_DMA=n
-CONFIG_SAM3U_NAND=n
-CONFIG_SAM3U_HSMCI=n
-CONFIG_SAM3U_UART=y
-CONFIG_SAM3U_USART0=n
-CONFIG_SAM3U_USART1=n
-CONFIG_SAM3U_USART2=n
-CONFIG_SAM3U_USART3=n
-CONFIG_SAM3U_NAND=n
+CONFIG_ARCH_CHIP_AT91SAM3U4E=y
+CONFIG_ARCH_CHIP_SAM3U=y
 
 #
-# Some subsystems can be configured to operate in different ways..
-# The drivers need to know how to configure the subsystem.
+# AT91SAM3 Peripheral Support
 #
+# CONFIG_SAM34_DMA is not set
+# CONFIG_SAM34_NAND is not set
+# CONFIG_SAM34_HSMCI is not set
+CONFIG_SAM34_UART=y
+# CONFIG_SAM34_USART0 is not set
+# CONFIG_SAM34_USART1 is not set
+# CONFIG_SAM34_USART2 is not set
+# CONFIG_SAM34_USART3 is not set
 
-CONFIG_GPIOA_IRQ=n
-CONFIG_GPIOB_IRQ=n
-CONFIG_GPIOC_IRQ=n
-CONFIG_USART0_ISUART=y
-CONFIG_USART1_ISUART=y
-CONFIG_USART2_ISUART=y
-CONFIG_USART3_ISUART=y
+#
+# AT91SAM3 UART Configuration
+#
 
 #
-# SAM3U specific serial device driver settings
+# AT91SAM3 GPIO Interrupt Configuration
 #
-CONFIG_UART_SERIAL_CONSOLE=Y
-CONFIG_USART0_SERIAL_CONSOLE=n
-CONFIG_USART1_SERIAL_CONSOLE=n
-CONFIG_USART2_SERIAL_CONSOLE=n
-CONFIG_USART3_SERIAL_CONSOLE=n
+# CONFIG_GPIOA_IRQ is not set
+# CONFIG_GPIOB_IRQ is not set
+# CONFIG_GPIOC_IRQ is not set
 
-CONFIG_UART_TXBUFSIZE=256
-CONFIG_USART0_TXBUFSIZE=256
-CONFIG_USART1_TXBUFSIZE=256
-CONFIG_USART2_TXBUFSIZE=256
-CONFIG_USART3_TXBUFSIZE=256
+#
+# External Memory Configuration
+#
 
-CONFIG_UART_RXBUFSIZE=256
-CONFIG_USART0_RXBUFSIZE=256
-CONFIG_USART1_RXBUFSIZE=256
-CONFIG_USART2_RXBUFSIZE=256
-CONFIG_USART3_RXBUFSIZE=256
+#
+# Architecture Options
+#
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_IRQPRIO=y
+# CONFIG_CUSTOM_STACK is not set
+# CONFIG_ADDRENV is not set
+CONFIG_ARCH_HAVE_VFORK=y
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
 
-CONFIG_UART_BAUD=115200
-CONFIG_USART0_BAUD=115200
-CONFIG_USART1_BAUD=115200
-CONFIG_USART2_BAUD=115200
-CONFIG_USART3_BAUD=115200
+#
+# Board Settings
+#
+CONFIG_BOARD_LOOPSPERMSEC=4768
+# CONFIG_ARCH_CALIBRATION is not set
+CONFIG_DRAM_START=0x20000000
+CONFIG_DRAM_SIZE=32768
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
 
-CONFIG_UART_BITS=8
-CONFIG_USART0_BITS=8
-CONFIG_USART1_BITS=8
-CONFIG_USART2_BITS=8
-CONFIG_USART3_BITS=8
+#
+# Boot options
+#
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
 
-CONFIG_UART_PARITY=0
-CONFIG_USART0_PARITY=0
-CONFIG_USART1_PARITY=0
-CONFIG_USART2_PARITY=0
-CONFIG_USART3_PARITY=0
+#
+# Board Selection
+#
+CONFIG_ARCH_BOARD_SAM3UEK=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD="sam3u-ek"
 
-CONFIG_UART_2STOP=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+#
+# Common Board Options
+#
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
+# CONFIG_ARCH_IRQBUTTONS is not set
 
 #
-# General build options
+# Board-Specific Options
 #
-CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=n
-CONFIG_MOTOROLA_SREC=n
-CONFIG_RAW_BINARY=y
 
 #
-# General OS setup
+# RTOS Features
 #
-CONFIG_USER_ENTRYPOINT="ostest_main"
-CONFIG_DEBUG=n
-CONFIG_DEBUG_VERBOSE=n
-CONFIG_DEBUG_SYMBOLS=n
-CONFIG_MM_REGIONS=3
-CONFIG_ARCH_LOWPUTC=y
+# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_MSEC_PER_TICK=10
 CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_INSTRUMENTATION=n
+# CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=9
 CONFIG_START_DAY=21
-CONFIG_GREGORIAN_TIME=n
-CONFIG_JULIAN_TIME=n
 CONFIG_DEV_CONSOLE=y
-CONFIG_DEV_LOWCONSOLE=y
-CONFIG_MUTEX_TYPES=n
-CONFIG_PRIORITY_INHERITANCE=n
-CONFIG_SEM_PREALLOCHOLDERS=0
-CONFIG_SEM_NNESTPRIO=0
-CONFIG_FDCLONE_DISABLE=n
-CONFIG_FDCLONE_STDIO=n
+# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PRIORITY_INHERITANCE is not set
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_NXFLAT=n
-CONFIG_SCHED_WORKQUEUE=n
-CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=1024
-CONFIG_SIG_SIGWORK=17
-
-#
-# The following can be used to disable categories of
-# APIs supported by the OS.  If the compiler supports
-# weak functions, then it should not be necessary to
-# disable functions unless you want to restrict usage
-# of those APIs.
-#
-# There are certain dependency relationships in these
-# features.
-#
-# o mq_notify logic depends on signals to awaken tasks
-#   waiting for queues to become full or empty.
-# o pthread_condtimedwait() depends on signals to wake
-#   up waiting tasks.
-#
-CONFIG_DISABLE_CLOCK=n
-CONFIG_DISABLE_POSIX_TIMERS=n
-CONFIG_DISABLE_PTHREAD=n
-CONFIG_DISABLE_SIGNALS=n
-CONFIG_DISABLE_MQUEUE=n
-CONFIG_DISABLE_MOUNTPOINT=y
+# CONFIG_SCHED_WAITPID is not set
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+CONFIG_USER_ENTRYPOINT="ostest_main"
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_CLOCK is not set
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
 CONFIG_DISABLE_ENVIRON=y
-CONFIG_DISABLE_POLL=y
 
 #
-# Misc libc settings
+# Signal Numbers
 #
-CONFIG_NOPRINTF_FIELDWIDTH=n
-
-#
-# Allow for architecture optimized implementations
-#
-# The architecture can provide optimized versions of the
-# following to improve system performance
-#
-CONFIG_ARCH_MEMCPY=n
-CONFIG_ARCH_MEMCMP=n
-CONFIG_ARCH_MEMMOVE=n
-CONFIG_ARCH_MEMSET=n
-CONFIG_ARCH_STRCMP=n
-CONFIG_ARCH_STRCPY=n
-CONFIG_ARCH_STRNCPY=n
-CONFIG_ARCH_STRLEN=n
-CONFIG_ARCH_STRNLEN=n
-CONFIG_ARCH_BZERO=n
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
 
 #
 # Sizes of configurable things (0 disables)
@@ -229,8 +230,6 @@ CONFIG_NPTHREAD_KEYS=4
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NAME_MAX=32
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_NUNGET_CHARS=2
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
 CONFIG_MAX_WDOGPARMS=2
@@ -238,224 +237,320 @@ CONFIG_PREALLOC_WDOGS=4
 CONFIG_PREALLOC_TIMERS=4
 
 #
-# Filesystem configuration
+# Stack and heap information
 #
-CONFIG_FS_FAT=n
-CONFIG_FS_ROMFS=n
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
 
 #
-# Maintain legacy build behavior (revisit)
+# Device Drivers
+#
+CONFIG_DISABLE_POLL=y
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_LOOP is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_PWM is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_RTC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_BCH is not set
+# CONFIG_INPUT is not set
+# CONFIG_LCD is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MTD is not set
+# CONFIG_PIPES is not set
+# CONFIG_PM is not set
+# CONFIG_POWER is not set
+# CONFIG_SENSORS is not set
+CONFIG_SERIAL=y
+CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_16550_UART is not set
+CONFIG_ARCH_HAVE_UART=y
+CONFIG_MCU_SERIAL=y
+CONFIG_UART_SERIAL_CONSOLE=y
+# CONFIG_NO_SERIAL_CONSOLE is not set
+
+#
+# UART Configuration
+#
+CONFIG_UART_RXBUFSIZE=256
+CONFIG_UART_TXBUFSIZE=256
+CONFIG_UART_BAUD=115200
+CONFIG_UART_BITS=8
+CONFIG_UART_PARITY=0
+CONFIG_UART_2STOP=0
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_WIRELESS is not set
+
+#
+# System Logging Device Options
 #
 
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
-CONFIG_MTD=y
+#
+# System Logging
+#
+# CONFIG_RAMLOG is not set
 
 #
-# SPI-based MMC/SD driver
+# Networking Support
 #
-CONFIG_MMCSD_NSLOTS=1
-CONFIG_MMCSD_READONLY=n
-CONFIG_MMCSD_SPICLOCK=12500000
+# CONFIG_NET is not set
 
 #
-# Block driver buffering
+# File Systems
 #
-CONFIG_FS_READAHEAD=n
-CONFIG_FS_WRITEBUFFER=n
 
 #
-# SDIO-based MMC/SD driver
+# File system configuration
 #
-CONFIG_SDIO_DMA=n
-CONFIG_MMCSD_MMCSUPPORT=n
-CONFIG_MMCSD_HAVECARDDETECT=n
+CONFIG_DISABLE_MOUNTPOINT=y
+# CONFIG_FS_RAMMAP is not set
 
 #
-# TCP/IP and UDP support via uIP
+# System Logging
 #
-CONFIG_NET=n
-CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
-CONFIG_NET_TCP=n
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_UDP=n
-CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
-CONFIG_NET_ICMP=n
-CONFIG_NET_ICMP_PING=n
-#CONFIG_NET_PINGADDRCONF=0
-CONFIG_NET_STATISTICS=y
-#CONFIG_NET_RECEIVE_WINDOW=
-#CONFIG_NET_ARPTAB_SIZE=8
-CONFIG_NET_BROADCAST=n
+# CONFIG_SYSLOG_ENABLE is not set
+# CONFIG_SYSLOG is not set
 
 #
-# UIP Network Utilities
+# Graphics Support
 #
-CONFIG_NET_DHCP_LIGHT=n
-CONFIG_NET_RESOLV_ENTRIES=4
+# CONFIG_NX is not set
 
 #
-# USB Device Configuration
+# Memory Management
 #
-CONFIG_USBDEV=n
-CONFIG_USBDEV_ISOCHRONOUS=n
-CONFIG_USBDEV_DUALSPEED=n
-CONFIG_USBDEV_SELFPOWERED=y
-CONFIG_USBDEV_REMOTEWAKEUP=n
-CONFIG_USBDEV_MAXPOWER=100
-CONFIG_USBDEV_TRACE=n
-CONFIG_USBDEV_TRACE_NRECORDS=128
+# CONFIG_MM_MULTIHEAP is not set
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=3
+# CONFIG_GRAN is not set
 
 #
-# USB Serial Device Configuration
+# Audio Support
 #
-CONFIG_PL2303=n
-CONFIG_PL2303_EPINTIN=1
-CONFIG_PL2303_EPBULKOUT=2
-CONFIG_PL2303_EPBULKIN=3
-CONFIG_PL2303_NWRREQS=4
-CONFIG_PL2303_NRDREQS=4
-CONFIG_PL2303_VENDORID=0x067b
-CONFIG_PL2303_PRODUCTID=0x2303
-CONFIG_PL2303_VENDORSTR="Nuttx"
-CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
-CONFIG_PL2303_RXBUFSIZE=512
-CONFIG_PL2303_TXBUFSIZE=512
+# CONFIG_AUDIO is not set
 
 #
-# USB Storage Device Configuration
+# Binary Formats
 #
-CONFIG_USBMSC=n
-CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBMSC_REMOVABLE=y
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
+# CONFIG_BUILTIN is not set
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
 
 #
-# Graphics related configuration settings
-#
-CONFIG_NX=n
-CONFIG_NX_MULTIUSER=n
-CONFIG_NX_NPLANES=1
-CONFIG_NX_DISABLE_1BPP=y
-CONFIG_NX_DISABLE_2BPP=y
-CONFIG_NX_DISABLE_4BPP=y
-CONFIG_NX_DISABLE_8BPP=y
-CONFIG_NX_DISABLE_16BPP=n
-CONFIG_NX_DISABLE_24BPP=y
-CONFIG_NX_DISABLE_32BPP=y
-CONFIG_NX_PACKEDMSFIRST=n
-CONFIG_NX_LCDDRIVER=y
-CONFIG_LCD_MAXPOWER=31
-CONFIG_LCD_MAXCONTRAST=1
-CONFIG_NX_MOUSE=y
-CONFIG_NX_KBD=y
-#CONFIG_NXTK_BORDERWIDTH=4
-#CONFIG_NXTK_BORDERCOLOR1
-#CONFIG_NXTK_BORDERCOLOR2
-CONFIG_NXTK_AUTORAISE=n
-CONFIG_NXFONT_SANS=y
-CONFIG_NXFONTS_CHARBITS=7
-CONFIG_NX_BLOCKING=y
-CONFIG_NX_MXSERVERMSGS=32
-CONFIG_NX_MXCLIENTMSGS=16
-
-#
-# Settings for examples/uip
-#
-CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLES_UIP_DHCPC=n
-
-#
-# Settings for examples/nettest
-CONFIG_EXAMPLES_NETTEST_SERVER=n
-CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLES_NETTEST_NOMAC=n
-CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
-
-#
-# Settings for examples/ostest
-#
+# Library Routines
+#
+
+#
+# Standard C Library Options
+#
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=y
+CONFIG_NUNGET_CHARS=2
+# CONFIG_LIBM is not set
+# CONFIG_NOPRINTF_FIELDWIDTH is not set
+# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIB_RAND_ORDER=1
+# CONFIG_EOL_IS_CR is not set
+# CONFIG_EOL_IS_LF is not set
+# CONFIG_EOL_IS_BOTH_CRLF is not set
+CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+# CONFIG_LIBC_STRERROR is not set
+# CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_ARCH_LOWPUTC=y
+CONFIG_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+
+#
+# Non-standard Library Support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
+
+#
+# Basic CXX Support
+#
+# CONFIG_C99_BOOL8 is not set
+# CONFIG_HAVE_CXX is not set
+
+#
+# Application Configuration
+#
+
+#
+# Built-In Applications
+#
+
+#
+# Examples
+#
+# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_COMPOSITE is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+# CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MM is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
+# CONFIG_EXAMPLES_NSH is not set
+# CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
+# CONFIG_EXAMPLES_NXCONSOLE is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXFLAT is not set
+# CONFIG_EXAMPLES_NXHELLO is not set
+# CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTEXT is not set
+CONFIG_EXAMPLES_OSTEST=y
+# CONFIG_EXAMPLES_OSTEST_BUILTIN is not set
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
 CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
+CONFIG_EXAMPLES_OSTEST_RR_RANGE=10000
+CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
+# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POLL is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_ROMFS is not set
+# CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
+# CONFIG_EXAMPLES_TELNETD is not set
+# CONFIG_EXAMPLES_THTTPD is not set
+# CONFIG_EXAMPLES_TIFF is not set
+# CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_UDP is not set
+# CONFIG_EXAMPLES_UIP is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
 
 #
-# Settings for apps/nshlib
+# Graphics Support
 #
-CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_STRERROR=n
-CONFIG_NSH_LINELEN=64
-CONFIG_NSH_NESTDEPTH=3
-CONFIG_NSH_DISABLESCRIPT=n
-CONFIG_NSH_DISABLEBG=n
-CONFIG_NSH_ROMFSETC=n
-CONFIG_NSH_CONSOLE=y
-CONFIG_NSH_TELNET=n
-CONFIG_NSH_ARCHINIT=n
-CONFIG_NSH_IOBUFFER_SIZE=512
-CONFIG_NSH_DHCPC=n
-CONFIG_NSH_NOMAC=n
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-CONFIG_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_NSH_ROMFSDEVNO=0
-CONFIG_NSH_ROMFSSECTSIZE=64
-CONFIG_NSH_FATDEVNO=1
-CONFIG_NSH_FATSECTSIZE=512
-CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT="/tmp"
+# CONFIG_TIFF is not set
 
 #
-# Architecture-specific NSH options
+# Interpreters
 #
-CONFIG_NSH_MMCSDSPIPORTNO=0
-CONFIG_NSH_MMCSDSLOTNO=0
-CONFIG_NSH_MMCSDMINOR=0
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Settings for examples/usbserial
+# Network Utilities
 #
-CONFIG_EXAMPLES_USBSERIAL_INONLY=n
-CONFIG_EXAMPLES_USBSERIAL_OUTONLY=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
 
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
+#
+# Networking Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_DHCPC is not set
+# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_FTPC is not set
+# CONFIG_NETUTILS_FTPD is not set
+# CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TELNETD is not set
+# CONFIG_NETUTILS_TFTPC is not set
+# CONFIG_NETUTILS_THTTPD is not set
+# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
-# Stack and heap information
+# FreeModBus
+#
+# CONFIG_MODBUS is not set
+
+#
+# NSH Library
+#
+# CONFIG_NSH_LIBRARY is not set
+
+#
+# NxWidgets/NxWM
+#
+
+#
+# System NSH Add-Ons
+#
+
+#
+# Custom Free Memory Command
+#
+# CONFIG_SYSTEM_FREE is not set
+
+#
+# I2C tool
+#
+
+#
+# FLASH Program Installation
+#
+# CONFIG_SYSTEM_INSTALL is not set
+
+#
+# FLASH Erase-all Command
+#
+
+#
+# readline()
+#
+# CONFIG_SYSTEM_READLINE is not set
+
+#
+# Power Off
+#
+# CONFIG_SYSTEM_POWEROFF is not set
+
+#
+# RAMTRON
+#
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
 #
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
diff --git a/nuttx/configs/sam3u-ek/src/Makefile b/nuttx/configs/sam3u-ek/src/Makefile
index 258748a1d..8dbf0eae5 100644
--- a/nuttx/configs/sam3u-ek/src/Makefile
+++ b/nuttx/configs/sam3u-ek/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sam3u-ek/src/Makefile
 #
-#   Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009-2010, 2012-2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,12 +37,12 @@
 
 CFLAGS += -I$(TOPDIR)/sched
 
-ASRCS = 
+ASRCS =
 AOBJS = $(ASRCS:.S=$(OBJEXT))
 
 CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c
 
-ifeq ($(CONFIG_SAM3U_HSMCI),y)
+ifeq ($(CONFIG_SAM34_HSMCI),y)
 CSRCS += up_lcd.c
 endif
 
@@ -50,7 +50,7 @@ ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS += up_nsh.c
 endif
 
-ifeq ($(CONFIG_SAM3U_HSMCI),y)
+ifeq ($(CONFIG_SAM34_HSMCI),y)
 CSRCS += up_mmcsd.c
 endif
 
diff --git a/nuttx/configs/sam3u-ek/src/sam3uek_internal.h b/nuttx/configs/sam3u-ek/src/sam3u-ek.h
index 5b5138960..21e0e2649 100644
--- a/nuttx/configs/sam3u-ek/src/sam3uek_internal.h
+++ b/nuttx/configs/sam3u-ek/src/sam3u-ek.h
@@ -1,8 +1,7 @@
 /************************************************************************************
- * configs/sam3uek_eval/src/sam3uek_internal.h
- * arch/arm/src/board/sam3uek_internal.n
+ * configs/sam3uek_eval/src/sam3u-ek.h
  *
- *   Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __CONFIGS_SAM3U_EK_SRC_SAM3UEK_INTERNAL_H
-#define __CONFIGS_SAM3U_EK_SRC_SAM3UEK_INTERNAL_H
+#ifndef __CONFIGS_SAM3U_EK_SRC_SAM3U_EK_H
+#define __CONFIGS_SAM3U_EK_SRC_SAM3U_EK_H
 
 /************************************************************************************
  * Included Files
@@ -49,6 +48,8 @@
 #include <arch/irq.h>
 #include <nuttx/irq.h>
 
+#include "chip/sam_pinmap.h"
+
 /************************************************************************************
  * Definitions
  ************************************************************************************/
@@ -56,7 +57,7 @@
 /* External Memory Usage ************************************************************/
 /* LCD on CS2 */
 
-#define LCD_BASE     SAM3U_EXTCS2_BASE
+#define LCD_BASE              SAM_EXTCS2_BASE
 
 /* Touchscreen controller (TSC) */
 
@@ -142,7 +143,7 @@
 #define GPIO_TCS_IRQ  (GPIO_INPUT|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN24)
 #define GPIO_TCS_BUSY (GPIO_INPUT|GPIO_CFG_PULLUP|GPIO_PORT_PIOA|GPIO_PIN2)
 
-#define SAM3U_TCS_IRQ  SAM3U_IRQ_PA24
+#define SAM_TCS_IRQ   SAM_IRQ_PA24
 
 /* LEDs */
 
@@ -155,8 +156,8 @@
 #define GPIO_BUTTON1  (GPIO_INPUT|GPIO_CFG_PULLUP|GPIO_CFG_DEGLITCH|GPIO_PORT_PIOA|GPIO_PIN18)
 #define GPIO_BUTTON2  (GPIO_INPUT|GPIO_CFG_PULLUP|GPIO_CFG_DEGLITCH|GPIO_PORT_PIOA|GPIO_PIN19)
 
-#define IRQ_BUTTON1   SAM3U_IRQ_PA18
-#define IRQ_BUTTON2   SAM3U_IRQ_PA19
+#define IRQ_BUTTON1   SAM_IRQ_PA18
+#define IRQ_BUTTON2   SAM_IRQ_PA19
 
 /* SD Card Detect */
 
@@ -191,67 +192,75 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam3u_spiinitialize
+ * Name: sam_spiinitialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the SAM3U-EK board.
  *
  ************************************************************************************/
 
-extern void weak_function sam3u_spiinitialize(void);
+extern void weak_function sam_spiinitialize(void);
 
 /************************************************************************************
- * Name: sam3u_usbinitialize
+ * Name: sam_usbinitialize
  *
  * Description:
  *   Called to setup USB-related GPIO pins for the SAM3U-EK board.
  *
  ************************************************************************************/
 
-extern void weak_function sam3u_usbinitialize(void);
+extern void weak_function sam_usbinitialize(void);
 
 /****************************************************************************
- * Name: sam3u_hsmciinit
+ * Name: sam_hsmciinit
  *
  * Description:
- *   Initialize HSMCI support 
+ *   Initialize HSMCI support
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SAM3U_HSMCI
-extern int weak_function sam3u_hsmciinit(void);
+#ifdef CONFIG_SAM34_HSMCI
+extern int weak_function sam_hsmciinit(void);
 #else
-# define sam3u_hsmciinit()
+# define sam_hsmciinit()
+#endif
+
+/****************************************************************************
+ * Name: up_ledinit
+ ****************************************************************************/
+
+#ifdef CONFIG_ARCH_LEDS
+void up_ledinit(void);
 #endif
 
 /****************************************************************************
- * Name: sam3u_cardinserted
+ * Name: sam_cardinserted
  *
  * Description:
  *   Check if a card is inserted into the selected HSMCI slot
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SAM3U_HSMCI
-extern bool sam3u_cardinserted(unsigned char slot);
+#ifdef CONFIG_SAM34_HSMCI
+extern bool sam_cardinserted(unsigned char slot);
 #else
-#  define sam3u_cardinserted(slot) (false)
+#  define sam_cardinserted(slot) (false)
 #endif
 
 /****************************************************************************
- * Name: sam3u_writeprotected
+ * Name: sam_writeprotected
  *
  * Description:
  *   Check if a card is inserted into the selected HSMCI slot
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SAM3U_HSMCI
-extern bool sam3u_writeprotected(unsigned char slot);
+#ifdef CONFIG_SAM34_HSMCI
+extern bool sam_writeprotected(unsigned char slot);
 #else
-#  define sam3u_writeprotected(slot) (false)
+#  define sam_writeprotected(slot) (false)
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CONFIGS_SAM3U_EK_SRC_SAM3UEK_INTERNAL_H */
+#endif /* __CONFIGS_SAM3U_EK_SRC_SAM3U_EK_H */
 
diff --git a/nuttx/configs/sam3u-ek/src/up_boot.c b/nuttx/configs/sam3u-ek/src/up_boot.c
index 87e91f039..c7367fe02 100644
--- a/nuttx/configs/sam3u-ek/src/up_boot.c
+++ b/nuttx/configs/sam3u-ek/src/up_boot.c
@@ -1,8 +1,7 @@
 /************************************************************************************
  * configs/sam3u-ek/src/up_boot.c
- * arch/arm/src/board/up_boot.c
  *
- *   Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +44,7 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "sam3uek_internal.h"
+#include "sam3u-ek.h"
 
 /************************************************************************************
  * Definitions
@@ -60,7 +59,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam3u_boardinitialize
+ * Name: sam_boardinitialize
  *
  * Description:
  *   All SAM3U architectures must provide the following entry point.  This entry point
@@ -69,28 +68,28 @@
  *
  ************************************************************************************/
 
-void sam3u_boardinitialize(void)
+void sam_boardinitialize(void)
 {
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
-   * sam3u_spiinitialize() has been brought into the link.
+   * sam_spiinitialize() has been brought into the link.
    */
 
-#ifdef CONFIG_SAM3U_SPI
-  if (sam3u_spiinitialize)
+#ifdef CONFIG_SAM34_SPI
+  if (sam_spiinitialize)
     {
-      sam3u_spiinitialize();
+      sam_spiinitialize();
     }
 #endif
 
    /* Initialize USB if 1) USBDEV is selected, 2) the USB controller is not
-    * disabled, and 3) the weak function sam3u_usbinitialize() has been brought
+    * disabled, and 3) the weak function sam_usbinitialize() has been brought
     * into the build.
     */
 
-#if defined(CONFIG_USBDEV) && defined(CONFIG_SAM3U_USB)
-  if (sam3u_usbinitialize)
+#if defined(CONFIG_USBDEV) && defined(CONFIG_SAM34_USB)
+  if (sam_usbinitialize)
     {
-      sam3u_usbinitialize();
+      sam_usbinitialize();
     }
 #endif
 
@@ -101,13 +100,13 @@ void sam3u_boardinitialize(void)
 #endif
 
   /* Setup SD card-related PIOs if 1) HSMCI is selected and 2) the weak
-   * function sam3u_hsmciinit() has been brought into the build.
+   * function sam_hsmciinit() has been brought into the build.
     */
 
-#ifdef CONFIG_SAM3U_HSMCI
-  if (sam3u_hsmciinit)
+#ifdef CONFIG_SAM34_HSMCI
+  if (sam_hsmciinit)
     {
-      sam3u_hsmciinit();
+      sam_hsmciinit();
     }
 #endif
 }
diff --git a/nuttx/configs/sam3u-ek/src/up_buttons.c b/nuttx/configs/sam3u-ek/src/up_buttons.c
index a4b8e0fd7..f638fcb31 100644
--- a/nuttx/configs/sam3u-ek/src/up_buttons.c
+++ b/nuttx/configs/sam3u-ek/src/up_buttons.c
@@ -46,8 +46,8 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "sam3u_internal.h"
-#include "sam3uek_internal.h"
+#include "sam_gpio.h"
+#include "sam3u-ek.h"
 
 #ifdef CONFIG_ARCH_BUTTONS
 
@@ -93,9 +93,9 @@ static xcpt_t up_irqbuttonx(int irq, xcpt_t irqhandler, xcpt_t *store)
 
   /* Configure the interrupt */
 
-  sam3u_gpioirq(irq);
+  sam_gpioirq(irq);
   (void)irq_attach(irq, irqhandler);
-  sam3u_gpioirqenable(irq);
+  sam_gpioirqenable(irq);
   irqrestore(flags);
 
   /* Return the old button handler (so that it can be restored) */
@@ -121,8 +121,8 @@ static xcpt_t up_irqbuttonx(int irq, xcpt_t irqhandler, xcpt_t *store)
 
 void up_buttoninit(void)
 {
-  (void)sam3u_configgpio(GPIO_BUTTON1);
-  (void)sam3u_configgpio(GPIO_BUTTON2);
+  (void)sam_configgpio(GPIO_BUTTON1);
+  (void)sam_configgpio(GPIO_BUTTON2);
 }
 
 /************************************************************************************
@@ -140,8 +140,8 @@ uint8_t up_buttons(void)
 {
   uint8_t retval;
 
-  retval  = sam3u_gpioread(GPIO_BUTTON1) ? 0 : GPIO_BUTTON1;
-  retval |= sam3u_gpioread(GPIO_BUTTON2) ? 0 : GPIO_BUTTON2;
+  retval  = sam_gpioread(GPIO_BUTTON1) ? 0 : GPIO_BUTTON1;
+  retval |= sam_gpioread(GPIO_BUTTON2) ? 0 : GPIO_BUTTON2;
 
   return retval;
 }
diff --git a/nuttx/configs/sam3u-ek/src/up_lcd.c b/nuttx/configs/sam3u-ek/src/up_lcd.c
index de897ab9f..2190fb15e 100644
--- a/nuttx/configs/sam3u-ek/src/up_lcd.c
+++ b/nuttx/configs/sam3u-ek/src/up_lcd.c
@@ -2,7 +2,7 @@
  * configs/sam3u-ek/src/up_lcd.c
  * arch/arm/src/board/up_lcd.c
  *
- *   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -125,10 +125,10 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "sam3u_pmc.h"
-#include "sam3u_smc.h"
-#include "sam3u_internal.h"
-#include "sam3uek_internal.h"
+#include "sam_gpio.h"
+#include "chip/sam_pmc.h"
+#include "chip/sam_smc.h"
+#include "sam3u-ek.h"
 
 /**************************************************************************************
  * Pre-processor Definitions
@@ -288,7 +288,7 @@
 
 /* This structure describes the state of this driver */
 
-struct sam3u_dev_s
+struct sam_dev_s
 {
   /* Publically visible device structure */
 
@@ -305,36 +305,36 @@ struct sam3u_dev_s
 
 /* Low-level HX834x Register access */
 
-static void sam3u_putreg(uint16_t reg,  uint16_t data);
-static uint16_t sam3u_getreg(uint16_t reg);
+static void sam_putreg(uint16_t reg,  uint16_t data);
+static uint16_t sam_getreg(uint16_t reg);
 
 /* Misc. LCD Helper Functions */
 
-static void sam3u_setcursor(fb_coord_t row, fb_coord_t col);
-static inline void sam3u_wrsetup(void);
-static inline void sam3u_wrram(uint16_t color);
-static inline uint16_t sam3u_rdram(void);
-static void sam3u_lcdon(void);
-static void sam3u_lcdoff(void);
+static void sam_setcursor(fb_coord_t row, fb_coord_t col);
+static inline void sam_wrsetup(void);
+static inline void sam_wrram(uint16_t color);
+static inline uint16_t sam_rdram(void);
+static void sam_lcdon(void);
+static void sam_lcdoff(void);
 
 #ifdef CONFIG_DEBUG_GRAPHICS
-static void sam3u_dumpreg(uint8_t startreg, uint8_t endreg);
+static void sam_dumpreg(uint8_t startreg, uint8_t endreg);
 #else
-#  define sam3u_dumpreg(startreg,endreg)
+#  define sam_dumpreg(startreg,endreg)
 #endif
 
 /* LCD Data Transfer Methods */
 
-static int sam3u_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
+static int sam_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
              size_t npixels);
-static int sam3u_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
+static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
              size_t npixels);
 
 /* LCD Configuration */
 
-static int sam3u_getvideoinfo(FAR struct lcd_dev_s *dev,
+static int sam_getvideoinfo(FAR struct lcd_dev_s *dev,
              FAR struct fb_videoinfo_s *vinfo);
-static int sam3u_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
+static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
              FAR struct lcd_planeinfo_s *pinfo);
 
 /* LCD RGB Mapping */
@@ -351,10 +351,10 @@ static int sam3u_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
 
 /* LCD Specific Controls */
 
-static int sam3u_getpower(struct lcd_dev_s *dev);
-static int sam3u_setpower(struct lcd_dev_s *dev, int power);
-static int sam3u_getcontrast(struct lcd_dev_s *dev);
-static int sam3u_setcontrast(struct lcd_dev_s *dev, unsigned int contrast);
+static int sam_getpower(struct lcd_dev_s *dev);
+static int sam_setpower(struct lcd_dev_s *dev, int power);
+static int sam_getcontrast(struct lcd_dev_s *dev);
+static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast);
 
 /**************************************************************************************
  * Private Data
@@ -385,34 +385,34 @@ static const struct fb_videoinfo_s g_videoinfo =
 
 /* This is the standard, NuttX Plane information object */
 
-static const struct lcd_planeinfo_s g_planeinfo = 
+static const struct lcd_planeinfo_s g_planeinfo =
 {
-  .putrun = sam3u_putrun,          /* Put a run into LCD memory */
-  .getrun = sam3u_getrun,          /* Get a run from LCD memory */
+  .putrun = sam_putrun,            /* Put a run into LCD memory */
+  .getrun = sam_getrun,            /* Get a run from LCD memory */
   .buffer = (uint8_t*)g_runbuffer, /* Run scratch buffer */
   .bpp    = SAM3UEK_BPP,           /* Bits-per-pixel */
 };
 
 /* This is the standard, NuttX LCD driver object */
 
-static struct sam3u_dev_s g_lcddev_s = 
+static struct sam_dev_s g_lcddev_s =
 {
   .dev =
   {
     /* LCD Configuration */
- 
-    .getvideoinfo = sam3u_getvideoinfo,
-    .getplaneinfo = sam3u_getplaneinfo,
+
+    .getvideoinfo = sam_getvideoinfo,
+    .getplaneinfo = sam_getplaneinfo,
 
     /* LCD RGB Mapping -- Not supported */
     /* Cursor Controls -- Not supported */
 
     /* LCD Specific Controls */
 
-    .getpower     = sam3u_getpower,
-    .setpower     = sam3u_setpower,
-    .getcontrast  = sam3u_getcontrast,
-    .setcontrast  = sam3u_setcontrast,
+    .getpower     = sam_getpower,
+    .setpower     = sam_setpower,
+    .getcontrast  = sam_getcontrast,
+    .setcontrast  = sam_setcontrast,
   },
 };
 
@@ -421,14 +421,14 @@ static struct sam3u_dev_s g_lcddev_s =
  **************************************************************************************/
 
 /**************************************************************************************
- * Name:  sam3u_putreg
+ * Name:  sam_putreg
  *
  * Description:
  *   Write to a HX834x register
  *
  **************************************************************************************/
 
-static void sam3u_putreg(uint16_t reg,  uint16_t data)
+static void sam_putreg(uint16_t reg,  uint16_t data)
 {
   regdbg("base: %08x RS: %04x data: %04x\n", LCD_BASE, LCD_BASE + HX843X_LCD_RS, data);
   putreg16(reg, LCD_BASE);
@@ -436,14 +436,14 @@ static void sam3u_putreg(uint16_t reg,  uint16_t data)
 }
 
 /**************************************************************************************
- * Name:  sam3u_getreg
+ * Name:  sam_getreg
  *
  * Description:
  *   Read from a HX834x register
  *
  **************************************************************************************/
 
-static uint16_t sam3u_getreg(uint16_t reg)
+static uint16_t sam_getreg(uint16_t reg)
 {
   uint16_t data;
   putreg16(reg, LCD_BASE);
@@ -453,14 +453,14 @@ static uint16_t sam3u_getreg(uint16_t reg)
 }
 
 /**************************************************************************************
- * Name:  sam3u_setcursor
+ * Name:  sam_setcursor
  *
  * Description:
  *   Set the LCD cursor position.
  *
  **************************************************************************************/
 
-static void sam3u_setcursor(fb_coord_t row, fb_coord_t col)
+static void sam_setcursor(fb_coord_t row, fb_coord_t col)
 {
   uint8_t  x1;
   uint8_t  x2;
@@ -477,90 +477,90 @@ static void sam3u_setcursor(fb_coord_t row, fb_coord_t col)
 
   /* Then set the cursor position */
 
-  sam3u_putreg(HX8347_R02H, x2);        /* column high */
-  sam3u_putreg(HX8347_R03H, x1);        /* column low */
-  sam3u_putreg(HX8347_R06H, y2);        /* row high */
-  sam3u_putreg(HX8347_R07H, y1);        /* row low */
+  sam_putreg(HX8347_R02H, x2);        /* column high */
+  sam_putreg(HX8347_R03H, x1);        /* column low */
+  sam_putreg(HX8347_R06H, y2);        /* row high */
+  sam_putreg(HX8347_R07H, y1);        /* row low */
 }
 
 /**************************************************************************************
- * Name:  sam3u_wrsetup
+ * Name:  sam_wrsetup
  *
  * Description:
  *   Set up for a GRAM write operation.
  *
  **************************************************************************************/
 
-static inline void sam3u_wrsetup(void)
+static inline void sam_wrsetup(void)
 {
   putreg16(HX8347_R22H, LCD_BASE);
 }
 
 /**************************************************************************************
- * Name: sam3u_wrram
+ * Name: sam_wrram
  *
  * Description:
  *   Write to the 16-bit GRAM register
  *
  **************************************************************************************/
 
-static inline void sam3u_wrram(uint16_t color)
+static inline void sam_wrram(uint16_t color)
 {
   putreg16(color, LCD_BASE + HX843X_LCD_RS);
 }
 
 /**************************************************************************************
- * Name: sam3u_rdram
+ * Name: sam_rdram
  *
  * Description:
  *   Read from the 16-bit GRAM register
  *
  **************************************************************************************/
 
-static inline uint16_t sam3u_rdram(void)
+static inline uint16_t sam_rdram(void)
 {
   return getreg16(LCD_BASE + HX843X_LCD_RS);
 }
 
 /**************************************************************************************
- * Name:  sam3u_lcdon
+ * Name:  sam_lcdon
  *
  * Description:
  *   Turn the LCD on
  *
  **************************************************************************************/
 
-static void sam3u_lcdon(void)
+static void sam_lcdon(void)
 {
   /* Display ON Setting */
 
   gvdbg("ON\n");
-  sam3u_putreg(HX8347_R90H, 0x7f);      /* SAP=0111 1111 */
-  sam3u_putreg(HX8347_R26H, 0x04);      /* GON=0 DTE=0 D=01 */
+  sam_putreg(HX8347_R90H, 0x7f);      /* SAP=0111 1111 */
+  sam_putreg(HX8347_R26H, 0x04);      /* GON=0 DTE=0 D=01 */
   up_mdelay(100);
-  sam3u_putreg(HX8347_R26H, 0x24);      /* GON=1 DTE=0 D=01 */
-  sam3u_putreg(HX8347_R26H, 0x2c);      /* GON=1 DTE=0 D=11 */
+  sam_putreg(HX8347_R26H, 0x24);      /* GON=1 DTE=0 D=01 */
+  sam_putreg(HX8347_R26H, 0x2c);      /* GON=1 DTE=0 D=11 */
   up_mdelay(100);
-  sam3u_putreg(HX8347_R26H, 0x3c);      /* GON=1 DTE=1 D=11 */
+  sam_putreg(HX8347_R26H, 0x3c);      /* GON=1 DTE=1 D=11 */
 }
 
 /**************************************************************************************
- * Name:  sam3u_lcdoff
+ * Name:  sam_lcdoff
  *
  * Description:
  *   Turn the LCD off
  *
  **************************************************************************************/
 
-static void sam3u_lcdoff(void)
+static void sam_lcdoff(void)
 {
   gvdbg("OFF\n");
-  sam3u_putreg(HX8347_R90H, 0x00);      /* SAP=0000 0000 */
-  sam3u_putreg(HX8347_R26H, 0x00);      /* GON=0 DTE=0 D=00 */
+  sam_putreg(HX8347_R90H, 0x00);      /* SAP=0000 0000 */
+  sam_putreg(HX8347_R26H, 0x00);      /* GON=0 DTE=0 D=00 */
 }
 
 /**************************************************************************************
- * Name:  sam3u_dumpreg
+ * Name:  sam_dumpreg
  *
  * Description:
  *   Dump a range of LCD registers.
@@ -568,21 +568,21 @@ static void sam3u_lcdoff(void)
  **************************************************************************************/
 
 #ifdef CONFIG_DEBUG_GRAPHICS
-static void sam3u_dumpreg(uint8_t startreg, uint8_t endreg)
+static void sam_dumpreg(uint8_t startreg, uint8_t endreg)
 {
   uint16_t value;
   uint8_t  addr;
 
   for (addr = startreg; addr <= endreg; addr++)
     {
-      value = sam3u_getreg(addr);
+      value = sam_getreg(addr);
       gdbg(" %02x: %04x\n", addr, value);
     }
 }
 #endif
 
 /**************************************************************************************
- * Name:  sam3u_putrun
+ * Name:  sam_putrun
  *
  * Description:
  *   This method can be used to write a partial raster line to the LCD:
@@ -595,8 +595,8 @@ static void sam3u_dumpreg(uint8_t startreg, uint8_t endreg)
  *
  **************************************************************************************/
 
-static int sam3u_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
-                        size_t npixels)
+static int sam_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer,
+                      size_t npixels)
 {
   uint16_t *run = (uint16_t*)buffer;
   unsigned int i;
@@ -609,8 +609,8 @@ static int sam3u_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
 #ifdef CONFIG_LCD_PORTRAIT
   /* Set up to write the run. */
 
-  sam3u_setcursor(row, col);
-  sam3u_wrsetup();
+  sam_setcursor(row, col);
+  sam_wrsetup();
 
   /* Write the run to GRAM. */
 
@@ -618,7 +618,7 @@ static int sam3u_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
     {
       /* Write the pixel pixel to GRAM */
 
-      sam3u_wrram(*run++);
+      sam_wrram(*run++);
     }
 #else
   /* Write the run to GRAM.  Because rows and colums are swapped, we need to reset
@@ -636,19 +636,19 @@ static int sam3u_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
        *   col: 0-319 maps to y: 319-0
        */
 
-      sam3u_setcursor(col--, row);
-      sam3u_wrsetup();
+      sam_setcursor(col--, row);
+      sam_wrsetup();
 
       /* Write the pixel pixel to GRAM */
 
-      sam3u_wrram(*run++);
+      sam_wrram(*run++);
     }
 #endif
   return OK;
 }
 
 /**************************************************************************************
- * Name:  sam3u_getrun
+ * Name:  sam_getrun
  *
  * Description:
  *   This method can be used to read a partial raster line from the LCD:
@@ -661,8 +661,8 @@ static int sam3u_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffe
  *
  **************************************************************************************/
 
-static int sam3u_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
-                        size_t npixels)
+static int sam_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
+                      size_t npixels)
 {
   uint16_t *run = (uint16_t*)buffer;
   unsigned int i;
@@ -675,7 +675,7 @@ static int sam3u_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 #ifdef CONFIG_LCD_PORTRAIT
   /* Set up to read the run */
 
-  sam3u_setcursor(row, col);
+  sam_setcursor(row, col);
 
   /* Read the run from GRAM. */
 
@@ -683,7 +683,7 @@ static int sam3u_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
     {
       /* Read the next pixel */
 
-      *run++ = sam3u_rdram();
+      *run++ = sam_rdram();
     }
 #else
   /* Read the run from GRAM  Because rows and colums are swapped, we need to reset
@@ -701,23 +701,23 @@ static int sam3u_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
        *   col: 0-319 maps to y: 319-0
        */
 
-      sam3u_setcursor(col--, row);
-      *run++ = sam3u_rdram();
+      sam_setcursor(col--, row);
+      *run++ = sam_rdram();
     }
 #endif
   return OK;
 }
 
 /**************************************************************************************
- * Name:  sam3u_getvideoinfo
+ * Name:  sam_getvideoinfo
  *
  * Description:
  *   Get information about the LCD video controller configuration.
  *
  **************************************************************************************/
 
-static int sam3u_getvideoinfo(FAR struct lcd_dev_s *dev,
-                              FAR struct fb_videoinfo_s *vinfo)
+static int sam_getvideoinfo(FAR struct lcd_dev_s *dev,
+                            FAR struct fb_videoinfo_s *vinfo)
 {
   DEBUGASSERT(dev && vinfo);
   gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n",
@@ -727,15 +727,15 @@ static int sam3u_getvideoinfo(FAR struct lcd_dev_s *dev,
 }
 
 /**************************************************************************************
- * Name:  sam3u_getplaneinfo
+ * Name:  sam_getplaneinfo
  *
  * Description:
  *   Get information about the configuration of each LCD color plane.
  *
  **************************************************************************************/
 
-static int sam3u_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
-                              FAR struct lcd_planeinfo_s *pinfo)
+static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
+                            FAR struct lcd_planeinfo_s *pinfo)
 {
   DEBUGASSERT(dev && pinfo && planeno == 0);
   gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp);
@@ -744,7 +744,7 @@ static int sam3u_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
 }
 
 /**************************************************************************************
- * Name:  sam3u_getpower
+ * Name:  sam_getpower
  *
  * Description:
  *   Get the LCD panel power status (0: full off - CONFIG_LCD_MAXPOWER: full on. On
@@ -752,16 +752,16 @@ static int sam3u_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno,
  *
  **************************************************************************************/
 
-static int sam3u_getpower(struct lcd_dev_s *dev)
+static int sam_getpower(struct lcd_dev_s *dev)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s *)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s *)dev;
   DEBUGASSERT(dev);
   gvdbg("power: %d\n", priv->power);
   return priv->power;
 }
 
 /**************************************************************************************
- * Name:  sam3u_setpower
+ * Name:  sam_setpower
  *
  * Description:
  *   Enable/disable LCD panel power (0: full off - CONFIG_LCD_MAXPOWERL: full on). On
@@ -775,9 +775,9 @@ static int sam3u_getpower(struct lcd_dev_s *dev)
  *
  **************************************************************************************/
 
-static int sam3u_setpower(struct lcd_dev_s *dev, int power)
+static int sam_setpower(struct lcd_dev_s *dev, int power)
 {
-  struct sam3u_dev_s *priv = (struct sam3u_dev_s *)dev;
+  struct sam_dev_s *priv = (struct sam_dev_s *)dev;
   unsigned int i;
 
   gvdbg("power: %d\n", power);
@@ -785,7 +785,7 @@ static int sam3u_setpower(struct lcd_dev_s *dev, int power)
 
   /* Switch off backlight */
 
-  sam3u_gpiowrite(GPIO_LCD_BKL, false);
+  sam_gpiowrite(GPIO_LCD_BKL, false);
 
   /* For for at least 500uS to drain the charge pump */
 
@@ -795,12 +795,12 @@ static int sam3u_setpower(struct lcd_dev_s *dev, int power)
 
   for (i = 0; i < power; i++)
     {
-      sam3u_gpiowrite(GPIO_LCD_BKL, false);
-      sam3u_gpiowrite(GPIO_LCD_BKL, false);
-      sam3u_gpiowrite(GPIO_LCD_BKL, false);
-      sam3u_gpiowrite(GPIO_LCD_BKL, true);
-      sam3u_gpiowrite(GPIO_LCD_BKL, true);
-      sam3u_gpiowrite(GPIO_LCD_BKL, true);
+      sam_gpiowrite(GPIO_LCD_BKL, false);
+      sam_gpiowrite(GPIO_LCD_BKL, false);
+      sam_gpiowrite(GPIO_LCD_BKL, false);
+      sam_gpiowrite(GPIO_LCD_BKL, true);
+      sam_gpiowrite(GPIO_LCD_BKL, true);
+      sam_gpiowrite(GPIO_LCD_BKL, true);
     }
 
   /* This delay seems to be required... perhaps because of the big current jump? */
@@ -815,28 +815,28 @@ static int sam3u_setpower(struct lcd_dev_s *dev, int power)
 }
 
 /**************************************************************************************
- * Name:  sam3u_getcontrast
+ * Name:  sam_getcontrast
  *
  * Description:
  *   Get the current contrast setting (0-CONFIG_LCD_MAXCONTRAST).
  *
  **************************************************************************************/
 
-static int sam3u_getcontrast(struct lcd_dev_s *dev)
+static int sam_getcontrast(struct lcd_dev_s *dev)
 {
   gvdbg("Not implemented\n");
   return -ENOSYS;
 }
 
 /**************************************************************************************
- * Name:  sam3u_getcontrast
+ * Name:  sam_getcontrast
  *
  * Description:
  *   Set LCD panel contrast (0-CONFIG_LCD_MAXCONTRAST).
  *
  **************************************************************************************/
 
-static int sam3u_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
+static int sam_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 {
   gvdbg("contrast: %d\n", contrast);
   return -ENOSYS;
@@ -868,71 +868,71 @@ int up_lcdinitialize(void)
 
   /* Enable LCD EXTCS2 pins */
 
-  sam3u_configgpio(GPIO_LCD_NCS2);
-  sam3u_configgpio(GPIO_LCD_RS);
-  sam3u_configgpio(GPIO_LCD_NWE);
-  sam3u_configgpio(GPIO_LCD_NRD);
-
-  sam3u_configgpio(GPIO_LCD_D0);
-  sam3u_configgpio(GPIO_LCD_D1);
-  sam3u_configgpio(GPIO_LCD_D2);
-  sam3u_configgpio(GPIO_LCD_D3);
-  sam3u_configgpio(GPIO_LCD_D4);
-  sam3u_configgpio(GPIO_LCD_D5);
-  sam3u_configgpio(GPIO_LCD_D6);
-  sam3u_configgpio(GPIO_LCD_D7);
-  sam3u_configgpio(GPIO_LCD_D8);
-  sam3u_configgpio(GPIO_LCD_D9);
-  sam3u_configgpio(GPIO_LCD_D10);
-  sam3u_configgpio(GPIO_LCD_D11);
-  sam3u_configgpio(GPIO_LCD_D12);
-  sam3u_configgpio(GPIO_LCD_D13);
-  sam3u_configgpio(GPIO_LCD_D14);
-  sam3u_configgpio(GPIO_LCD_D15);
+  sam_configgpio(GPIO_LCD_NCS2);
+  sam_configgpio(GPIO_LCD_RS);
+  sam_configgpio(GPIO_LCD_NWE);
+  sam_configgpio(GPIO_LCD_NRD);
+
+  sam_configgpio(GPIO_LCD_D0);
+  sam_configgpio(GPIO_LCD_D1);
+  sam_configgpio(GPIO_LCD_D2);
+  sam_configgpio(GPIO_LCD_D3);
+  sam_configgpio(GPIO_LCD_D4);
+  sam_configgpio(GPIO_LCD_D5);
+  sam_configgpio(GPIO_LCD_D6);
+  sam_configgpio(GPIO_LCD_D7);
+  sam_configgpio(GPIO_LCD_D8);
+  sam_configgpio(GPIO_LCD_D9);
+  sam_configgpio(GPIO_LCD_D10);
+  sam_configgpio(GPIO_LCD_D11);
+  sam_configgpio(GPIO_LCD_D12);
+  sam_configgpio(GPIO_LCD_D13);
+  sam_configgpio(GPIO_LCD_D14);
+  sam_configgpio(GPIO_LCD_D15);
 
 #ifdef CONFIG_LCD_REGDEBUG
-  sam3u_dumpgpio(GPIO_PORT_PIOB, "PORTB");
-  sam3u_dumpgpio(GPIO_PORT_PIOC, "PORTC");
+  sam_dumpgpio(GPIO_PORT_PIOB, "PORTB");
+  sam_dumpgpio(GPIO_PORT_PIOC, "PORTC");
 #endif
 
   /* Configure LCD Backlight Pin */
 
-  sam3u_configgpio(GPIO_LCD_D15);
+  sam_configgpio(GPIO_LCD_D15);
 
   /* Enable SMC peripheral clock */
 
-  putreg32((1 << SAM3U_PID_SMC), SAM3U_PMC_PCER);
-  regdbg("PMC PCSR: %08x SMC: %08x\n", getreg32(SAM3U_PMC_PCSR), (1 << SAM3U_PID_SMC));
+  putreg32((1 << SAM_PID_SMC), SAM_PMC_PCER);
+  regdbg("PMC PCSR: %08x SMC: %08x\n", getreg32(SAM_PMC_PCSR), (1 << SAM_PID_SMC));
 
   /* Configure SMC CS2 */
 
   regval = (4 << SMCCS_SETUP_NWESETUP_SHIFT) | (2 << SMCCS_SETUP_NCSWRSETUP_SHIFT) |
            (4 << SMCCS_SETUP_NRDSETUP_SHIFT) | (2 << SMCCS_SETUP_NCSRDSETUP_SHIFT);
-  putreg32(regval, SAM3U_SMCCS_SETUP(2));
+  putreg32(regval, SAM_SMCCS_SETUP(2));
 
   regval = (5 << SMCCS_PULSE_NWEPULSE_SHIFT) | (18 << SMCCS_PULSE_NCSWRPULSE_SHIFT) |
            (5 << SMCCS_PULSE_RDPULSE_SHIFT)  | (18 << SMCCS_PULSE_NCSRDPULSE_SHIFT);
-  putreg32(regval, SAM3U_SMCCS_PULSE(2));
+  putreg32(regval, SAM_SMCCS_PULSE(2));
 
   regval = (22 << SMCCS_CYCLE_NWECYCLE_SHIFT) | (22 << SMCCS_CYCLE_NRDCYCLE_SHIFT);
-  putreg32(regval, SAM3U_SMCCS_CYCLE(2));
+  putreg32(regval, SAM_SMCCS_CYCLE(2));
 
-  regval  = getreg32(SAM3U_SMCCS_MODE(2));
+  regval  = getreg32(SAM_SMCCS_MODE(2));
   regval &= ~(SMCCS_MODE_DBW_MASK | SMCCS_MODE_PMEN);
   regval |= (SMCCS_MODE_READMODE)  | (SMCCS_MODE_WRITEMODE) | (SMCCS_MODE_DBW_16BITS);
-  putreg32(regval, SAM3U_SMCCS_MODE(2));
+  putreg32(regval, SAM_SMCCS_MODE(2));
 
   regdbg("SMC SETUP[%08x]: %08x PULSE[%08x]: %08x\n",
-         SAM3U_SMCCS_SETUP(2), getreg32(SAM3U_SMCCS_SETUP(2)),
-         SAM3U_SMCCS_PULSE(2), getreg32(SAM3U_SMCCS_PULSE(2)));
+         SAM_SMCCS_SETUP(2), getreg32(SAM_SMCCS_SETUP(2)),
+         SAM_SMCCS_PULSE(2), getreg32(SAM_SMCCS_PULSE(2)));
   regdbg("    CYCLE[%08x]: %08x MODE[%08x]:  %08x\n",
-         SAM3U_SMCCS_CYCLE(2), getreg32(SAM3U_SMCCS_CYCLE(2)),
-         SAM3U_SMCCS_MODE(2),  getreg32(SAM3U_SMCCS_MODE(2)));
+         SAM_SMCCS_CYCLE(2), getreg32(SAM_SMCCS_CYCLE(2)),
+         SAM_SMCCS_MODE(2),  getreg32(SAM_SMCCS_MODE(2)));
 
   /* Check HX8347 Chip ID */
 
 #ifdef CONFIG_DEBUG_GRAPHICS
-  hxregval = sam3u_getreg(HX8347_R67H);
+  hxregval = sam_getreg(HX8347_R67H);
   gvdbg("Chip ID: %04x\n", hxregval);
   if (hxregval != HX8347_CHIPID)
     {
@@ -945,86 +945,86 @@ int up_lcdinitialize(void)
 
   /* Start internal OSC */
 
-  sam3u_putreg(HX8347_R19H, 0x49);      /* OSCADJ=10 0000 OSD_EN=1 60Hz */
-  sam3u_putreg(HX8347_R93H, 0x0C);      /* RADJ=1100 */
+  sam_putreg(HX8347_R19H, 0x49);      /* OSCADJ=10 0000 OSD_EN=1 60Hz */
+  sam_putreg(HX8347_R93H, 0x0C);      /* RADJ=1100 */
 
   /* Power on flow */
 
-  sam3u_putreg(HX8347_R44H, 0x4D);      /* VCM=100 1101 */
-  sam3u_putreg(HX8347_R45H, 0x11);      /* VDV=1 0001 */
-  sam3u_putreg(HX8347_R20H, 0x40);      /* BT=0100 */
-  sam3u_putreg(HX8347_R1DH, 0x07);      /* VC1=111 */
-  sam3u_putreg(HX8347_R1EH, 0x00);      /* VC3=000 */
-  sam3u_putreg(HX8347_R1FH, 0x04);      /* VRH=0100 */
-  sam3u_putreg(HX8347_R1CH, 0x04);      /* AP=100 */
-  sam3u_putreg(HX8347_R1BH, 0x10);      /* GASENB=0 PON=1 DK=0 XDK=0 DDVDH_TRI=0 STB=0 */
+  sam_putreg(HX8347_R44H, 0x4D);      /* VCM=100 1101 */
+  sam_putreg(HX8347_R45H, 0x11);      /* VDV=1 0001 */
+  sam_putreg(HX8347_R20H, 0x40);      /* BT=0100 */
+  sam_putreg(HX8347_R1DH, 0x07);      /* VC1=111 */
+  sam_putreg(HX8347_R1EH, 0x00);      /* VC3=000 */
+  sam_putreg(HX8347_R1FH, 0x04);      /* VRH=0100 */
+  sam_putreg(HX8347_R1CH, 0x04);      /* AP=100 */
+  sam_putreg(HX8347_R1BH, 0x10);      /* GASENB=0 PON=1 DK=0 XDK=0 DDVDH_TRI=0 STB=0 */
   up_mdelay(50);
-  sam3u_putreg(HX8347_R43H, 0x80);      /* Set VCOMG=1 */
+  sam_putreg(HX8347_R43H, 0x80);      /* Set VCOMG=1 */
   up_mdelay(50);
 
   /* Gamma for CMO 2.8 */
 
-  sam3u_putreg(HX8347_R46H, 0x95);
-  sam3u_putreg(HX8347_R47H, 0x51);
-  sam3u_putreg(HX8347_R48H, 0x00);
-  sam3u_putreg(HX8347_R49H, 0x36);
-  sam3u_putreg(HX8347_R4AH, 0x11);
-  sam3u_putreg(HX8347_R4BH, 0x66);
-  sam3u_putreg(HX8347_R4CH, 0x14);
-  sam3u_putreg(HX8347_R4DH, 0x77);
-  sam3u_putreg(HX8347_R4EH, 0x13);
-  sam3u_putreg(HX8347_R4FH, 0x4c);
-  sam3u_putreg(HX8347_R50H, 0x46);
-  sam3u_putreg(HX8347_R51H, 0x46);
+  sam_putreg(HX8347_R46H, 0x95);
+  sam_putreg(HX8347_R47H, 0x51);
+  sam_putreg(HX8347_R48H, 0x00);
+  sam_putreg(HX8347_R49H, 0x36);
+  sam_putreg(HX8347_R4AH, 0x11);
+  sam_putreg(HX8347_R4BH, 0x66);
+  sam_putreg(HX8347_R4CH, 0x14);
+  sam_putreg(HX8347_R4DH, 0x77);
+  sam_putreg(HX8347_R4EH, 0x13);
+  sam_putreg(HX8347_R4FH, 0x4c);
+  sam_putreg(HX8347_R50H, 0x46);
+  sam_putreg(HX8347_R51H, 0x46);
 
   /* 240x320 window setting */
 
-  sam3u_putreg(HX8347_R02H, 0x00);      /* Column address start2 */
-  sam3u_putreg(HX8347_R03H, 0x00);      /* Column address start1 */
-  sam3u_putreg(HX8347_R04H, 0x00);      /* Column address end2 */
-  sam3u_putreg(HX8347_R05H, 0xef);      /* Column address end1 */
-  sam3u_putreg(HX8347_R06H, 0x00);      /* Row address start2 */
-  sam3u_putreg(HX8347_R07H, 0x00);      /* Row address start1 */
-  sam3u_putreg(HX8347_R08H, 0x01);      /* Row address end2 */
-  sam3u_putreg(HX8347_R09H, 0x3f);      /* Row address end1 */
+  sam_putreg(HX8347_R02H, 0x00);      /* Column address start2 */
+  sam_putreg(HX8347_R03H, 0x00);      /* Column address start1 */
+  sam_putreg(HX8347_R04H, 0x00);      /* Column address end2 */
+  sam_putreg(HX8347_R05H, 0xef);      /* Column address end1 */
+  sam_putreg(HX8347_R06H, 0x00);      /* Row address start2 */
+  sam_putreg(HX8347_R07H, 0x00);      /* Row address start1 */
+  sam_putreg(HX8347_R08H, 0x01);      /* Row address end2 */
+  sam_putreg(HX8347_R09H, 0x3f);      /* Row address end1 */
 
   /* Display Setting */
-  
-  sam3u_putreg(HX8347_R01H, 0x06);      /* IDMON=0 INVON=1 NORON=1 PTLON=0 */
-  sam3u_putreg(HX8347_R16H, 0xc8);      /* MY=1 MX=1 MV=0 BGR=1 */
-  sam3u_putreg(HX8347_R23H, 0x95);      /* N_DC=1001 0101 */
-  sam3u_putreg(HX8347_R24H, 0x95);      /* P_DC=1001 0101 */
-  sam3u_putreg(HX8347_R25H, 0xff);      /* I_DC=1111 1111 */
-  sam3u_putreg(HX8347_R27H, 0x06);      /* N_BP=0000 0110 */
-  sam3u_putreg(HX8347_R28H, 0x06);      /* N_FP=0000 0110 */
-  sam3u_putreg(HX8347_R29H, 0x06);      /* P_BP=0000 0110 */
-  sam3u_putreg(HX8347_R2AH, 0x06);      /* P_FP=0000 0110 */
-  sam3u_putreg(HX8347_R2CH, 0x06);      /* I_BP=0000 0110 */
-  sam3u_putreg(HX8347_R2DH, 0x06);      /* I_FP=0000 0110 */
-  sam3u_putreg(HX8347_R3AH, 0x01);      /* N_RTN=0000 N_NW=001 */
-  sam3u_putreg(HX8347_R3BH, 0x01);      /* P_RTN=0000 P_NW=001 */
-  sam3u_putreg(HX8347_R3CH, 0xf0);      /* I_RTN=1111 I_NW=000 */
-  sam3u_putreg(HX8347_R3DH, 0x00);      /* DIV=00 */
-  sam3u_putreg(HX8347_R3EH, 0x38);      /* SON=38h */
-  sam3u_putreg(HX8347_R40H, 0x0f);      /* GDON=0Fh */
-  sam3u_putreg(HX8347_R41H, 0xf0);      /* GDOF=F0h */
+
+  sam_putreg(HX8347_R01H, 0x06);      /* IDMON=0 INVON=1 NORON=1 PTLON=0 */
+  sam_putreg(HX8347_R16H, 0xc8);      /* MY=1 MX=1 MV=0 BGR=1 */
+  sam_putreg(HX8347_R23H, 0x95);      /* N_DC=1001 0101 */
+  sam_putreg(HX8347_R24H, 0x95);      /* P_DC=1001 0101 */
+  sam_putreg(HX8347_R25H, 0xff);      /* I_DC=1111 1111 */
+  sam_putreg(HX8347_R27H, 0x06);      /* N_BP=0000 0110 */
+  sam_putreg(HX8347_R28H, 0x06);      /* N_FP=0000 0110 */
+  sam_putreg(HX8347_R29H, 0x06);      /* P_BP=0000 0110 */
+  sam_putreg(HX8347_R2AH, 0x06);      /* P_FP=0000 0110 */
+  sam_putreg(HX8347_R2CH, 0x06);      /* I_BP=0000 0110 */
+  sam_putreg(HX8347_R2DH, 0x06);      /* I_FP=0000 0110 */
+  sam_putreg(HX8347_R3AH, 0x01);      /* N_RTN=0000 N_NW=001 */
+  sam_putreg(HX8347_R3BH, 0x01);      /* P_RTN=0000 P_NW=001 */
+  sam_putreg(HX8347_R3CH, 0xf0);      /* I_RTN=1111 I_NW=000 */
+  sam_putreg(HX8347_R3DH, 0x00);      /* DIV=00 */
+  sam_putreg(HX8347_R3EH, 0x38);      /* SON=38h */
+  sam_putreg(HX8347_R40H, 0x0f);      /* GDON=0Fh */
+  sam_putreg(HX8347_R41H, 0xf0);      /* GDOF=F0h */
 
   /* Set LCD backlight to FULL off */
 
-  sam3u_setpower(&g_lcddev_s.dev, LCD_FULL_OFF);
+  sam_setpower(&g_lcddev_s.dev, LCD_FULL_OFF);
 
   /* Fill the display memory with the color BLACK */
 
-  sam3u_setcursor(0, 0);
-  sam3u_wrsetup();
+  sam_setcursor(0, 0);
+  sam_wrsetup();
   for (i = 0; i < (SAM3UEK_XRES * SAM3UEK_YRES); i++)
     {
-        sam3u_wrram(RGB16_BLACK);
+      sam_wrram(RGB16_BLACK);
     }
 
   /* Turn the LCD on (but with the backlight off) */
 
-  sam3u_lcdon();
+  sam_lcdon();
   return OK;
 }
 
@@ -1055,15 +1055,15 @@ void up_lcduninitialize(void)
 {
   /* Turn the LCD off */
 
-  sam3u_lcdoff();
+  sam_lcdoff();
 
   /* Set LCD backlight to FULL off */
 
-  sam3u_setpower(&g_lcddev_s.dev, LCD_FULL_OFF);
+  sam_setpower(&g_lcddev_s.dev, LCD_FULL_OFF);
 
   /* Disable SMC peripheral clock */
 
-  putreg32((1 << SAM3U_PID_SMC), SAM3U_PMC_PCDR);
+  putreg32((1 << SAM_PID_SMC), SAM_PMC_PCDR);
 }
 
 
diff --git a/nuttx/configs/sam3u-ek/src/up_leds.c b/nuttx/configs/sam3u-ek/src/up_leds.c
index 0b02ae20f..1c6c4aeb7 100644
--- a/nuttx/configs/sam3u-ek/src/up_leds.c
+++ b/nuttx/configs/sam3u-ek/src/up_leds.c
@@ -49,8 +49,8 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "sam3u_internal.h"
-#include "sam3uek_internal.h"
+#include "sam_gpio.h"
+#include "sam3u-ek.h"
 
 #ifdef CONFIG_ARCH_LEDS
 
@@ -144,7 +144,7 @@ static void up_setled(uint16_t pinset, uint8_t state)
         return;
     }
 
-  sam3u_gpiowrite(pinset, polarity);
+  sam_gpiowrite(pinset, polarity);
 }
 
 /****************************************************************************
@@ -168,9 +168,9 @@ static void up_setleds(uint8_t state)
 
 void up_ledinit(void)
 {
-  (void)sam3u_configgpio(GPIO_LED0);
-  (void)sam3u_configgpio(GPIO_LED1);
-  (void)sam3u_configgpio(GPIO_LED2);
+  (void)sam_configgpio(GPIO_LED0);
+  (void)sam_configgpio(GPIO_LED1);
+  (void)sam_configgpio(GPIO_LED2);
 }
 
 /****************************************************************************
diff --git a/nuttx/configs/sam3u-ek/src/up_mmcsd.c b/nuttx/configs/sam3u-ek/src/up_mmcsd.c
index bfa4ce4a7..0c1c5a9ad 100644
--- a/nuttx/configs/sam3u-ek/src/up_mmcsd.c
+++ b/nuttx/configs/sam3u-ek/src/up_mmcsd.c
@@ -1,8 +1,7 @@
 /************************************************************************************
  * configs/sam3u-ek/src/up_mmcsd.c
- * arch/arm/src/board/up_mmcsd.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,10 +42,10 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include "sam3u_internal.h"
-#include "sam3uek_internal.h"
+#include "sam_gpio.h"
+#include "sam3u-ek.h"
 
-#ifdef CONFIG_SAM3U_HSMCI
+#ifdef CONFIG_SAM34_HSMCI
 
 /************************************************************************************
  * Definitions
@@ -55,7 +54,7 @@
 /* This needs to be extended.  The card detect GPIO must be configured as an interrupt.
  * when the interrupt indicating that a card has been inserted or removed is received,
  * this function must call sio_mediachange() to handle that event.  See
- * arch/arm/src/sam3u/sam3u_internal.h for more information.
+ * arch/arm/src/sam34/sam_hsmci.h for more information.
  */
 
 #ifdef GPIO_MCI_CD
@@ -71,7 +70,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam3u_hsmciinit
+ * Name: sam_hsmciinit
  *
  * Description:
  *   Initialize HSMCI support.  This function is called very early in board
@@ -79,31 +78,31 @@
  *
  ************************************************************************************/
 
-int sam3u_hsmciinit(void)
+int sam_hsmciinit(void)
 {
 #ifdef GPIO_MCI_CD
-  sam3u_configgpio(GPIO_MCI_CD);
+  sam_configgpio(GPIO_MCI_CD);
 #endif
 #ifdef GPIO_MCI_WP
-  sam3u_configgpio(GPIO_MCI_WP);
+  sam_configgpio(GPIO_MCI_WP);
 #endif
   return OK;
 }
 
 /************************************************************************************
- * Name: sam3u_cardinserted
+ * Name: sam_cardinserted
  *
  * Description:
  *   Check if a card is inserted into the selected HSMCI slot
  *
  ************************************************************************************/
 
-bool sam3u_cardinserted(unsigned char slot)
+bool sam_cardinserted(unsigned char slot)
 {
   if (slot == 0)
     {
 #ifdef GPIO_MCI_CD
-      bool inserted = sam3u_gpioread(GPIO_MCI_CD);
+      bool inserted = sam_gpioread(GPIO_MCI_CD);
       fvdbg("inserted: %s\n", inserted ? "NO" : "YES");
       return !inserted;
 #else
@@ -114,19 +113,19 @@ bool sam3u_cardinserted(unsigned char slot)
 }
 
 /************************************************************************************
- * Name: sam3u_writeprotected
+ * Name: sam_writeprotected
  *
  * Description:
  *   Check if a card is inserted into the selected HSMCI slot
  *
  ************************************************************************************/
 
-bool sam3u_writeprotected(unsigned char slot)
+bool sam_writeprotected(unsigned char slot)
 {
   if (slot == 0)
     {
 #ifdef GPIO_MCI_WP
-      bool protected = sam3u_gpioread(GPIO_MCI_WP);
+      bool protected = sam_gpioread(GPIO_MCI_WP);
       fvdbg("protected: %s\n", inserted ? "YES" : "NO");
       return protected;
 #else
@@ -136,4 +135,4 @@ bool sam3u_writeprotected(unsigned char slot)
   return false;
 }
 
-#endif /* CONFIG_SAM3U_HSMCI */
+#endif /* CONFIG_SAM34_HSMCI */
diff --git a/nuttx/configs/sam3u-ek/src/up_nsh.c b/nuttx/configs/sam3u-ek/src/up_nsh.c
index 628405521..dfa296117 100644
--- a/nuttx/configs/sam3u-ek/src/up_nsh.c
+++ b/nuttx/configs/sam3u-ek/src/up_nsh.c
@@ -1,8 +1,7 @@
 /****************************************************************************
  * config/sam3u-ek/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,10 +47,10 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
-#include "sam3u_internal.h"
-#include "sam3uek_internal.h"
+#include "sam_hsmci.h"
+#include "sam3u-ek.h"
 
-#ifdef CONFIG_SAM3U_HSMCI
+#ifdef CONFIG_SAM34_HSMCI
 
 /****************************************************************************
  * Pre-Processor Definitions
@@ -83,7 +82,7 @@
  * is not enabled.
  */
 
-#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAM3U_HSMCI)
+#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAM34_HSMCI)
 #  undef NSH_HAVE_MMCSD
 #endif
 
@@ -149,10 +148,10 @@ int nsh_archinitialize(void)
       return ret;
     }
   message("nsh_archinitialize: Successfully bound SDIO to the MMC/SD driver\n");
-  
+
   /* Then inform the HSMCI driver if there is or is not a card in the slot. */
 
-   sdio_mediachange(sdio, sam3u_cardinserted(0));
+   sdio_mediachange(sdio, sam_cardinserted(0));
 #endif
   return OK;
 }
diff --git a/nuttx/configs/sam3u-ek/src/up_spi.c b/nuttx/configs/sam3u-ek/src/up_spi.c
index 8dafc293e..b14029f5d 100644
--- a/nuttx/configs/sam3u-ek/src/up_spi.c
+++ b/nuttx/configs/sam3u-ek/src/up_spi.c
@@ -1,8 +1,7 @@
 /************************************************************************************
  * configs/sam3u-ek/src/up_spi.c
- * arch/arm/src/board/up_spi.c
  *
- *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,10 +49,11 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "sam3u_internal.h"
-#include "sam3uek_internal.h"
+#include "sam_gpio.h"
+#include "sam_spi.h"
+#include "sam3u-ek.h"
 
-#ifdef CONFIG_SAM3U_SPI
+#ifdef CONFIG_SAM34_SPI
 
 /************************************************************************************
  * Definitions
@@ -86,14 +86,14 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam3u_spiinitialize
+ * Name: sam_spiinitialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins for the SAM3U10E-EVAL board.
  *
  ************************************************************************************/
 
-void weak_function sam3u_spiinitialize(void)
+void weak_function sam_spiinitialize(void)
 {
   /* The ZigBee module connects used NPCS0.  However, there is not yet any
    * ZigBee support.
@@ -102,49 +102,48 @@ void weak_function sam3u_spiinitialize(void)
    /* The touchscreen connects using NPCS2 (PC14). */
 
 #if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_ADS7843E)
-   sam3u_configgpio(GPIO_TSC_NPCS2);
+   sam_configgpio(GPIO_TSC_NPCS2);
 #endif
 }
 
 /****************************************************************************
- * Name:  sam3u_spicsnumber, sam3u_spiselect, sam3u_spistatus, and
- *        sam3u_spicmddata
+ * Name:  sam_spicsnumber, sam_spiselect, sam_spistatus, and sam_spicmddata
  *
  * Description:
  *   These external functions must be provided by board-specific logic.  They
  *   include:
  *
- *   o sam3u_spicsnumbe and sam3u_spiselect which are helper functions to
+ *   o sam_spicsnumber and sam_spiselect which are helper functions to
  *     manage the board-specific aspects of the unique SAM3U chip select
  *     architecture.
- *   o sam3u_spistatus and sam3u_spicmddata:  Implementations of the status
+ *   o sam_spistatus and sam_spicmddata:  Implementations of the status
  *     and cmddata methods of the SPI interface defined by struct spi_ops_
  *     (see include/nuttx/spi.h). All other methods including
  *     up_spiinitialize()) are provided by common SAM3U logic.
  *
  *  To use this common SPI logic on your board:
  *
- *   1. Provide logic in sam3u_boardinitialize() to configure SPI chip select
+ *   1. Provide logic in sam_boardinitialize() to configure SPI chip select
  *      pins.
- *   2. Provide sam3u_spicsnumber(), sam3u_spiselect() and sam3u_spistatus()
+ *   2. Provide sam_spicsnumber(), sam_spiselect() and sam_spistatus()
  *      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
- *      sam3u_spicmddata() functions in your board-specific logic.  This
+ *      sam_spicmddata() 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 
+ *      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: sam3u_spicsnumber
+ * Name: sam_spicsnumber
  *
  * Description:
  *   The SAM3U has 4 CS registers for controlling device features.  This
@@ -161,7 +160,7 @@ void weak_function sam3u_spiinitialize(void)
  *
  ****************************************************************************/
 
-int sam3u_spicsnumber(enum spi_dev_e devid)
+int sam_spicsnumber(enum spi_dev_e devid)
 {
   int cs = -EINVAL;
 
@@ -179,7 +178,7 @@ int sam3u_spicsnumber(enum spi_dev_e devid)
 }
 
 /****************************************************************************
- * Name: sam3u_spiselect
+ * Name: sam_spiselect
  *
  * Description:
  *   PIO chip select pins may be programmed by the board specific logic in
@@ -203,7 +202,7 @@ int sam3u_spicsnumber(enum spi_dev_e devid)
  *
  ****************************************************************************/
 
-void sam3u_spiselect(enum spi_dev_e devid, bool selected)
+void sam_spiselect(enum spi_dev_e devid, bool selected)
 {
   /* The touchscreen chip select is implemented as a GPIO OUTPUT that must
    * be controlled by this function.  This is because the ADS7843E driver
@@ -216,13 +215,13 @@ void sam3u_spiselect(enum spi_dev_e devid, bool selected)
 #if defined(CONFIG_INPUT) && defined(CONFIG_INPUT_ADS7843E)
   if (devid == SPIDEV_TOUCHSCREEN)
     {
-      sam3u_gpiowrite(GPIO_TSC_NPCS2, !selected);
+      sam_gpiowrite(GPIO_TSC_NPCS2, !selected);
     }
 #endif
 }
 
 /****************************************************************************
- * Name: sam3u_spistatus
+ * Name: sam_spistatus
  *
  * Description:
  *   Return status information associated with the SPI device.
@@ -235,9 +234,9 @@ void sam3u_spiselect(enum spi_dev_e devid, bool selected)
  *
  ****************************************************************************/
 
-uint8_t sam3u_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t sam_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   return 0;
 }
 
-#endif /* CONFIG_SAM3U_SPI */
+#endif /* CONFIG_SAM34_SPI */
diff --git a/nuttx/configs/sam3u-ek/src/up_touchscreen.c b/nuttx/configs/sam3u-ek/src/up_touchscreen.c
index 35ab43859..71b12f571 100644
--- a/nuttx/configs/sam3u-ek/src/up_touchscreen.c
+++ b/nuttx/configs/sam3u-ek/src/up_touchscreen.c
@@ -2,7 +2,7 @@
  * configs/sam3u-ek/src/up_touchscreen.c
  * arch/arm/src/board/up_touchscreen.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,8 +50,8 @@
 #include <nuttx/input/touchscreen.h>
 #include <nuttx/input/ads7843e.h>
 
-#include "sam3u_internal.h"
-#include "sam3uek_internal.h"
+#include "sam_gpio.h"
+#include "sam3u-ek.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
@@ -63,8 +63,8 @@
 #  error "Touchscreen support requires CONFIG_INPUT"
 #endif
 
-#ifndef CONFIG_SAM3U_SPI
-#  error "Touchscreen support requires CONFIG_SAM3U_SPI"
+#ifndef CONFIG_SAM34_SPI
+#  error "Touchscreen support requires CONFIG_SAM34_SPI"
 #endif
 
 #ifndef CONFIG_GPIOA_IRQ
@@ -154,22 +154,22 @@ static int tsc_attach(FAR struct ads7843e_config_s *state, xcpt_t isr)
 {
   /* Attach the ADS7843E interrupt */
 
-  ivdbg("Attaching %p to IRQ %d\n", isr, SAM3U_TCS_IRQ);
-  return irq_attach(SAM3U_TCS_IRQ, isr);
+  ivdbg("Attaching %p to IRQ %d\n", isr, SAM_TCS_IRQ);
+  return irq_attach(SAM_TCS_IRQ, isr);
 }
 
 static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable)
 {
   /* Attach and enable, or detach and disable */
 
-  ivdbg("IRQ:%d enable:%d\n", SAM3U_TCS_IRQ, enable);
+  ivdbg("IRQ:%d enable:%d\n", SAM_TCS_IRQ, enable);
   if (enable)
     {
-      sam3u_gpioirqenable(SAM3U_TCS_IRQ);
+      sam_gpioirqenable(SAM_TCS_IRQ);
     }
   else
     {
-      sam3u_gpioirqdisable(SAM3U_TCS_IRQ);
+      sam_gpioirqdisable(SAM_TCS_IRQ);
     }
 }
 
@@ -186,7 +186,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state)
 
   /* REVISIT:  This might need to be inverted */
 
-  bool busy = sam3u_gpioread(GPIO_TCS_BUSY);
+  bool busy = sam_gpioread(GPIO_TCS_BUSY);
 #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE)
   if (busy != last)
     {
@@ -201,7 +201,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state)
 {
   /* REVISIT:  This might need to be inverted */
 
-  bool pendown = sam3u_gpioread(GPIO_TCS_IRQ);
+  bool pendown = sam_gpioread(GPIO_TCS_IRQ);
   ivdbg("pendown:%d\n", pendown);
   return pendown;
 }
@@ -238,12 +238,12 @@ int arch_tcinitialize(int minor)
 
   /* Configure and enable the ADS7843E interrupt pin as an input */
 
-  (void)sam3u_configgpio(GPIO_TCS_BUSY);
-  (void)sam3u_configgpio(GPIO_TCS_IRQ);
+  (void)sam_configgpio(GPIO_TCS_BUSY);
+  (void)sam_configgpio(GPIO_TCS_IRQ);
 
   /* Configure the PIO interrupt */
 
-  sam3u_gpioirq(GPIO_TCS_IRQ);
+  sam_gpioirq(GPIO_TCS_IRQ);
 
   /* Get an instance of the SPI interface */
 
diff --git a/nuttx/configs/sam3u-ek/src/up_usbdev.c b/nuttx/configs/sam3u-ek/src/up_usbdev.c
index 0fc4a61ec..b67ea88eb 100644
--- a/nuttx/configs/sam3u-ek/src/up_usbdev.c
+++ b/nuttx/configs/sam3u-ek/src/up_usbdev.c
@@ -1,6 +1,5 @@
 /************************************************************************************
  * configs/sam3u-ek/src/up_usbdev.c
- * arch/arm/src/board/up_usbdev.c
  *
  *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,8 +48,7 @@
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "up_arch.h"
-#include "sam3u_internal.h"
-#include "sam3uek_internal.h"
+#include "sam3u-ek.h"
 
 /************************************************************************************
  * Definitions
@@ -65,46 +63,46 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: sam3u_usbinitialize
+ * Name: sam_usbinitialize
  *
  * Description:
  *   Called to setup USB-related GPIO pins for the SAM3U-EK board.
  *
  ************************************************************************************/
 
-void sam3u_usbinitialize(void)
+void sam_usbinitialize(void)
 {
 }
 
 /************************************************************************************
- * Name:  sam3u_usbpullup
+ * Name:  sam_usbpullup
  *
  * Description:
  *   If USB is supported and the board supports a pullup via GPIO (for USB software
- *   connect and disconnect), then the board software must provide sam3u_pullup.
+ *   connect and disconnect), then the board software must provide sam_pullup.
  *   See include/nuttx/usb/usbdev.h for additional description of this method.
  *   Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
  *   NULL.
  *
  ************************************************************************************/
 
-int sam3u_usbpullup(FAR struct usbdev_s *dev, bool enable)
+int sam_usbpullup(FAR struct usbdev_s *dev, bool enable)
 {
   return 0;
 }
 
 /************************************************************************************
- * Name:  sam3u_usbsuspend
+ * Name:  sam_usbsuspend
  *
  * Description:
- *   Board logic must provide the sam3u_usbsuspend logic if the USBDEV driver is
+ *   Board logic must provide the sam_usbsuspend logic if the USBDEV driver is
  *   used.  This function is called whenever the USB enters or leaves suspend mode.
  *   This is an opportunity for the board logic to shutdown clocks, power, etc.
  *   while the USB is suspended.
  *
  ************************************************************************************/
 
-void sam3u_usbsuspend(FAR struct usbdev_s *dev, bool resume)
+void sam_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
   ulldbg("resume: %d\n", resume);
 }
diff --git a/nuttx/configs/sam3u-ek/src/up_usbmsc.c b/nuttx/configs/sam3u-ek/src/up_usbmsc.c
index dfe2e2c49..d14a8f29e 100644
--- a/nuttx/configs/sam3u-ek/src/up_usbmsc.c
+++ b/nuttx/configs/sam3u-ek/src/up_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/sam3u-ek/src/up_usbmsc.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Configure and register the SAM3U MMC/SD SDIO block driver.
@@ -48,9 +48,9 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
-#include "sam3u_internal.h"
+#include "sam_hsmci.h"
 
-#ifdef CONFIG_SAM3U_SDIO
+#ifdef CONFIG_SAM34_HSMCI
 
 /****************************************************************************
  * Pre-Processor Definitions
@@ -65,8 +65,8 @@
 /* SLOT number(s) could depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_SAM3U10E_EVAL
-#  undef SAM3U_MMCSDSLOTNO
-#  define SAM3U_MMCSDSLOTNO 0
+#  undef SAM_MMCSDSLOTNO
+#  define SAM_MMCSDSLOTNO 0
 #else
    /* Add configuration for new SAM3U boards here */
 #  error "Unrecognized SAM3U board"
@@ -113,13 +113,13 @@ int usbmsc_archinitialize(void)
 
   message("usbmsc_archinitialize: "
           "Initializing SDIO slot %d\n",
-          SAM3U_MMCSDSLOTNO);
+          SAM_MMCSDSLOTNO);
 
-  sdio = sdio_initialize(SAM3U_MMCSDSLOTNO);
+  sdio = sdio_initialize(SAM_MMCSDSLOTNO);
   if (!sdio)
     {
       message("usbmsc_archinitialize: Failed to initialize SDIO slot %d\n",
-              SAM3U_MMCSDSLOTNO);
+              SAM_MMCSDSLOTNO);
       return -ENODEV;
     }
 
@@ -139,7 +139,7 @@ int usbmsc_archinitialize(void)
     }
   message("usbmsc_archinitialize: "
           "Successfully bound SDIO to the MMC/SD driver\n");
-  
+
   /* Then let's guess and say that there is a card in the slot.  I need to check to
    * see if the SAM3U10E-EVAL board supports a GPIO to detect if there is a card in
    * the slot.
@@ -149,4 +149,4 @@ int usbmsc_archinitialize(void)
    return OK;
 }
 
-#endif /* CONFIG_SAM3U_SDIO */
+#endif /* CONFIG_SAM34_HSMCI */
diff --git a/nuttx/configs/sam3u-ek/touchscreen/appconfig b/nuttx/configs/sam3u-ek/touchscreen/appconfig
deleted file mode 100644
index ccbdaeb28..000000000
--- a/nuttx/configs/sam3u-ek/touchscreen/appconfig
+++ /dev/null
@@ -1,49 +0,0 @@
-############################################################################
-# configs/sam3u-ek/touchscreen/appconfig
-#
-#   Copyright (C) 2011-2012 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/nsh
-
-# The NSH application library
-
-CONFIGURED_APPS += system/readline
-CONFIGURED_APPS += nshlib
-
-# The NX and NXHELLO examples configured as an NX built-in commands
-
-CONFIGURED_APPS += examples/nx
-CONFIGURED_APPS += examples/nxhello
-CONFIGURED_APPS += examples/touchscreen
diff --git a/nuttx/configs/sam3u-ek/touchscreen/defconfig b/nuttx/configs/sam3u-ek/touchscreen/defconfig
index 843ba06b4..f2d933864 100755..100644
--- a/nuttx/configs/sam3u-ek/touchscreen/defconfig
+++ b/nuttx/configs/sam3u-ek/touchscreen/defconfig
@@ -1,241 +1,228 @@
-############################################################################
-# configs/sam3u-ek/touchscreen/defconfig
-#
-#   Copyright (C) 2011 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
-# POSPIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-#
-# Architecture Selection
 #
-CONFIG_ARCH="arm"
-CONFIG_ARCH_ARM=y
-CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP="sam3u"
-CONFIG_ARCH_CHIP_AT91SAM3U4E=y
-CONFIG_ARCH_BOARD="sam3u-ek"
-CONFIG_ARCH_BOARD_SAM3UEK=y
-CONFIG_BOARD_LOOPSPERMSEC=4768
-CONFIG_DRAM_SIZE=32768
-CONFIG_DRAM_START=0x20000000
-CONFIG_ARCH_IRQPRIO=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_CALIBRATION=n
-CONFIG_ARCH_DMA=n
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+CONFIG_NUTTX_NEWCONFIG=y
 
 #
-# Identify toolchain and linker options
+# Build Setup
 #
-CONFIG_SAM3U_CODESOURCERYW=n
-CONFIG_SAM3U_CODESOURCERYL=n
-CONFIG_SAM3U_DEVKITARM=n
-CONFIG_SAM3U_BUILDROOT=y
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_HOST_LINUX=y
+# CONFIG_HOST_OSX is not set
+# CONFIG_HOST_WINDOWS is not set
+# CONFIG_HOST_OTHER is not set
 
 #
-# Individual subsystems can be enabled:
+# Build Configuration
 #
-CONFIG_SAM3U_DMA=n
-CONFIG_SAM3U_HSMCI=n
-CONFIG_SAM3U_NAND=n
-CONFIG_SAM3U_SPI=y
-CONFIG_SAM3U_UART=y
-CONFIG_SAM3U_USART0=n
-CONFIG_SAM3U_USART1=n
-CONFIG_SAM3U_USART2=n
-CONFIG_SAM3U_USART3=n
+# CONFIG_APPS_DIR="../apps"
+# CONFIG_BUILD_2PASS is not set
 
 #
-# Some subsystems can be configured to operate in different ways..
-# The drivers need to know how to configure the subsystem.
+# Binary Output Formats
 #
+# CONFIG_RRLOAD_BINARY is not set
+# CONFIG_INTELHEX_BINARY is not set
+# CONFIG_MOTOROLA_SREC is not set
+CONFIG_RAW_BINARY=y
 
-CONFIG_GPIOA_IRQ=y
-CONFIG_GPIOB_IRQ=n
-CONFIG_GPIOC_IRQ=n
-CONFIG_USART0_ISUART=y
-CONFIG_USART1_ISUART=y
-CONFIG_USART2_ISUART=y
-CONFIG_USART3_ISUART=y
+#
+# Customize Header Files
+#
+# CONFIG_ARCH_STDBOOL_H is not set
+# CONFIG_ARCH_MATH_H is not set
+# CONFIG_ARCH_FLOAT_H is not set
+# CONFIG_ARCH_STDARG_H is not set
 
 #
-# SAM3U specific serial device driver settings
+# Debug Options
 #
-CONFIG_UART_SERIAL_CONSOLE=Y
-CONFIG_USART0_SERIAL_CONSOLE=n
-CONFIG_USART1_SERIAL_CONSOLE=n
-CONFIG_USART2_SERIAL_CONSOLE=n
-CONFIG_USART3_SERIAL_CONSOLE=n
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_SYMBOLS is not set
 
-CONFIG_UART_TXBUFSIZE=256
-CONFIG_USART0_TXBUFSIZE=256
-CONFIG_USART1_TXBUFSIZE=256
-CONFIG_USART2_TXBUFSIZE=256
-CONFIG_USART3_TXBUFSIZE=256
+#
+# System Type
+#
+# CONFIG_ARCH_8051 is not set
+CONFIG_ARCH_ARM=y
+# CONFIG_ARCH_AVR is not set
+# CONFIG_ARCH_HC is not set
+# CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_RGMP is not set
+# CONFIG_ARCH_SH is not set
+# CONFIG_ARCH_SIM is not set
+# CONFIG_ARCH_X86 is not set
+# CONFIG_ARCH_Z16 is not set
+# CONFIG_ARCH_Z80 is not set
+CONFIG_ARCH="arm"
 
-CONFIG_UART_RXBUFSIZE=256
-CONFIG_USART0_RXBUFSIZE=256
-CONFIG_USART1_RXBUFSIZE=256
-CONFIG_USART2_RXBUFSIZE=256
-CONFIG_USART3_RXBUFSIZE=256
+#
+# ARM Options
+#
+# CONFIG_ARCH_CHIP_C5471 is not set
+# CONFIG_ARCH_CHIP_CALYPSO is not set
+# CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_IMX is not set
+# CONFIG_ARCH_CHIP_KINETIS is not set
+# CONFIG_ARCH_CHIP_KL is not set
+# CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_LPC17XX is not set
+# CONFIG_ARCH_CHIP_LPC214X is not set
+# CONFIG_ARCH_CHIP_LPC2378 is not set
+# CONFIG_ARCH_CHIP_LPC31XX is not set
+# CONFIG_ARCH_CHIP_LPC43XX is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+CONFIG_ARCH_CHIP_SAM34=y
+# CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STR71X is not set
+CONFIG_ARCH_CORTEXM3=y
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARMV7M_MPU is not set
 
-CONFIG_UART_BAUD=115200
-CONFIG_USART0_BAUD=115200
-CONFIG_USART1_BAUD=115200
-CONFIG_USART2_BAUD=115200
-CONFIG_USART3_BAUD=115200
+#
+# ARMV7M Configuration Options
+#
+CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI is not set
+CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 
-CONFIG_UART_BITS=8
-CONFIG_USART0_BITS=8
-CONFIG_USART1_BITS=8
-CONFIG_USART2_BITS=8
-CONFIG_USART3_BITS=8
+#
+# AT91SAM3/SAM4 Configuration Options
+#
+CONFIG_ARCH_CHIP_AT91SAM3U4E=y
+CONFIG_ARCH_CHIP_SAM3U=y
 
-CONFIG_UART_PARITY=0
-CONFIG_USART0_PARITY=0
-CONFIG_USART1_PARITY=0
-CONFIG_USART2_PARITY=0
-CONFIG_USART3_PARITY=0
+#
+# AT91SAM3 Peripheral Support
+#
+# CONFIG_SAM34_DMA is not set
+# CONFIG_SAM34_NAND is not set
+# CONFIG_SAM34_HSMCI is not set
+CONFIG_SAM34_UART=y
+# CONFIG_SAM34_USART0 is not set
+# CONFIG_SAM34_USART1 is not set
+# CONFIG_SAM34_USART2 is not set
+# CONFIG_SAM34_USART3 is not set
+CONFIG_SAM34_SPI=y
 
-CONFIG_UART_2STOP=0
-CONFIG_USART0_2STOP=0
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
+#
+# AT91SAM3 UART Configuration
+#
 
 #
-# Input device configuration
+# AT91SAM3 GPIO Interrupt Configuration
 #
-CONFIG_INPUT=y
-CONFIG_INPUT_ADS7843E=y
+CONFIG_GPIOA_IRQ=y
+# CONFIG_GPIOB_IRQ is not set
+# CONFIG_GPIOC_IRQ is not set
 
 #
-# General build options
+# External Memory Configuration
 #
-CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=n
-CONFIG_MOTOROLA_SREC=n
-CONFIG_RAW_BINARY=y
 
 #
-# General OS setup
+# Architecture Options
 #
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_DEBUG=n
-CONFIG_DEBUG_VERBOSE=n
-CONFIG_DEBUG_SYMBOLS=n
-CONFIG_DEBUG_GRAPHICS=n
-CONFIG_DEBUG_LCD=n
-CONFIG_DEBUG_INPUT=n
-CONFIG_MM_REGIONS=3
-CONFIG_ARCH_LOWPUTC=y
-CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_INSTRUMENTATION=n
-CONFIG_TASK_NAME_SIZE=0
-CONFIG_START_YEAR=2011
-CONFIG_START_MONTH=9
-CONFIG_START_DAY=30
-CONFIG_GREGORIAN_TIME=n
-CONFIG_JULIAN_TIME=n
-CONFIG_DEV_CONSOLE=y
-CONFIG_DEV_LOWCONSOLE=n
-CONFIG_MUTEX_TYPES=n
-CONFIG_PRIORITY_INHERITANCE=n
-CONFIG_SEM_PREALLOCHOLDERS=0
-CONFIG_SEM_NNESTPRIO=0
-CONFIG_FDCLONE_DISABLE=n
-CONFIG_FDCLONE_STDIO=n
-CONFIG_SDCLONE_DISABLE=y
-CONFIG_SCHED_WORKQUEUE=y
-CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=1024
-CONFIG_SIG_SIGWORK=17
-CONFIG_SCHED_WAITPID=y
-CONFIG_SCHED_ATEXIT=n
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_IRQPRIO=y
+# CONFIG_CUSTOM_STACK is not set
+# CONFIG_ADDRENV is not set
+CONFIG_ARCH_HAVE_VFORK=y
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
 
 #
-# Settings for NXFLAT
+# Board Settings
 #
-CONFIG_NXFLAT=y
-CONFIG_NXFLAT_DUMPBUFFER=n
-CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_BOARD_LOOPSPERMSEC=4768
+# CONFIG_ARCH_CALIBRATION is not set
+CONFIG_DRAM_START=0x20000000
+CONFIG_DRAM_SIZE=32768
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
 
 #
-# The following can be used to disable categories of
-# APIs supported by the OS.  If the compiler supports
-# weak functions, then it should not be necessary to
-# disable functions unless you want to restrict usage
-# of those APIs.
+# Boot options
 #
-# There are certain dependency relationships in these
-# features.
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
+
 #
-# o mq_notify logic depends on signals to awaken tasks
-#   waiting for queues to become full or empty.
-# o pthread_condtimedwait() depends on signals to wake
-#   up waiting tasks.
+# Board Selection
 #
-CONFIG_DISABLE_CLOCK=n
-CONFIG_DISABLE_POSIX_TIMERS=n
-CONFIG_DISABLE_PTHREAD=n
-CONFIG_DISABLE_SIGNALS=n
-CONFIG_DISABLE_MQUEUE=n
-CONFIG_DISABLE_MOUNTPOINT=n
-CONFIG_DISABLE_ENVIRON=n
-CONFIG_DISABLE_POLL=y
+CONFIG_ARCH_BOARD_SAM3UEK=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD="sam3u-ek"
+
+#
+# Common Board Options
+#
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
+# CONFIG_ARCH_IRQBUTTONS is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
-# Misc libc settings
+# Board-Specific Options
 #
-CONFIG_NOPRINTF_FIELDWIDTH=n
 
 #
-# Allow for architecture optimized implementations
+# RTOS Features
 #
-# The architecture can provide optimized versions of the
-# following to improve system performance
+# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_MSEC_PER_TICK=10
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_INSTRUMENTATION is not set
+CONFIG_TASK_NAME_SIZE=0
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_JULIAN_TIME is not set
+CONFIG_START_YEAR=2011
+CONFIG_START_MONTH=9
+CONFIG_START_DAY=30
+CONFIG_DEV_CONSOLE=y
+# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PRIORITY_INHERITANCE is not set
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_SCHED_WAITPID=y
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_CLOCK is not set
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Signal Numbers
 #
-CONFIG_ARCH_MEMCPY=n
-CONFIG_ARCH_MEMCMP=n
-CONFIG_ARCH_MEMMOVE=n
-CONFIG_ARCH_MEMSET=n
-CONFIG_ARCH_STRCMP=n
-CONFIG_ARCH_STRCPY=n
-CONFIG_ARCH_STRNCPY=n
-CONFIG_ARCH_STRLEN=n
-CONFIG_ARCH_STRNLEN=n
-CONFIG_ARCH_BZERO=n
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
+CONFIG_SIG_SIGWORK=17
 
 #
 # Sizes of configurable things (0 disables)
@@ -246,8 +233,6 @@ CONFIG_NPTHREAD_KEYS=4
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NAME_MAX=32
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_NUNGET_CHARS=2
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
 CONFIG_MAX_WDOGPARMS=2
@@ -255,317 +240,529 @@ CONFIG_PREALLOC_WDOGS=4
 CONFIG_PREALLOC_TIMERS=4
 
 #
-# Framebuffer driver options
+# Stack and heap information
 #
-CONFIG_FB_CMAP=n
-CONFIG_FB_HWCURSOR=n
-CONFIG_FB_HWCURSORIMAGE=n
-#CONFIG_FB_HWCURSORSIZE
-#CONFIG_FB_TRANSPARENCY
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
 
 #
-# Filesystem configuration
+# Device Drivers
 #
-CONFIG_FS_FAT=y
-CONFIG_FS_ROMFS=n
-
-CONFIG_FS_FAT=y
-CONFIG_FAT_LCNAMES=y
-CONFIG_FAT_LFN=y
-CONFIG_FAT_MAXFNAME=32
-CONFIG_FS_NXFFS=n
-CONFIG_FS_ROMFS=n
+CONFIG_DISABLE_POLL=y
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_LOOP is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_PWM is not set
+# CONFIG_I2C is not set
+CONFIG_SPI=y
+# CONFIG_SPI_OWNBUS is not set
+CONFIG_SPI_EXCHANGE=y
+# CONFIG_SPI_CMDDATA is not set
+# CONFIG_RTC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_BCH is not set
+CONFIG_INPUT=y
+# CONFIG_INPUT_TSC2007 is not set
+CONFIG_INPUT_ADS7843E=y
+# CONFIG_ADS7843E_MULTIPLE is not set
+CONFIG_ADS7843E_SPIDEV=0
+CONFIG_ADS7843E_DEVMINOR=0
+CONFIG_ADS7843E_SPIMODE=0
+CONFIG_ADS7843E_FREQUENCY=100000
+# CONFIG_ADS7843E_SWAPXY is not set
+CONFIG_ADS7843E_THRESHX=12
+CONFIG_ADS7843E_THRESHY=12
+# CONFIG_INPUT_STMPE811 is not set
+CONFIG_LCD=y
 
 #
-# Maintain legacy build behavior (revisit)
+# Common LCD Settings
 #
+# CONFIG_LCD_NOGETRUN is not set
+CONFIG_LCD_MAXCONTRAST=1
+CONFIG_LCD_MAXPOWER=31
 
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
-CONFIG_MTD=y
+#
+# Graphic LCD Devices
+#
+# CONFIG_LCD_P14201 is not set
+# CONFIG_LCD_NOKIA6100 is not set
+# CONFIG_LCD_MIO283QT2 is not set
+# CONFIG_LCD_UG9664HSWAG01 is not set
+# CONFIG_LCD_ST7567 is not set
+# CONFIG_LCD_UG2864AMBAG01 is not set
+# CONFIG_LCD_SSD1289 is not set
+# CONFIG_LCD_LANDSCAPE is not set
+CONFIG_LCD_PORTRAIT=y
+# CONFIG_LCD_RPORTRAIT is not set
+# CONFIG_LCD_RLANDSCAPE is not set
 
 #
-# SPI-based MMC/SD driver
+# Alphanumeric/Segment LCD Devices
 #
-CONFIG_MMCSD_NSLOTS=1
-CONFIG_MMCSD_READONLY=n
-CONFIG_MMCSD_SPICLOCK=12500000
+# CONFIG_LCD_LCD1602 is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MTD is not set
+# CONFIG_PIPES is not set
+# CONFIG_PM is not set
+# CONFIG_POWER is not set
+# CONFIG_SENSORS is not set
+CONFIG_SERIAL=y
+# CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_16550_UART is not set
+CONFIG_ARCH_HAVE_UART=y
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+CONFIG_UART_SERIAL_CONSOLE=y
+# CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
-# Block driver buffering
+# UART Configuration
 #
-CONFIG_FS_READAHEAD=n
-CONFIG_FS_WRITEBUFFER=n
+CONFIG_UART_RXBUFSIZE=256
+CONFIG_UART_TXBUFSIZE=256
+CONFIG_UART_BAUD=115200
+CONFIG_UART_BITS=8
+CONFIG_UART_PARITY=0
+CONFIG_UART_2STOP=0
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_WIRELESS is not set
 
 #
-# SDIO-based MMC/SD driver
+# System Logging Device Options
 #
-CONFIG_SDIO_DMA=n
-CONFIG_SDIO_BLOCKSETUP=y
-CONFIG_MMCSD_MMCSUPPORT=n
-CONFIG_MMCSD_HAVECARDDETECT=n
 
 #
-# TCP/IP and UDP support via uIP
+# System Logging
 #
-CONFIG_NET=n
-CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
-CONFIG_NET_TCP=n
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_UDP=n
-CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
-CONFIG_NET_ICMP=n
-CONFIG_NET_ICMP_PING=n
-#CONFIG_NET_PINGADDRCONF=0
-CONFIG_NET_STATISTICS=y
-#CONFIG_NET_RECEIVE_WINDOW=
-#CONFIG_NET_ARPTAB_SIZE=8
-CONFIG_NET_BROADCAST=n
+# CONFIG_RAMLOG is not set
 
 #
-# UIP Network Utilities
+# Networking Support
 #
-CONFIG_NET_DHCP_LIGHT=n
-CONFIG_NET_RESOLV_ENTRIES=4
+# CONFIG_NET is not set
 
 #
-# USB Device Configuration
+# File Systems
 #
-CONFIG_USBDEV=n
-CONFIG_USBDEV_ISOCHRONOUS=n
-CONFIG_USBDEV_DUALSPEED=n
-CONFIG_USBDEV_SELFPOWERED=y
-CONFIG_USBDEV_REMOTEWAKEUP=n
-CONFIG_USBDEV_MAXPOWER=100
-CONFIG_USBDEV_TRACE=n
-CONFIG_USBDEV_TRACE_NRECORDS=128
 
 #
-# USB Serial Device Configuration
+# File system configuration
 #
-CONFIG_PL2303=n
-CONFIG_PL2303_EPINTIN=1
-CONFIG_PL2303_EPBULKOUT=2
-CONFIG_PL2303_EPBULKIN=3
-CONFIG_PL2303_NWRREQS=4
-CONFIG_PL2303_NRDREQS=4
-CONFIG_PL2303_VENDORID=0x067b
-CONFIG_PL2303_PRODUCTID=0x2303
-CONFIG_PL2303_VENDORSTR="Nuttx"
-CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
-CONFIG_PL2303_RXBUFSIZE=512
-CONFIG_PL2303_TXBUFSIZE=512
+# CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_RAMMAP is not set
+CONFIG_FS_FAT=y
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FAT_MAXFNAME=32
+# CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FS_NXFFS is not set
+# CONFIG_FS_ROMFS is not set
+# CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_BINFS is not set
 
 #
-# USB Storage Device Configuration
+# System Logging
 #
-CONFIG_USBMSC=n
-CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBMSC_REMOVABLE=y
+# CONFIG_SYSLOG_ENABLE is not set
+# CONFIG_SYSLOG is not set
 
 #
-# Graphics related configuration settings
+# Graphics Support
 #
 CONFIG_NX=y
-CONFIG_NX_MULTIUSER=n
+CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
+# CONFIG_NX_WRITEONLY is not set
+
+#
+# Supported Pixel Depths
+#
 CONFIG_NX_DISABLE_1BPP=y
 CONFIG_NX_DISABLE_2BPP=y
 CONFIG_NX_DISABLE_4BPP=y
 CONFIG_NX_DISABLE_8BPP=y
-CONFIG_NX_DISABLE_16BPP=n
+# CONFIG_NX_DISABLE_16BPP is not set
 CONFIG_NX_DISABLE_24BPP=y
 CONFIG_NX_DISABLE_32BPP=y
-CONFIG_NX_PACKEDMSFIRST=n
-CONFIG_NX_LCDDRIVER=y
-CONFIG_LCD_MAXPOWER=31
-CONFIG_LCD_MAXCONTRAST=1
+# CONFIG_NX_PACKEDMSFIRST is not set
+
+#
+# Input Devices
+#
 CONFIG_NX_MOUSE=y
 CONFIG_NX_KBD=y
-#CONFIG_NXTK_BORDERWIDTH=4
-#CONFIG_NXTK_BORDERCOLOR1
-#CONFIG_NXTK_BORDERCOLOR2
-CONFIG_NXTK_AUTORAISE=n
-CONFIG_NXFONT_SANS23X27=y
-CONFIG_NXFONTS_CHARBITS=7
-CONFIG_NX_BLOCKING=y
-CONFIG_NX_MXSERVERMSGS=32
-CONFIG_NX_MXCLIENTMSGS=16
 
 #
-# SAM3U-EK LCD Hardware Configuration
+# Framed Window Borders
 #
-CONFIG_LCD_LANDSCAPE=n
-CONFIG_LCD_PORTRAIT=y
+CONFIG_NXTK_BORDERWIDTH=4
+CONFIG_NXTK_BORDERCOLOR1=0
+CONFIG_NXTK_BORDERCOLOR2=0
+CONFIG_NXTK_BORDERCOLOR3=0
+# CONFIG_NXTK_AUTORAISE is not set
+
+#
+# Font Selections
+#
+CONFIG_NXFONTS_CHARBITS=7
+# CONFIG_NXFONT_MONO5X8 is not set
+# CONFIG_NXFONT_SANS17X22 is not set
+# CONFIG_NXFONT_SANS20X26 is not set
+CONFIG_NXFONT_SANS23X27=y
+# CONFIG_NXFONT_SANS22X29 is not set
+# CONFIG_NXFONT_SANS28X37 is not set
+# CONFIG_NXFONT_SANS39X48 is not set
+# CONFIG_NXFONT_SANS17X23B is not set
+# CONFIG_NXFONT_SANS20X27B is not set
+# CONFIG_NXFONT_SANS22X29B is not set
+# CONFIG_NXFONT_SANS28X37B is not set
+# CONFIG_NXFONT_SANS40X49B is not set
+# CONFIG_NXFONT_SERIF22X29 is not set
+# CONFIG_NXFONT_SERIF29X37 is not set
+# CONFIG_NXFONT_SERIF38X48 is not set
+# CONFIG_NXFONT_SERIF22X28B is not set
+# CONFIG_NXFONT_SERIF27X38B is not set
+# CONFIG_NXFONT_SERIF38X49B is not set
+# CONFIG_NXCONSOLE is not set
 
 #
-# Settings for examples/uip
+# NX Multi-user only options
 #
-CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLES_UIP_DHCPC=n
+# CONFIG_NX_MULTIUSER is not set
 
 #
-# Settings for examples/nettest
-CONFIG_EXAMPLES_NETTEST_SERVER=n
-CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLES_NETTEST_NOMAC=n
-CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
+# Memory Management
+#
+# CONFIG_MM_MULTIHEAP is not set
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=3
+# CONFIG_GRAN is not set
 
 #
-# Settings for examples/ostest
+# Audio Support
 #
-CONFIG_EXAMPLES_OSTEST_LOOPS=1
-CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
-CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
+# CONFIG_AUDIO is not set
 
 #
-# Settings for apps/nshlib
+# Binary Formats
 #
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_BINFMT_EXEPATH is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
 CONFIG_BUILTIN=y
-CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_STRERROR=n
-CONFIG_NSH_LINELEN=64
-CONFIG_NSH_NESTDEPTH=3
-CONFIG_NSH_DISABLESCRIPT=n
-CONFIG_NSH_DISABLEBG=n
-CONFIG_NSH_ROMFSETC=n
-CONFIG_NSH_CONSOLE=y
-#CONFIG_NSH_CONDEV="/dev/ttyS1"
-CONFIG_NSH_TELNET=n
-CONFIG_NSH_ARCHINIT=n
-CONFIG_NSH_IOBUFFER_SIZE=512
-CONFIG_NSH_DHCPC=n
-CONFIG_NSH_NOMAC=n
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-CONFIG_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_NSH_ROMFSDEVNO=0
-CONFIG_NSH_ROMFSSECTSIZE=64
-CONFIG_NSH_FATDEVNO=1
-CONFIG_NSH_FATSECTSIZE=512
-CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT="/tmp"
-
-#
-# Architecture-specific NSH options
-#
-CONFIG_NSH_MMCSDSPIPORTNO=0
-CONFIG_NSH_MMCSDSLOTNO=0
-CONFIG_NSH_MMCSDMINOR=0
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
+
+#
+# Library Routines
+#
+
+#
+# Standard C Library Options
+#
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=y
+CONFIG_NUNGET_CHARS=2
+CONFIG_LIB_HOMEDIR="/"
+# CONFIG_LIBM is not set
+# CONFIG_NOPRINTF_FIELDWIDTH is not set
+# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIB_RAND_ORDER=1
+# CONFIG_EOL_IS_CR is not set
+# CONFIG_EOL_IS_LF is not set
+# CONFIG_EOL_IS_BOTH_CRLF is not set
+CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+# CONFIG_LIBC_STRERROR is not set
+# CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_ARCH_LOWPUTC=y
+CONFIG_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 
 #
-# Settings for examples/usbserial
+# Non-standard Library Support
 #
-CONFIG_EXAMPLES_USBSERIAL_INONLY=n
-CONFIG_EXAMPLES_USBSERIAL_OUTONLY=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
+CONFIG_SCHED_WORKQUEUE=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_WORKPRIORITY=192
+CONFIG_SCHED_WORKPERIOD=50000
+CONFIG_SCHED_WORKSTACKSIZE=1024
+# CONFIG_SCHED_LPWORK is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
 
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
+#
+# Basic CXX Support
+#
+# CONFIG_C99_BOOL8 is not set
+# CONFIG_HAVE_CXX is not set
+
+#
+# Application Configuration
+#
+
+#
+# Built-In Applications
+#
+CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
 #
-# Settings for examples/nx
+# Examples
 #
+# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_COMPOSITE is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+# CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MM is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
+CONFIG_EXAMPLES_NSH=y
+# CONFIG_EXAMPLES_NULL is not set
+CONFIG_EXAMPLES_NX=y
 CONFIG_EXAMPLES_NX_BUILTIN=y
 CONFIG_EXAMPLES_NX_VPLANE=0
 CONFIG_EXAMPLES_NX_DEVNO=0
+# CONFIG_EXAMPLES_NX_DEFAULT_COLORS is not set
 CONFIG_EXAMPLES_NX_BGCOLOR=0x7b5d
 CONFIG_EXAMPLES_NX_COLOR1=0xe73f
 CONFIG_EXAMPLES_NX_COLOR2=0xdefb
 CONFIG_EXAMPLES_NX_TBCOLOR=0xad55
 CONFIG_EXAMPLES_NX_FONTCOLOR=0x0000
+CONFIG_EXAMPLES_NX_DEFAULT_FONT=y
 CONFIG_EXAMPLES_NX_BPP=16
-CONFIG_EXAMPLES_NX_RAWWINDOWS=n
-CONFIG_EXAMPLES_NX_STACKSIZE=2048
-CONFIG_EXAMPLES_NX_CLIENTPRIO=80
-CONFIG_EXAMPLES_NX_SERVERPRIO=120
-CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
+# CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
+# CONFIG_EXAMPLES_NX_EXTERNINIT is not set
+# CONFIG_EXAMPLES_NXCONSOLE is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXFLAT is not set
+CONFIG_EXAMPLES_NXHELLO=y
+CONFIG_EXAMPLES_NXHELLO_VPLANE=0
+CONFIG_EXAMPLES_NXHELLO_DEVNO=0
+CONFIG_EXAMPLES_NXHELLO_BPP=16
 
 #
-# Settings for examples/nxhello
+# Example Color Configuration
 #
-CONFIG_EXAMPLES_NXHELLO_BUILTIN=y
-CONFIG_EXAMPLES_NXHELLO_VPLANE=0
-CONFIG_EXAMPLES_NXHELLO_DEVNO=0
+# CONFIG_EXAMPLES_NXHELLO_DEFAULT_COLORS is not set
 CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011
-CONFIG_EXAMPLES_NXHELLO_FONTID=6
 CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf
-CONFIG_EXAMPLES_NXHELLO_BPP=16
-CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n
 
 #
-# Settings for examples/nximage
+# Example Font Configuration
 #
-CONFIG_EXAMPLES_NXIMAGE_BUILTIN=y
-CONFIG_EXAMPLES_NXIMAGE_VPLANE=0
-CONFIG_EXAMPLES_NXIMAGE_DEVNO=0
-CONFIG_EXAMPLES_NXIMAGE_BPP=16
-CONFIG_EXAMPLES_NXIMAGE_XSCALEp5=n
-CONFIG_EXAMPLES_NXIMAGE_XSCALE1p5=y
-CONFIG_EXAMPLES_NXIMAGE_XSCALE2p0=n
-CONFIG_EXAMPLES_NXIMAGE_YSCALEp5=n
-CONFIG_EXAMPLES_NXIMAGE_YSCALE1p5=y
-CONFIG_EXAMPLES_NXIMAGE_YSCALE2p0=n
-CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
+# CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT is not set
+CONFIG_EXAMPLES_NXHELLO_FONTID=6
+# CONFIG_EXAMPLES_NXHELLO_EXTERNINIT is not set
+# CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTEXT is not set
+# CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_ROMFS is not set
+# CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
+# CONFIG_EXAMPLES_TELNETD is not set
+# CONFIG_EXAMPLES_THTTPD is not set
+# CONFIG_EXAMPLES_TIFF is not set
+CONFIG_EXAMPLES_TOUCHSCREEN=y
+CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
+CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
+CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
+# CONFIG_EXAMPLES_UDP is not set
+# CONFIG_EXAMPLES_UIP is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_USBMSC is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
 
 #
-# Settings for examples/nxlines
+# Graphics Support
 #
-CONFIG_EXAMPLES_NXLINES_VPLANE=0
-CONFIG_EXAMPLES_NXLINES_DEVNO=0
-CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320
-CONFIG_EXAMPLES_NXLINES_LINEWIDTH=16
-CONFIG_EXAMPLES_NXLINES_LINECOLOR=0xffe0
-CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4
-CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0xffe0
-CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0xf7bb
-CONFIG_EXAMPLES_NXLINES_BPP=16
-CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
+# CONFIG_TIFF is not set
 
 #
-# Settings for examples/touchscreen
+# Interpreters
 #
-CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=y
-CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
-CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
-CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Stack and heap information
+# Network Utilities
+#
+
+#
+# Networking Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_DHCPC is not set
+# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_FTPC is not set
+# CONFIG_NETUTILS_FTPD is not set
+# CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TELNETD is not set
+# CONFIG_NETUTILS_TFTPC is not set
+# CONFIG_NETUTILS_THTTPD is not set
+# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_WEBCLIENT is not set
+
+#
+# FreeModBus
+#
+# CONFIG_MODBUS is not set
+
+#
+# NSH Library
+#
+CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_BUILTIN_APPS=y
+
+#
+# Disable Individual commands
+#
+# CONFIG_NSH_DISABLE_CAT is not set
+# CONFIG_NSH_DISABLE_CD is not set
+# CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_DD is not set
+# CONFIG_NSH_DISABLE_ECHO is not set
+# CONFIG_NSH_DISABLE_EXEC is not set
+# CONFIG_NSH_DISABLE_EXIT is not set
+# CONFIG_NSH_DISABLE_FREE is not set
+# CONFIG_NSH_DISABLE_GET is not set
+# CONFIG_NSH_DISABLE_HELP is not set
+# CONFIG_NSH_DISABLE_HEXDUMP is not set
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_KILL is not set
+# CONFIG_NSH_DISABLE_LOSETUP is not set
+# CONFIG_NSH_DISABLE_LS is not set
+# CONFIG_NSH_DISABLE_MB is not set
+# CONFIG_NSH_DISABLE_MKDIR is not set
+# CONFIG_NSH_DISABLE_MKFATFS is not set
+# CONFIG_NSH_DISABLE_MKFIFO is not set
+# CONFIG_NSH_DISABLE_MKRD is not set
+# CONFIG_NSH_DISABLE_MH is not set
+# CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_NSFMOUNT is not set
+# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_NSH_DISABLE_PING is not set
+# CONFIG_NSH_DISABLE_PUT is not set
+# CONFIG_NSH_DISABLE_PWD is not set
+# CONFIG_NSH_DISABLE_RM is not set
+# CONFIG_NSH_DISABLE_RMDIR is not set
+# CONFIG_NSH_DISABLE_SET is not set
+# CONFIG_NSH_DISABLE_SH is not set
+# CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TEST is not set
+# CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNSET is not set
+# CONFIG_NSH_DISABLE_USLEEP is not set
+# CONFIG_NSH_DISABLE_WGET is not set
+# CONFIG_NSH_DISABLE_XD is not set
+
+#
+# Configure Command Options
+#
+# CONFIG_NSH_CMDOPT_DF_H is not set
+CONFIG_NSH_CODECS_BUFSIZE=128
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLEBG is not set
+CONFIG_NSH_CONSOLE=y
+
+#
+# USB Trace Support
+#
+# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ARCHINIT is not set
+
+#
+# NxWidgets/NxWM
+#
+
+#
+# System NSH Add-Ons
+#
+
+#
+# Custom Free Memory Command
+#
+# CONFIG_SYSTEM_FREE is not set
+
+#
+# I2C tool
+#
+
+#
+# FLASH Program Installation
+#
+# CONFIG_SYSTEM_INSTALL is not set
+
+#
+# FLASH Erase-all Command
+#
+
+#
+# readline()
+#
+CONFIG_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+
+#
+# Power Off
+#
+# CONFIG_SYSTEM_POWEROFF is not set
+
+#
+# RAMTRON
+#
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
 #
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
diff --git a/nuttx/include/stdio.h b/nuttx/include/stdio.h
index 7a1b05270..eb977d38d 100644
--- a/nuttx/include/stdio.h
+++ b/nuttx/include/stdio.h
@@ -128,13 +128,13 @@ int    ungetc(int c, FAR FILE *stream);
 
 /* Operations on the stdout stream, buffers, paths, and the whole printf-family */
 
-int    printf(const char *format, ...);
+int    printf(FAR const char *format, ...);
 int    puts(FAR const char *s);
 int    rename(FAR const char *oldpath, FAR const char *newpath);
-int    sprintf(FAR char *buf, const char *format, ...);
-int    asprintf (FAR char **ptr, const char *fmt, ...);
-int    snprintf(FAR char *buf, size_t size, const char *format, ...);
-int    sscanf(const char *buf, const char *fmt, ...);
+int    sprintf(FAR char *buf, FAR const char *format, ...);
+int    asprintf (FAR char **ptr, FAR const char *fmt, ...);
+int    snprintf(FAR char *buf, size_t size, FAR const char *format, ...);
+int    sscanf(FAR const char *buf, FAR const char *fmt, ...);
 void   perror(FAR const char *s);
 
 int    vprintf(FAR const char *format, va_list ap);
@@ -144,9 +144,19 @@ int    avsprintf(FAR char **ptr, const char *fmt, va_list ap);
 int    vsnprintf(FAR char *buf, size_t size, const char *format, va_list ap);
 int    vsscanf(char *buf, const char *s, va_list ap);
 
-/* POSIX-like File System Interfaces */
+/* Operations on file descriptors including:
+ *
+ * POSIX-like File System Interfaces (fdopen), and
+ * Extensions from the Open Group Technical Standard, 2006, Extended API Set
+ *   Part 1 (dprintf and vdprintf)
+ */
 
 FAR FILE *fdopen(int fd, FAR const char *type);
+int    dprintf(int fd, FAR const char *fmt, ...);
+int    vdprintf(int fd, FAR const char *fmt, va_list ap);
+
+/* Operations on paths */
+
 int    statfs(FAR const char *path, FAR struct statfs *buf);
 
 #undef EXTERN
diff --git a/nuttx/libc/lib_internal.h b/nuttx/libc/lib_internal.h
index 76a37de0d..a85e815ff 100644
--- a/nuttx/libc/lib_internal.h
+++ b/nuttx/libc/lib_internal.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libc/lib_internal.h
  *
- *   Copyright (C) 2007-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/libc/stdio/Make.defs b/nuttx/libc/stdio/Make.defs
index ffc9b1a75..b64d2bd5b 100644
--- a/nuttx/libc/stdio/Make.defs
+++ b/nuttx/libc/stdio/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # libc/stdio/Make.defs
 #
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,6 +40,7 @@
 CSRCS += lib_fileno.c lib_printf.c lib_syslog.c lib_lowsyslog.c\
 		 lib_sprintf.c lib_asprintf.c lib_snprintf.c lib_libsprintf.c \
 		 lib_vsprintf.c lib_avsprintf.c lib_vsnprintf.c lib_libvsprintf.c \
+		 lib_dprintf.c lib_vdprintf.c \
 		 lib_meminstream.c lib_memoutstream.c lib_lowinstream.c \
 		 lib_lowoutstream.c lib_zeroinstream.c lib_nullinstream.c \
 		 lib_nulloutstream.c lib_sscanf.c
diff --git a/nuttx/libc/stdio/lib_dprintf.c b/nuttx/libc/stdio/lib_dprintf.c
new file mode 100644
index 000000000..0ea647517
--- /dev/null
+++ b/nuttx/libc/stdio/lib_dprintf.c
@@ -0,0 +1,60 @@
+/****************************************************************************
+ * libc/stdio/lib_dprintf.c
+ *
+ *   Copyright (C) 2012 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <stdio.h>
+
+/****************************************************************************
+ * Public Functions
+ **************************************************************************/
+
+/****************************************************************************
+ * Name: dprintf
+ **************************************************************************/
+
+int dprintf(int fd, FAR const char *fmt, ...)
+{
+  va_list ap;
+  int ret;
+
+  va_start(ap, fmt);
+  ret = vdprintf(fd, fmt, ap);
+  va_end(ap);
+
+  return ret;
+}
diff --git a/nuttx/libc/stdio/lib_vdprintf.c b/nuttx/libc/stdio/lib_vdprintf.c
new file mode 100644
index 000000000..8cdea96c6
--- /dev/null
+++ b/nuttx/libc/stdio/lib_vdprintf.c
@@ -0,0 +1,59 @@
+/****************************************************************************
+ * libc/stdio/lib_vdprintf.c
+ *
+ *   Copyright (C) 2012 Andrew Tridgell. All rights reserved.
+ *   Authors: Author: Andrew Tridgell <andrew@tridgell.net>
+ *            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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <stdio.h>
+
+#include "lib_internal.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int vdprintf(int fd, FAR const char *fmt, va_list ap)
+{
+  struct lib_rawoutstream_s rawoutstream;
+
+  /* Wrap the fd in a stream object and let lib_vsprintf do the work. */
+
+   lib_rawoutstream(&rawoutstream, fd);
+   return lib_vsprintf(&rawoutstream.public, fmt, ap);
+} 
diff --git a/nuttx/tools/indent.sh b/nuttx/tools/indent.sh
index 739b791bd..4ebae9652 100755
--- a/nuttx/tools/indent.sh
+++ b/nuttx/tools/indent.sh
@@ -41,6 +41,7 @@
 # - I usually align things vertically (like '=' in assignments),
 # - indent puts a bogus blank line at the top of the file,
 # - I don't like the way it handles nested conditional compilation intermixed with code.
+# - I also indent brackets differently on structures than does not script.
 #
 
 # Constants