diff --git a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
index 3479099bf6c..d9894b3ff70 100644
--- a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
@@ -1,8 +1,9 @@
 /********************************************************************************************
  * arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
  *
- *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
+ *   Authors: Gregory Nutt <gnutt@nuttx.org>
+ *            David Sidrane <david_s5@nscdg.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -305,26 +306,26 @@
 
 /* I2C */
 
-#define PIN_I2C0_SCL_1            (PIN_ALT2   | PIN_PORTB | PIN0)
-#define PIN_I2C0_SCL_2            (PIN_ALT2   | PIN_PORTB | PIN2)
-#define PIN_I2C0_SCL_3            (PIN_ALT2   | PIN_PORTD | PIN8)
-#define PIN_I2C0_SCL_4            (PIN_ALT5   | PIN_PORTE | PIN24)
-#define PIN_I2C0_SCL_5            (PIN_ALT7   | PIN_PORTD | PIN2)
-#define PIN_I2C0_SDA_1            (PIN_ALT2   | PIN_PORTB | PIN1)
-#define PIN_I2C0_SDA_2            (PIN_ALT2   | PIN_PORTB | PIN3)
-#define PIN_I2C0_SDA_3            (PIN_ALT2   | PIN_PORTD | PIN9)
-#define PIN_I2C0_SDA_4            (PIN_ALT5   | PIN_PORTE | PIN25)
-#define PIN_I2C0_SDA_5            (PIN_ALT7   | PIN_PORTD | PIN3)
+#define PIN_I2C0_SCL_1            (PIN_ALT2_OPENDRAIN | PIN_PORTB | PIN0)
+#define PIN_I2C0_SCL_2            (PIN_ALT2_OPENDRAIN | PIN_PORTB | PIN2)
+#define PIN_I2C0_SCL_3            (PIN_ALT2_OPENDRAIN | PIN_PORTD | PIN8)
+#define PIN_I2C0_SCL_4            (PIN_ALT5_OPENDRAIN | PIN_PORTE | PIN24)
+#define PIN_I2C0_SCL_5            (PIN_ALT7_OPENDRAIN | PIN_PORTD | PIN2)
+#define PIN_I2C0_SDA_1            (PIN_ALT2_OPENDRAIN | PIN_PORTB | PIN1)
+#define PIN_I2C0_SDA_2            (PIN_ALT2_OPENDRAIN | PIN_PORTB | PIN3)
+#define PIN_I2C0_SDA_3            (PIN_ALT2_OPENDRAIN | PIN_PORTD | PIN9)
+#define PIN_I2C0_SDA_4            (PIN_ALT5_OPENDRAIN | PIN_PORTE | PIN25)
+#define PIN_I2C0_SDA_5            (PIN_ALT7_OPENDRAIN | PIN_PORTD | PIN3)
 
-#define PIN_I2C1_SCL_1            (PIN_ALT2   | PIN_PORTC | PIN10)
-#define PIN_I2C1_SCL_2            (PIN_ALT6   | PIN_PORTE | PIN1)
-#define PIN_I2C1_SDA_1            (PIN_ALT2   | PIN_PORTC | PIN11)
-#define PIN_I2C1_SDA_2            (PIN_ALT6   | PIN_PORTE | PIN0)
+#define PIN_I2C1_SCL_1            (PIN_ALT2_OPENDRAIN | PIN_PORTC | PIN10)
+#define PIN_I2C1_SCL_2            (PIN_ALT6_OPENDRAIN | PIN_PORTE | PIN1)
+#define PIN_I2C1_SDA_1            (PIN_ALT2_OPENDRAIN | PIN_PORTC | PIN11)
+#define PIN_I2C1_SDA_2            (PIN_ALT6_OPENDRAIN | PIN_PORTE | PIN0)
 
-#define PIN_I2C2_SCL_1            (PIN_ALT5   | PIN_PORTA | PIN12)
-#define PIN_I2C2_SCL_2            (PIN_ALT5   | PIN_PORTA | PIN14)
-#define PIN_I2C2_SDA_1            (PIN_ALT5   | PIN_PORTA | PIN11)
-#define PIN_I2C2_SDA_2            (PIN_ALT5   | PIN_PORTA | PIN13)
+#define PIN_I2C2_SCL_1            (PIN_ALT5_OPENDRAIN | PIN_PORTA | PIN12)
+#define PIN_I2C2_SCL_2            (PIN_ALT5_OPENDRAIN | PIN_PORTA | PIN14)
+#define PIN_I2C2_SDA_1            (PIN_ALT5_OPENDRAIN | PIN_PORTA | PIN11)
+#define PIN_I2C2_SDA_2            (PIN_ALT5_OPENDRAIN | PIN_PORTA | PIN13)
 
 /* I2S */