diff --git a/configs/sam3u-ek/include/board.h b/configs/sam3u-ek/include/board.h
index 4c46ca7240..78c197f73c 100644
--- a/configs/sam3u-ek/include/board.h
+++ b/configs/sam3u-ek/include/board.h
@@ -76,14 +76,14 @@
 
 /* USB UTMI PLL start-up time */
 
-#define BOARD_CKGR_UCKR_UPLLCOUNT (3 << PMC_CKGR_UCKR_UPLLCOUNT_SHIFT)
+#define BOARD_CKGR_UCKR_UPLLCOUNT  (3 << PMC_CKGR_UCKR_UPLLCOUNT_SHIFT)
 
 /* Resulting frequencies */
 
-#define SAM_MAINOSC_FREQUENCY      (12000000)
-#define SAM_MCK_FREQUENCY          (48000000)
-#define SAM_PLLA_FREQUENCY         (96000000)
-#define SAM_CPU_FREQUENCY          (48000000)
+#define BOARD_MAINOSC_FREQUENCY    (12000000)
+#define BOARD_MCK_FREQUENCY        (48000000)
+#define BOARD_PLLA_FREQUENCY       (96000000)
+#define BOARD_CPU_FREQUENCY        (48000000)
 
 /* HSMCI clocking
  *
diff --git a/configs/sam4s-xplained/README.txt b/configs/sam4s-xplained/README.txt
index 234b813fb5..17863d7d32 100644
--- a/configs/sam4s-xplained/README.txt
+++ b/configs/sam4s-xplained/README.txt
@@ -7,7 +7,8 @@ README
 
   The SAM4S Xplained features:
 
-    - 12MHz crystal (no 32.768KHz crystal)S
+    - 120 MHz Cortex-M4 with MPU
+    - 12MHz crystal (no 32.768KHz crystal)
     - Segger J-Link JTAG emulator on-board for program and debug
     - MICRO USB A/B connector for USB connectivity
     - IS66WV51216DBLL ISSI SRAM 8Mb 512K x 16 55ns PSRAM 2.5v-3.6v
diff --git a/configs/sam4s-xplained/include/board.h b/configs/sam4s-xplained/include/board.h
index 7f60109c91..8c81e0b92f 100644
--- a/configs/sam4s-xplained/include/board.h
+++ b/configs/sam4s-xplained/include/board.h
@@ -72,35 +72,37 @@
 
 /* Clocking *************************************************************************/
 /* After power-on reset, the sam3u device is running on a 4MHz internal RC.  These
- * definitions will configure clocking with MCK = 48MHz, PLLA = 96, and CPU=48MHz.
+ * definitions will configure clocking with MCK = 48MHz, PLLA = 96, and CPU=120MHz.
  */
 
 /* Main oscillator register settings */
 
 #define BOARD_CKGR_MOR_MOSCXTST    (63 << PMC_CKGR_MOR_MOSCXTST_SHIFT) /* Start-up Time */
 
-/* PLLA configuration */
+/* PLLA configuration:
+ *
+ * Source: 12MHz crystall at 12MHz
+ * PLLdiv: 10
+ * PLLmul: 1 (bypassed)
+ * Fpll:   (12MHz * 10) / 1 = 120MHz
+ */
 
-#define BOARD_CKGR_PLLAR_MUL       (7 << PMC_CKGR_PLLAR_MUL_SHIFT)
-#define BOARD_CKGR_PLLAR_STMODE    PMC_CKGR_PLLAR_STMODE_FAST
-#define BOARD_CKGR_PLLAR_COUNT     (63 << PMC_CKGR_PLLAR_COUNT_SHIFT)
+#define BOARD_MAINOSC_FREQUENCY    (12000000)
+#define BOARD_CKGR_PLLAR_MUL       (9 << PMC_CKGR_PLLAR_MUL_SHIFT)
 #define BOARD_CKGR_PLLAR_DIV       PMC_CKGR_PLLAR_DIV_BYPASS
+#define BOARD_CKGR_PLLAR_COUNT     (63 << PMC_CKGR_PLLAR_COUNT_SHIFT)
+#define BOARD_PLLA_FREQUENCY       (10*BOARD_MAINOSC_FREQUENCY)
 
 /* PMC master clock register settings */
 
 #define BOARD_PMC_MCKR_CSS         PMC_MCKR_CSS_PLLA
-#define BOARD_PMC_MCKR_PRES        PMC_MCKR_PRES_DIV2
+#define BOARD_PMC_MCKR_PRES        PMC_MCKR_PRES_DIV1
+#define BOARD_MCK_FREQUENCY        (BOARD_PLLA_FREQUENCY/1)
+#define BOARD_CPU_FREQUENCY        (BOARD_PLLA_FREQUENCY/1)
 
 /* USB UTMI PLL start-up time */
 
-#define BOARD_CKGR_UCKR_UPLLCOUNT (3 << PMC_CKGR_UCKR_UPLLCOUNT_SHIFT)
-
-/* Resulting frequencies */
-
-#define SAM_MAINOSC_FREQUENCY      (12000000)
-#define SAM_MCK_FREQUENCY          (48000000)
-#define SAM_PLLA_FREQUENCY         (96000000)
-#define SAM_CPU_FREQUENCY          (48000000)
+#define BOARD_CKGR_UCKR_UPLLCOUNT  (3 << PMC_CKGR_UCKR_UPLLCOUNT_SHIFT)
 
 /* HSMCI clocking
  *
diff --git a/configs/sam4s-xplained/ostest/defconfig b/configs/sam4s-xplained/ostest/defconfig
index 5a42798ef0..1202cc8556 100644
--- a/configs/sam4s-xplained/ostest/defconfig
+++ b/configs/sam4s-xplained/ostest/defconfig
@@ -193,7 +193,7 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
 CONFIG_BOARD_LOOPSPERMSEC=4768
 # CONFIG_ARCH_CALIBRATION is not set
 CONFIG_DRAM_START=0x20000000
-CONFIG_DRAM_SIZE=32768
+CONFIG_DRAM_SIZE=131072
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 
diff --git a/configs/sam4s-xplained/src/sam4s-xplained.h b/configs/sam4s-xplained/src/sam4s-xplained.h
index ce806ae5e5..f9ea61858d 100644
--- a/configs/sam4s-xplained/src/sam4s-xplained.h
+++ b/configs/sam4s-xplained/src/sam4s-xplained.h
@@ -87,10 +87,10 @@
  */
 
 
-#define GPIO_D9     (GPIO_OUTPUT | GPIO_PULL_UP | GPIO_OUTPUT_SET | \
-                     GPIO_PORTC | GPIO_PIN10)
-#define GPIO_D10    (GPIO_OUTPUT | GPIO_PULL_UP | GPIO_OUTPUT_SET | \
-                     GPIO_PORTC | GPIO_PIN17)
+#define GPIO_D9     (GPIO_OUTPUT | GPIO_CFG_PULLUP | GPIO_OUTPUT_SET | \
+                     GPIO_PORT_PIOC | GPIO_PIN10)
+#define GPIO_D10    (GPIO_OUTPUT | GPIO_CFG_PULLUP | GPIO_OUTPUT_SET | \
+                     GPIO_PORT_PIOC | GPIO_PIN17)
 
 /* Mechanical buttons:
  *
@@ -101,9 +101,9 @@
  *   PA5 BP2
  */
 
-#define GPIO_BP2      (GPIO_INPUT | GPIO_PULL_UP | GPIO_GLITCH_FILTER | \
-                       GPIO_PORTA | GPIO_PIN5)
-#define IRQ_BP2       SAM_IRQ_PA5
+#define GPIO_BP2    (GPIO_INPUT | GPIO_CFG_PULLUP | GPIO_CFG_DEGLITCH | \
+                     GPIO_PORT_PIOA | GPIO_PIN5)
+#define IRQ_BP2     SAM_IRQ_PA5
 
 /************************************************************************************
  * Public Types
diff --git a/configs/sam4s-xplained/src/sam_autoleds.c b/configs/sam4s-xplained/src/sam_autoleds.c
index ff38947ee4..9b912e4ff2 100644
--- a/configs/sam4s-xplained/src/sam_autoleds.c
+++ b/configs/sam4s-xplained/src/sam_autoleds.c
@@ -46,7 +46,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "sam_gpip.h"
+#include "sam_gpio.h"
 #include "sam4s-xplained.h"
 
 #ifdef CONFIG_ARCH_LEDS