diff --git a/arch/arm/include/sam34/sam4e_irq.h b/arch/arm/include/sam34/sam4e_irq.h
index 85f63c2766..c67495da03 100755
--- a/arch/arm/include/sam34/sam4e_irq.h
+++ b/arch/arm/include/sam34/sam4e_irq.h
@@ -90,7 +90,7 @@
 #define SAM_PID_CAN0          (37)  /* CAN0 */
 #define SAM_PID_CAN1          (38)  /* CAN1 */
 #define SAM_PID_AES           (39)  /* AES */
-                                    /* 40-43: Reserved
+                                    /* 40-43: Reserved */
 #define SAM_PID_EMAC          (44)  /* EMAC */
 #define SAM_PID_UART1         (45)  /* UART */
                                     /* 46: Reserved */
diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig
index e5a4aa20c9..1c31f54270 100644
--- a/arch/arm/src/sam34/Kconfig
+++ b/arch/arm/src/sam34/Kconfig
@@ -234,6 +234,10 @@ config ARCH_CHIP_SAM4L
 config ARCH_CHIP_SAM4E
 	bool
 	default n
+	select ARCH_HAVE_EXTNOR
+	select ARCH_HAVE_EXTNAND
+	select ARCH_HAVE_EXTSRAM0
+	select ARCH_HAVE_EXTSRAM1
 
 config ARCH_CHIP_SAM4S
 	bool
@@ -319,7 +323,7 @@ config SAM34_TC6
 	depends on ARCH_CHIP_SAM3X || ARCH_CHIP_SAM3A || ARCH_CHIP_SAM4E
 
 config SAM34_TC7
-	bool "Timer/Counter 7 (TC6)"
+	bool "Timer/Counter 7 (TC7)"
 	default n
 	depends on ARCH_CHIP_SAM3X || ARCH_CHIP_SAM3A || ARCH_CHIP_SAM4E
 
@@ -414,7 +418,7 @@ config SAM34_AFEC0
 	default n
 	depends on ARCH_CHIP_SAM4E
 
-config SAM34_AFEC0
+config SAM34_AFEC1
 	bool "Analog Front End 1"
 	default n
 	depends on ARCH_CHIP_SAM4E
@@ -549,12 +553,12 @@ config SAM34_PEVC
 config SAM34_CHIPID
 	bool "Chip ID"
 	default n
-	depends on ARCH_CHIP_SAM4L
+	depends on ARCH_CHIP_SAM4L || ARCH_CHIP_SAM4E
 
 config SAM34_FREQM
 	bool "Frequency Meter (FREQM)"
 	default n
-	depends on ARCH_CHIP_SAM4L || ARCH_CHIP_SAM4E
+	depends on ARCH_CHIP_SAM4L
 
 config SAM34_AST
 	bool "Asynchronous Timer (AST)"
diff --git a/arch/arm/src/sam34/chip/sam4e_pinmap.h b/arch/arm/src/sam34/chip/sam4e_pinmap.h
index 28145fc47f..ebf2747322 100644
--- a/arch/arm/src/sam34/chip/sam4e_pinmap.h
+++ b/arch/arm/src/sam34/chip/sam4e_pinmap.h
@@ -166,8 +166,8 @@
 #define GPIO_PWM3_H_2     (GPIO_PERIPHA | GPIO_CFG_DEFAULT | GPIO_PORT_PIOD | GPIO_PIN23)
 #define GPIO_PWM3_H_3     (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOA | GPIO_PIN14)
 #define GPIO_PWM3_H_4     (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOA | GPIO_PIN7)
-#define GPIO_PWM3_H_4     (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOB | GPIO_PIN14)
-#define GPIO_PWM3_H_5     (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOC | GPIO_PIN21)
+#define GPIO_PWM3_H_5     (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOB | GPIO_PIN14)
+#define GPIO_PWM3_H_6     (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOC | GPIO_PIN21)
 #define GPIO_PWM3_L_1     (GPIO_PERIPHC | GPIO_CFG_DEFAULT | GPIO_PORT_PIOA | GPIO_PIN15)
 #define GPIO_PWM3_L_2     (GPIO_PERIPHA | GPIO_CFG_DEFAULT | GPIO_PORT_PIOD | GPIO_PIN27)
 #define GPIO_PWM3_L_3     (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOC | GPIO_PIN22)
diff --git a/arch/arm/src/sam34/chip/sam4e_vectors.h b/arch/arm/src/sam34/chip/sam4e_vectors.h
index b881233f9e..5caa10fe39 100644
--- a/arch/arm/src/sam34/chip/sam4e_vectors.h
+++ b/arch/arm/src/sam34/chip/sam4e_vectors.h
@@ -59,7 +59,7 @@
   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_eefc, SAM_IRQ_EEFC)      /* Vector 16+6:  Enhanced Embedded Flash Controller */
+  VECTOR(sam_eefc0, SAM_PID_EEFC0)    /* Vector 16+6:  Enhanced Embedded Flash Controller */
   VECTOR(sam_uart0, SAM_IRQ_UART0)    /* Vector 16+7:  Universal Asynchronous Receiver Transmitter 0 */
   UNUSED(SAM_IRQ_RESERVED_8)          /* Vector 16+8:  Static Memory Controller (no vector) */
   VECTOR(sam_pioa, SAM_IRQ_PIOA)      /* Vector 16+9:  Parallel I/O Controller A */
@@ -80,9 +80,9 @@
   VECTOR(sam_tc3, SAM_IRQ_TC3)        /* Vector 16+24: Timer Counter 3 */
   VECTOR(sam_tc4, SAM_IRQ_TC4)        /* Vector 16+25: Timer Counter 4 */
   VECTOR(sam_tc5, SAM_IRQ_TC5)        /* Vector 16+26: Timer Counter 5 */
-  VECTOR(sam_tc5, SAM_IRQ_TC6)        /* Vector 16+27: Timer Counter 6 */
-  VECTOR(sam_tc5, SAM_IRQ_TC7)        /* Vector 16+28: Timer Counter 7 */
-  VECTOR(sam_tc5, SAM_IRQ_TC8)        /* Vector 16+29: Timer Counter 8 */
+  VECTOR(sam_tc6, SAM_IRQ_TC6)        /* Vector 16+27: Timer Counter 6 */
+  VECTOR(sam_tc7, SAM_IRQ_TC7)        /* Vector 16+28: Timer Counter 7 */
+  VECTOR(sam_tc8, SAM_IRQ_TC8)        /* Vector 16+29: Timer Counter 8 */
   VECTOR(sam_afec0, SAM_IRQ_AFEC0)    /* Vector 16+30: Analog Front End 0 */
   VECTOR(sam_afec1, SAM_IRQ_AFEC1)    /* Vector 16+31: Analog Front End 1 */
   VECTOR(sam_dacc, SAM_IRQ_DACC)      /* Vector 16+32: Digital To Analog Converter */
diff --git a/arch/arm/src/sam34/sam_clockconfig.c b/arch/arm/src/sam34/sam_clockconfig.c
index 28e2b91948..3799416b0b 100644
--- a/arch/arm/src/sam34/sam_clockconfig.c
+++ b/arch/arm/src/sam34/sam_clockconfig.c
@@ -228,7 +228,7 @@ static inline void sam_pmcsetup(void)
    * to PLLA_MMAX.
    */
 
-  putreg32(PMC_PMMR_MASK, SAM_PMC_CKGR_PMMR);
+  putreg32(PMC_PMMR_MASK, SAM_PMC_PMMR);
 #endif
 
   /* Setup PLLA and wait for LOCKA */