diff --git a/arch/arm/src/imx6/chip/imx_gpio.h b/arch/arm/src/imx6/chip/imx_gpio.h
index b63cb1a963e..88aa0675c31 100644
--- a/arch/arm/src/imx6/chip/imx_gpio.h
+++ b/arch/arm/src/imx6/chip/imx_gpio.h
@@ -165,6 +165,6 @@
 
 #define GPIO_ICR_SHIFT(n)        (((n) & 15) << 1)
 #define GPIO_ICR_MASK(n)         (3 << GPIO_ICR_SHIFT(n))
-#define GPIO_ICR(i,n)            ((uint32_t)(n) << GPIO_ICR_SHIFT(n))
+#define GPIO_ICR(i,n)            ((uint32_t)(i) << GPIO_ICR_SHIFT(n))
 
 #endif /* __ARCH_ARM_SRC_IMX6_CHIP_IMX_GPIO_H */
diff --git a/arch/arm/src/imx6/chip/imx_iomuxc.h b/arch/arm/src/imx6/chip/imx_iomuxc.h
index f0c14adf8c5..96bea8e098f 100644
--- a/arch/arm/src/imx6/chip/imx_iomuxc.h
+++ b/arch/arm/src/imx6/chip/imx_iomuxc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/imx6/imx_iomuxc.h
+ * arch/arm/src/imx6/chip/imx_iomuxc.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/imx6/imx_iomuxc.h b/arch/arm/src/imx6/imx_iomuxc.h
index dc7a7082d1f..3b3f822d274 100644
--- a/arch/arm/src/imx6/imx_iomuxc.h
+++ b/arch/arm/src/imx6/imx_iomuxc.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/imx/imx_iomuxc.h
+ * arch/arm/src/imx6/imx_iomuxc.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>