Merged in david_s5/nuttx/upstream_kinetis (pull request #211)

Upstream kinetis

Approved-by: Gregory Nutt

arch/arm/src/kinetis/chip/kinetis_k64k66mpu.h

@@ -1,8 +1,9 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/kinetis_mpu.h
+ * arch/arm/src/kinetis/chip/kinetis_k64k66mpu.h
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *   Copyright (C) 2011, 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
@@ -33,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64K66MPU_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64K66MPU_H
 
 /****************************************************************************************************
  * Included Files
@@ -355,4 +356,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64K66MPU_H */

arch/arm/src/kinetis/chip/kinetis_mpu.h

@@ -50,8 +50,8 @@
 
 #if defined(KINETIS_K20) || defined(KINETIS_K40) || defined(KINETIS_K60)
 #  include "chip/kinetis_k20k40k60mpu.h"
-#elif defined(KINETIS_K64)
-#  include "chip/kinetis_k64mpu.h"
+#elif defined(KINETIS_K64) || defined(KINETIS_K66)
+#  include "chip/kinetis_k64k66mpu.h"
 #else
 #  error "No MPU definitions for this Kinetis part"
 #endif

arch/arm/src/kinetis/kinetis_enet.c

@@ -147,6 +147,7 @@
  *
  * The Tower SER board uses a KSZ8041 PHY.
  * The Freedom K64F board uses a KSZ8081 PHY
+ * The Freedom K66F board uses a KSZ8081 PHY
  */
 
 #if defined(CONFIG_ETH0_PHY_KSZ8041)

configs/freedom-k66f/README.txt

@@ -970,3 +970,8 @@ Status
     The nsh configuration now builds successfully with USB device enabled.
     USB device, however, has not yet been tested.  I have not yet looked
     into 48MHz clocking requirements.
+
+  2017-02-14:  nsh: SDHC DMA is not working yet. Buttons and SDIO with
+    automounter is working.
+    netnsh:Is building but Ehternet is not working yet. TX is called but
+    not IRQ is issued.

configs/freedom-k66f/include/board.h

@@ -277,6 +277,45 @@
 #define PIN_I2C0_SCL      PIN_I2C0_SCL_3
 #define PIN_I2C0_SDA      PIN_I2C0_SDA_3
 
+/*
+ * Ethernet MAC/KSZ8081 PHY
+ *  ------------------------
+ *  ------------ ----------------- --------------------------------------------
+ * KSZ8081      Board Signal(s)   K66F Pin
+ * Pin Signal                     Function                       pinmux Name
+ * --- -------- ----------------- --------------------------------------------
+ *  1  VDD_1V2  VDDPLL_1.2V       ---                            ---
+ *  2  VDDA_3V3 VDDA_ENET         ---                            ---
+ *  3  RXM      ENET1_RX-         ---                            ---
+ *  4  RXP      ENET1_RX+         ---                            ---
+ *  5  TXM      ENET1_TX-         ---                            ---
+ *  6  TXP      ENET1_TX+         ---                            ---
+ *  7  X0       RMII_XTAL0        ---                            ---
+ *  8  XI       RMII_XTAL1        ---                            ---
+ *  9  REXT     ---               ---, Apparently not connected  ---
+ * 10  MDIO     RMII0_MDIO        PTB0/RMII0_MDIO                PIN_RMII0_MDIO
+ * 11  MDC      RMII0_MDC         PTB1/RMII0_MDC                 PIN_RMII0_MDC
+ * 12  RXD1     RMII0_RXD_1       PTA12/RMII0_RXD1               PIN_RMII0_RXD1
+ * 13  RXD0     RMII0_RXD_0       PTA13/RMII0_RXD0               PIN_RMII0_RXD0
+ * 14  VDDIO    VDDIO_ENET        ---                            ---
+ * 15  CRS_DIV                    PTA14/RMII0_CRS_DV             PIN_RMII0_CRS_DV
+ * 16  REF_CLK  PTE26             PTE26(Ethernet clock)          PTE26/ENET_1588_CLKIN
+ * 17  RXER     RMII0_RXER        PTA5/RMII0_RXER                PIN_RMII0_RXER
+ * 18  INTRP    RMII0_INT_B,      J14 Pin 2, Apparently not      ---
+ *              PHY_INT_1         available unless jumpered
+ * 19  TXEN     RMII0_TXEN        PTA15/RMII0_TXEN               PIN_RMII0_TXEN
+ * 20  TXD0     RMII0_TXD_0       PTA16/RMII0_TXD0               PIN_RMII0_TXD0
+ * 21  TXD1     RMII0_TXD_1       PTA17/RMII0_TXD1               PIN_RMII0_TXD1
+ * 22  GND1     ---               ---                            ---
+ * 24  nRST     PHY_RST_B         ---                            ---
+ * 25  GND2     ---               ---                            ---
+ * --- -------- ----------------- --------------------------------------------
+ *
+ */
+
+#define PIN_RMII0_MDIO  PIN_RMII0_MDIO_1
+#define PIN_RMII0_MDC   PIN_RMII0_MDC_1
+
 /************************************************************************************
  * Public Data
  ************************************************************************************/