diff --git a/arch/arm/src/samv7/sam_gpio.c b/arch/arm/src/samv7/sam_gpio.c
index 7cd338eb4a..99f8946171 100644
--- a/arch/arm/src/samv7/sam_gpio.c
+++ b/arch/arm/src/samv7/sam_gpio.c
@@ -89,7 +89,7 @@ static const char g_portchar[SAMV7_NPIO] =
  * Public Data
  ****************************************************************************/
 
-const uintptr_t g_portchar[SAMV7_NPIO] =
+const uintptr_t g_portbase[SAMV7_NPIO] =
 {
  SAM_PIOA_BASE
 #if SAMV7_NPIO > 1
diff --git a/arch/arm/src/samv7/sam_gpio.h b/arch/arm/src/samv7/sam_gpio.h
index 89ff23e104..4b5b6f5208 100755
--- a/arch/arm/src/samv7/sam_gpio.h
+++ b/arch/arm/src/samv7/sam_gpio.h
@@ -130,7 +130,7 @@
  *   .... .... .... .... .... PPP. ....
  */
 
-#define GPIO_PORT_SHIFT            (5)         /* Bit 5-6:  Port number */
+#define GPIO_PORT_SHIFT            (5)         /* Bit 5-7:  Port number */
 #define GPIO_PORT_MASK             (7 << GPIO_PORT_SHIFT)
 #  define GPIO_PORT_PIOA           (0 << GPIO_PORT_SHIFT)
 #  define GPIO_PORT_PIOB           (1 << GPIO_PORT_SHIFT)
@@ -201,7 +201,7 @@ extern "C"
 #define EXTERN extern
 #endif
 
-EXTERN const uintptr_t g_portchar[SAMV7_NPIO];
+EXTERN const uintptr_t g_portbase[SAMV7_NPIO];
 
 /************************************************************************************
  * Inline Functions
@@ -219,7 +219,7 @@ static inline uintptr_t sam_gpio_base(gpio_pinset_t cfgset)
 {
   int port = (cfgset & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
   DEBUGASSERT(port <SAMV7_NPIO);
-  return g_portchar[port];
+  return g_portbase[port];
 }
 
 /****************************************************************************