Finishes PIC32MZ device configuration definitions

3 files changed, 325 insertions, 92 deletions

diff --git a/nuttx/arch/mips/src/pic32mz/chip/pic32mz-memorymap.h b/nuttx/arch/mips/src/pic32mz/chip/pic32mz-memorymap.h
index ada326b09..cc01d6126 100644
--- a/nuttx/arch/mips/src/pic32mz/chip/pic32mz-memorymap.h
+++ b/nuttx/arch/mips/src/pic32mz/chip/pic32mz-memorymap.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#if defined(CHIP_PIC32MZEC) || defined(CHIP_PIC32MZ2)
+#if defined(CHIP_PIC32MZEC)
 #  include <chip/pic32mzec-memorymap.h>
 #else
 #  error "Unknown PIC32MZ family
diff --git a/nuttx/arch/mips/src/pic32mz/chip/pic32mzec-features.h b/nuttx/arch/mips/src/pic32mz/chip/pic32mzec-features.h
index 637a2835d..1863e69ea 100644
--- a/nuttx/arch/mips/src/pic32mz/chip/pic32mzec-features.h
+++ b/nuttx/arch/mips/src/pic32mz/chip/pic32mzec-features.h
@@ -42,19 +42,6 @@
 
 #include <nuttx/config.h>
 
-mips32-memorymap.h:#define KSEG1_BASE 
-
-#define PIC32MZ_LOWERBOOT_K1BASE  (0xbfc00000)
-#define  PIC32MZ_BOOTCFG_K1BASE    (0xbfc0ff40)
-#define PIC32MZ_UPPERBOOT_K1BASE  (0xbfc20000)
-#define PIC32MZ_BOOT1_K1BASE      (0xbfc40000)
-#define PIC32MZ_SEQCFG1_K1BASE    (0xbfc4ff40)
-#define PIC32MZ_ADCCALIB_K1BASE   (0xbfc54000)
-#define PIC32MZ_DEVSN_K1BASE      (0xbfc54020)
-#define PIC32MZ_BOOT2_K1BASE      (0xbfc60000)
-#define PIC32MZ_SEQCFG2_K1BASE    (0xbfc6ff40)
-
-
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
@@ -79,10 +66,10 @@ mips32-memorymap.h:#define KSEG1_BASE
 #define PIC32MZ_ADEVCP2_OFFSET   0x0014 /* Alternate device code protect word 2 */
 #define PIC32MZ_ADEVCP1_OFFSET   0x0018 /* Alternate device code protect word 1 */
 #define PIC32MZ_ADEVCP0_OFFSET   0x001c /* Alternate device code protect word 0 */
-#define PIC32MZ_ADEVSIGN3_OFFSET 0x0020 /* Alternate evice signature word 3 */
-#define PIC32MZ_ADEVSIGN2_OFFSET 0x0024 /* Alternate evice signature word 2 */
-#define PIC32MZ_ADEVSIGN1_OFFSET 0x0028 /* Alternate evice signature word 1 */
-#define PIC32MZ_ADEVSIGN0_OFFSET 0x002c /* Alternate evice signature word 0 */
+#define PIC32MZ_ADEVSIGN3_OFFSET 0x0020 /* Alternate device signature word 3 */
+#define PIC32MZ_ADEVSIGN2_OFFSET 0x0024 /* Alternate device signature word 2 */
+#define PIC32MZ_ADEVSIGN1_OFFSET 0x0028 /* Alternate device signature word 1 */
+#define PIC32MZ_ADEVSIGN0_OFFSET 0x002c /* Alternate device signature word 0 */
 
 /* Device Configuration (Boot Flash PIC32MZ_BOOTCFG_K1BASE) */
 
@@ -169,87 +156,333 @@ mips32-memorymap.h:#define KSEG1_BASE
 /* Register/Flash Bit Field Definitions *********************************************/
 
 /* Device ID, Revision, and Configuration (SFR PIC32MZ_CONFIG_K1BASE) */
-/* Configuration control register */
-#define CFGCON_
+/* Configuration control register
+ *
+ * NOTE: To change many of the bits in the register, the unlock sequence must first
+ * be performed.
+ */
+
+#define CFGCON_TDOEN             (1 << 0)  /* Bit 0:  TDO Enable for 2-Wire JTAG */
+#define CFGCON_TROEN             (1 << 2)  /* Bit 2:  Trace Output Enable bit */
+#define CFGCON_JTAGEN            (1 << 3)  /* Bit 3:  JTAG Port Enable bit */
+#define CFGCON_ECCCON_SHIFT      (4)       /* Bits 4-5: Flash ECC Configuration bits */
+#define CFGCON_ECCCON_MASK       (7 << CFGCON_ECCCON_SHIFT)
+#  define CFGCON_ECCCON_ECC      (0 << CFGCON_ECCCON_SHIFT) /* Flash ECC enabled */
+#  define CFGCON_ECCCON_DYNECC   (1 << CFGCON_ECCCON_SHIFT) /* Dynamic Flash ECC enabled */
+#  define CFGCON_ECCCON_DISLCK   (2 << CFGCON_ECCCON_SHIFT) /* ECC / dynamic ECC disabled (locked) */
+#  define CFGCON_ECCCON_DISWR    (3 << CFGCON_ECCCON_SHIFT) /* ECC / dynamic ECC disabled (writable) */
+#define CFGCON_USBSSEN           (1 << 8)  /* Bit 8:  USB Suspend Sleep Enable bit */
+#define CFGCON_PGLOCK            (1 << 11) /* Bit 11: Permission Group Lock bit */
+#define CFGCON_PMDLOCK           (1 << 12) /* Bit 12: Peripheral Module Disable bit */
+#define CFGCON_IOLOCK            (1 << 13) /* Bit 13: Peripheral Pin Select Lock bit */
+#define CFGCON_OCACLK            (1 << 16) /* Bit 16: Output Compare Alternate Clock Selection bit */
+#define CFGCON_ICACLK            (1 << 17) /* Bit 17: Input Capture Alternate Clock Selection bit */
+#define CFGCON_CPUPRI            (1 << 24) /* Bit 24: CPU Arbitration Priority to SRAM */
+#define CFGCON_DMAPRI            (1 << 25) /* Bit 25: DMA Read and DMA Write Arbitration Priority */
+
 /* Device ID and revision register */
-#define DEVID_
-/* System key register */
-#define SYSKEY_
+
+#define DEVID_SHIFT              (0)       /* Bits 0-27: Device ID */
+#define DEVID_MASK               (0x0ffffff << DEVID_SHIFT)
+#define DEVID_VER_SHIFT          (28)      /* Bits 28-31: Revision Identifier bits */
+#define DEVID_VER_MASK           (15 << DEVID_VER_SHIFT)
+
+/* System key register: 32-bit key value */
+
 /* External bus interface address pin configuration register */
-#define CFGEBIA_
+
+#define CFGEBIA_EBIA0N_SHIFT     (0)       /* Bits 0-23: EBI address pin 0 enable */
+#define CFGEBIA_EBIA0N_MASK      (0x00ffffff << CFGEBIA_EBIA0N_SHIFT)
+#  define CFGEBIA_EBIA0EN        (1 << 0)  /* Bit 0:  EBI address pin 0 enable */
+#  define CFGEBIA_EBIA1EN        (1 << 1)  /* Bit 1:  EBI address pin 1 enable */
+#  define CFGEBIA_EBIA2EN        (1 << 2)  /* Bit 2:  EBI address pin 2 enable */
+#  define CFGEBIA_EBIA3EN        (1 << 3)  /* Bit 3:  EBI address pin 3 enable */
+#  define CFGEBIA_EBIA4EN        (1 << 4)  /* Bit 4:  EBI address pin 4 enable */
+#  define CFGEBIA_EBIA5EN        (1 << 5)  /* Bit 5:  EBI address pin 5 enable */
+#  define CFGEBIA_EBIA6EN        (1 << 6)  /* Bit 6:  EBI address pin 6 enable */
+#  define CFGEBIA_EBIA7EN        (1 << 7)  /* Bit 7:  EBI address pin 7 enable */
+#  define CFGEBIA_EBIA8EN        (1 << 8)  /* Bit 8:  EBI address pin 8 enable */
+#  define CFGEBIA_EBIA9EN        (1 << 9)  /* Bit 9:  EBI address pin 9 enable */
+#  define CFGEBIA_EBIA0EN        (1 << 10) /* Bit 10: EBI address pin 10 enable */
+#  define CFGEBIA_EBIA1EN        (1 << 11) /* Bit 11: EBI address pin 11 enable */
+#  define CFGEBIA_EBIA2EN        (1 << 12) /* Bit 12: EBI address pin 12 enable */
+#  define CFGEBIA_EBIA3EN        (1 << 13) /* Bit 13: EBI address pin 13 enable */
+#  define CFGEBIA_EBIA4EN        (1 << 14) /* Bit 14: EBI address pin 14 enable */
+#  define CFGEBIA_EBIA5EN        (1 << 15) /* Bit 15: EBI address pin 15 enable */
+#  define CFGEBIA_EBIA6EN        (1 << 16) /* Bit 16: EBI address pin 16 enable */
+#  define CFGEBIA_EBIA7EN        (1 << 17) /* Bit 17: EBI address pin 17 enable */
+#  define CFGEBIA_EBIA8EN        (1 << 18) /* Bit 18: EBI address pin 18 enable */
+#  define CFGEBIA_EBIA9EN        (1 << 19) /* Bit 19: EBI address pin 19 enable */
+#  define CFGEBIA_EBIA0EN        (1 << 20) /* Bit 20: EBI address pin 20 enable */
+#  define CFGEBIA_EBIA1EN        (1 << 21) /* Bit 21: EBI address pin 21 enable */
+#  define CFGEBIA_EBIA2EN        (1 << 22) /* Bit 22: EBI address pin 22 enable */
+#  define CFGEBIA_EBIA3EN        (1 << 23) /* Bit 23: EBI address pin 23 enable */
+#define CFGEBIA_EBIPINEN         (1 << 31) /* Bit 31: EBI Pin Enable bit */
+
 /* External bus interface address pin control register */
-#define CFGEBIC_
+
+#define CFGEBIC_EBIRPEN          (1 << 16) /* Bit 16: EBIRP Pin Sensitivity Control bit */
+#define CFGEBIC_EBIRDYLVL        (1 << 17) /* Bit 17: EBIRDYx Pin Sensitivity Control bit */
+#define CFGEBIC_EBIRDYEN1        (1 << 24) /* Bit 24: EBIRDY1 Pin Enable bit */
+#define CFGEBIC_EBIRDYEN2        (1 << 25) /* Bit 25: EBIRDY2 Pin Enable bit */
+#define CFGEBIC_EBIRDYEN3        (1 << 26) /* Bit 26: EBIRDY3 Pin Enable bit */
+#define CFGEBIC_EBIRDYINV1       (1 << 28) /* Bit 28: EBIRDY1 Inversion Control bit */
+#define CFGEBIC_EBIRDYINV2       (1 << 29) /* Bit 29: EBIRDY2 Inversion Control bit */
+#define CFGEBIC_EBIRDYINV3       (1 << 30) /* Bit 30: EBIRDY3 Inversion Control bit */
+
 /* Permission group configuration register */
-#define CFGPG_
 
-/* Alternate Device Configuration (Boot Flash PIC32MZ_BOOTCFG_K1BASE) */
-/* Alternate device configuration word 3 */
-#define ADEVCFG3_
-/* Alternate device configuration word 2 */
-#define ADEVCFG2_
-/* Alternate device configuration word 1 */
-#define ADEVCFG1_
-/* Alternate device configuration word 0 */
-#define ADEVCFG0_
-/* Alternate device code protect word 3 */
-#define ADEVCP3_
-/* Alternate device code protect word 2 */
-#define ADEVCP2_
-/* Alternate device code protect word 1 */
-#define ADEVCP1_
-/* Alternate device code protect word 0 */
-#define ADEVCP0_
-/* Alternate evice signature word 3 */
-#define ADEVSIGN3_
-/* Alternate evice signature word 2 */
-#define ADEVSIGN2_
-/* Alternate evice signature word 1 */
-#define ADEVSIGN1_
-/* Alternate evice signature word 0 */
-#define ADEVSIGN0_
+#define CFGPG_GROUP0             0         /* Initiator is assigned to Permission Group 0 */
+#define CFGPG_GROUP1             1         /* Initiator is assigned to Permission Group 1 */
+#define CFGPG_GROUP2             2         /* Initiator is assigned to Permission Group 2 */
+#define CFGPG_GROUP3             3         /* Initiator is assigned to Permission Group 3 */
+
+#define CFGPG_CPUPG_SHIFT        (0)       /* Bits 0-1: CPU Permission Group bits */
+#define CFGPG_CPUPG_MASK         (3 << CFGPG_CPUPG_SHIFT)
+#  define CFGPG_CPUPG(n)         ((uint32_t)(n) << CFGPG_CPUPG_SHIFT)
+#  define CFGPG_CPUPG_GROUP0     CFGPG_CPUPG(CFGPG_GROUP0)
+#  define CFGPG_CPUPG_GROUP1     CFGPG_CPUPG(CFGPG_GROUP1)
+#  define CFGPG_CPUPG_GROUP2     CFGPG_CPUPG(CFGPG_GROUP2)
+#  define CFGPG_CPUPG_GROUP3     CFGPG_CPUPG(CFGPG_GROUP3)
+#define CFGPG_DMAPG_SHIFT        (4)       /* Bits 4-5: DMA Module Permission Group bits */
+#define CFGPG_DMAPG_MASK         (3 << CFGPG_DMAPG_SHIFT)
+#  define CFGPG_DMAPG(n)         ((uint32_t)(n) << CFGPG_DMAPG_SHIFT)
+#  define CFGPG_DMAPG_GROUP0     CFGPG_DMAPG(CFGPG_GROUP0)
+#  define CFGPG_DMAPG_GROUP1     CFGPG_DMAPG(CFGPG_GROUP1)
+#  define CFGPG_DMAPG_GROUP2     CFGPG_DMAPG(CFGPG_GROUP2)
+#  define CFGPG_DMAPG_GROUP3     CFGPG_DMAPG(CFGPG_GROUP3)
+#define CFGPG_USBPG_SHIFT        (8)       /*  Bits 8-9: USB Module Permission Group bits */
+#define CFGPG_USBPG_MASK         (3 << CFGPG_USBPG_SHIFT)
+#  define CFGPG_USBPG(n)         ((uint32_t)(n) << CFGPG_USBPG_SHIFT)
+#  define CFGPG_USBPG_GROUP0     CFGPG_USBPG(CFGPG_GROUP0)
+#  define CFGPG_USBPG_GROUP1     CFGPG_USBPG(CFGPG_GROUP1)
+#  define CFGPG_USBPG_GROUP2     CFGPG_USBPG(CFGPG_GROUP2)
+#  define CFGPG_USBPG_GROUP3     CFGPG_USBPG(CFGPG_GROUP3)
+#define CFGPG_CAN1PG_SHIFT       (12)      /* Bits 12-13: CAN1 Module Permission Group bits */
+#define CFGPG_CAN1PG_MASK        (3 << CFGPG_CAN1PG_SHIFT)
+#  define CFGPG_CAN1PG(n)        ((uint32_t)(n) << CFGPG_CAN1PG_SHIFT)
+#  define CFGPG_CAN1PG_GROUP0    CFGPG_CAN1PG(CFGPG_GROUP0)
+#  define CFGPG_CAN1PG_GROUP1    CFGPG_CAN1PG(CFGPG_GROUP1)
+#  define CFGPG_CAN1PG_GROUP2    CFGPG_CAN1PG(CFGPG_GROUP2)
+#  define CFGPG_CAN1PG_GROUP3    CFGPG_CAN1PG(CFGPG_GROUP3)
+#define CFGPG_CAN2PG_SHIFT       (14)      /* Bits 14-15: CAN2 Module Permission Group bits */
+#define CFGPG_CAN2PG_MASK        (3 << CFGPG_CAN2PG_SHIFT)
+#  define CFGPG_CAN2PG(n)        ((uint32_t)(n) << CFGPG_CAN2PG_SHIFT)
+#  define CFGPG_CAN2PG_GROUP0    CFGPG_CAN2PG(CFGPG_GROUP0)
+#  define CFGPG_CAN2PG_GROUP1    CFGPG_CAN2PG(CFGPG_GROUP1)
+#  define CFGPG_CAN2PG_GROUP2    CFGPG_CAN2PG(CFGPG_GROUP2)
+#  define CFGPG_CAN2PG_GROUP3    CFGPG_CAN2PG(CFGPG_GROUP3)
+#define CFGPG_ETHPG_SHIFT        (16)      /* Bits 16-17: Ethernet Module Permission Group bits */
+#define CFGPG_ETHPG_MASK         (3 << CFGPG_ETHPG_SHIFT)
+#  define CFGPG_ETHPG(n)         ((uint32_t)(n) << CFGPG_ETHPG_SHIFT)
+#  define CFGPG_ETHPG_GROUP0     CFGPG_ETHPG(CFGPG_GROUP0)
+#  define CFGPG_ETHPG_GROUP1     CFGPG_ETHPG(CFGPG_GROUP1)
+#  define CFGPG_ETHPG_GROUP2     CFGPG_ETHPG(CFGPG_GROUP2)
+#  define CFGPG_ETHPG_GROUP3     CFGPG_ETHPG(CFGPG_GROUP3)
+#define CFGPG_SQI1PG_SHIFT       (20)      /* Bits 20-21: SQI Module Permission Group bits */
+#define CFGPG_SQI1PG_MASK        (3 << CFGPG_SQI1PG_SHIFT)
+#  define CFGPG_SQI1PG(n)        ((uint32_t)(n) << CFGPG_SQI1PG_SHIFT)
+#  define CFGPG_SQI1PG_GROUP0    CFGPG_SQI1PG(CFGPG_GROUP0)
+#  define CFGPG_SQI1PG_GROUP1    CFGPG_SQI1PG(CFGPG_GROUP1)
+#  define CFGPG_SQI1PG_GROUP2    CFGPG_SQI1PG(CFGPG_GROUP2)
+#  define CFGPG_SQI1PG_GROUP3    CFGPG_SQI1PG(CFGPG_GROUP3)
+#define CFGPG_FCPG_SHIFT         (22)      /* Bits 22-23: Flash Control Permission Group bits */
+#define CFGPG_FCPG_MASK          (3 << CFGPG_FCPG_SHIFT)
+#  define CFGPG_FCPG(n)          ((uint32_t)(n) << CFGPG_FCPG_SHIFT)
+#  define CFGPG_FCPG_GROUP0      CFGPG_FCPG(CFGPG_GROUP0)
+#  define CFGPG_FCPG_GROUP1      CFGPG_FCPG(CFGPG_GROUP1)
+#  define CFGPG_FCPG_GROUP2      CFGPG_FCPG(CFGPG_GROUP2)
+#  define CFGPG_FCPG_GROUP3      CFGPG_FCPG(CFGPG_GROUP3)
+#define CFGPG_CRYPTPG_SHIFT      (24)      /* Bits 24-25: Crypto Engine Permission Group bits */
+#define CFGPG_CRYPTPG_MASK       (3 << CFGPG_CRYPTPG_SHIFT)
+#  define CFGPG_CRYPTPG(n)       ((uint32_t)(n) << CFGPG_CRYPTPG_SHIFT)
+#  define CFGPG_CRYPTPG_GROUP0   CFGPG_CRYPTPG(CFGPG_GROUP0)
+#  define CFGPG_CRYPTPG_GROUP1   CFGPG_CRYPTPG(CFGPG_GROUP1)
+#  define CFGPG_CRYPTPG_GROUP2   CFGPG_CRYPTPG(CFGPG_GROUP2)
+#  define CFGPG_CRYPTPG_GROUP3   CFGPG_CRYPTPG(CFGPG_GROUP3)
 
+/* Alternate Device Configuration (Boot Flash PIC32MZ_BOOTCFG_K1BASE) */
 /* Device Configuration (Boot Flash PIC32MZ_BOOTCFG_K1BASE) */
-/* Device configuration word 3 */
-#define DEVCFG3_
-/* Device configuration word 2 */
-#define DEVCFG2_
-/* Device configuration word 1 */
-#define DEVCFG1_
-/* Device configuration word 0 */
-#define DEVCFG0_
-/* Device code protect word 3 */
-#define DEVCP3_
-/* Device code protect word 2 */
-#define DEVCP2_
-/* Device code protect word 1 */
-#define DEVCP1_
-/* Device code protect word 0 */
-#define DEVCP0_
-/* Device signature word 3 */
-#define DEVSIGN3_
-/* Device signature word 2 */
-#define DEVSIGN2_
-/* Device signature word 1 */
-#define DEVSIGN1_
-/* Device signature word 0 */
-#define DEVSIGN0_
+/* Device configuration word 3 / Alternate device configuration word 3 */
+
+#define DEVCFG3_USERID_SHIFT     (0)       /* Bit 0-15: 16-bit user defined value */
+#define DEVCFG3_USERID_MASK      (0xffff << DEVCFG3_USERID_SHIFT)
+#  define DEVCFG3_USERID(n)      ((uint32_t)(n) << DEVCFG3_USERID_SHIFT)
+#define DEVCFG3_FMIIEN           (1 << 24) /* Bit 24: Ethernet MII Enable Configuration bit */
+#define DEVCFG3_FETHIO           (1 << 25) /* Bit 25: Ethernet I/O Pin Selection Configuration bit */
+#define DEVCFG3_PGL1WAY          (1 << 27) /* Bit 27: Permission Group Lock One Way Configuration bit */
+#define DEVCFG3_PMDL1WAY         (1 << 28) /* Bit 28: Peripheral Module Disable Configuration bit */
+#define DEVCFG3_IOL1WAY          (1 << 29) /* Bit 29: Peripheral Pin Select Configuration bit */
+#define DEVCFG3_FUSBIDIO         (1 << 30) /* Bit 30: USB USBID Selection bit */
+
+#define DEVCFG3_RWO              0x84ff0000 /* Bits 16-23, 31: Reserved, write as one */
+
+/* Device configuration word 2 / Alternate device configuration word 2 */
+
+#define DEVCFG2_FPLLIDIV_SHIFT   (0)        /* Bits 0-2: PLL Input Divider bits */
+#define DEVCFG2_FPLLIDIV_MASK    (7 << DEVCFG2_FPLLIDIV_SHIFT)
+#  define DEVCFG2_FPLLIDIV(n)    ((uint32_t)((n)-1) << DEVCFG2_FPLLIDIV_SHIFT) /* n=1..8 */
+#  define DEVCFG2_FPLLIDIV_1     (0 << DEVCFG2_FPLLIDIV_SHIFT) /* Divide by 1 */
+#  define DEVCFG2_FPLLIDIV_2     (1 << DEVCFG2_FPLLIDIV_SHIFT) /* Divide by 2 */
+#  define DEVCFG2_FPLLIDIV_3     (2 << DEVCFG2_FPLLIDIV_SHIFT) /* Divide by 3 */
+#  define DEVCFG2_FPLLIDIV_4     (3 << DEVCFG2_FPLLIDIV_SHIFT) /* Divide by 4 */
+#  define DEVCFG2_FPLLIDIV_5     (4 << DEVCFG2_FPLLIDIV_SHIFT) /* Divide by 5 */
+#  define DEVCFG2_FPLLIDIV_6     (5 << DEVCFG2_FPLLIDIV_SHIFT) /* Divide by 6 */
+#  define DEVCFG2_FPLLIDIV_7     (6 << DEVCFG2_FPLLIDIV_SHIFT) /* Divide by 7 */
+#  define DEVCFG2_FPLLIDIV_8     (7 << DEVCFG2_FPLLIDIV_SHIFT) /* Divide by 8 */
+#define DEVCFG2_FPLLRNG_SHIFT    (4)       /* Bits 4-6: System PLL Divided Input Clock Frequency Range bits */
+#define DEVCFG2_FPLLRNG_MASK     (7 << DEVCFG2_FPLLRNG_SHIFT)
+#  define DEVCFG2_FPLLRNG_BYPASS    (0 << DEVCFG2_FPLLRNG_SHIFT) /* Bypass */
+#  define DEVCFG2_FPLLRNG_5_10MHZ   (1 << DEVCFG2_FPLLRNG_SHIFT) /* 5-10 MHz */
+#  define DEVCFG2_FPLLRNG_8_16MHZ   (2 << DEVCFG2_FPLLRNG_SHIFT) /* 8-16 MHz */
+#  define DEVCFG2_FPLLRNG_13_26MHZ  (3 << DEVCFG2_FPLLRNG_SHIFT) /* 13-26 MHz */
+#  define DEVCFG2_FPLLRNG_21_42MHZ  (4 << DEVCFG2_FPLLRNG_SHIFT) /* 21-42 MHz */
+#  define DEVCFG2_FPLLRNG_34_64MHZ  (5 << DEVCFG2_FPLLRNG_SHIFT) /* 34-64 MHz */
+#define DEVCFG2_FPLLICLK         (1 << 7)  /* Bit 7: System PLL Input Clock Select bit */
+#define DEVCFG2_FPLLMULT_SHIFT   (8)       /* Bits 8-14: System PLL Feedback Divider bits */
+#define DEVCFG2_FPLLMULT_MASK    (0x7f << DEVCFG2_FPLLMULT_SHIFT)
+#  define DEVCFG2_FPLLMULT(n)    ((uint32_t)((n)-1) << DEVCFG2_FPLLMULT_SHIFT) /* n=1..128 */
+#define DEVCFG2_FPLLODIV_SHIFT   (16)      /* Bits 16-18: Default System PLL Output Divisor bits */
+#define DEVCFG2_FPLLODIV_MASK    (7 << DEVCFG2_FPLLODIV_SHIFT)
+#  define DEVCFG2_FPLLODIV_2     (1 << DEVCFG2_FPLLODIV_SHIFT) /* PLL output divided by 2 */
+#  define DEVCFG2_FPLLODIV_4     (2 << DEVCFG2_FPLLODIV_SHIFT) /* PLL output divided by 4 */
+#  define DEVCFG2_FPLLODIV_8     (3 << DEVCFG2_FPLLODIV_SHIFT) /* PLL output divided by 8 */
+#  define DEVCFG2_FPLLODIV_16    (4 << DEVCFG2_FPLLODIV_SHIFT) /* PLL output divided by 16 */
+#  define DEVCFG2_FPLLODIV_32    (5 << DEVCFG2_FPLLODIV_SHIFT) /* PLL output divided by 32 */
+#define DEVCFG2_UPLLFSEL         (1 << 30) /* Bit 30: USB PLL Input Frequency Select bit */
+
+#define DEVCFG2_RWO 0xbff88008 /* Bits 3, 15, 19-29, 31: Reserved, write as one */
+
+/* Device configuration word 1 / Alternate device configuration word 1 */
+
+#define DEVCFG1_FNOSC_SHIFT      (0)       /* Bits 0-2: Oscillator Selection bits */
+#define DEVCFG1_FNOSC_MASK       (7 << DEVCFG1_FNOSC_SHIFT)
+#  define DEVCFG1_FNOSC_FRCDIV   (0 << DEVCFG1_FNOSC_SHIFT) /* FRC divided by FRCDIV */
+#  define DEVCFG1_FNOSC_SPLL     (1 << DEVCFG1_FNOSC_SHIFT) /* SPLL */
+#  define DEVCFG1_FNOSC_POSC     (2 << DEVCFG1_FNOSC_SHIFT) /* POSC (HS, EC) */
+#  define DEVCFG1_FNOSC_SOSC     (4 << DEVCFG1_FNOSC_SHIFT) /* SOSC */
+#  define DEVCFG1_FNOSC_LPRC     (5 << DEVCFG1_FNOSC_SHIFT) /* LPRC */
+#  define DEVCFG1_FNOSC_FRCDIV20 (7 << DEVCFG1_FNOSC_SHIFT) /* FRC divided by FRCDIV<2:0> */
+#define DEVCFG1_DMTINV_SHIFT     (3)       /* Bits 3-5: Deadman Timer Count Window Interval bits */
+#define DEVCFG1_DMTINV_MASK      (7 << DEVCFG1_DMTINV_SHIFT)
+#  define DEVCFG1_DMTINV_0       (0 << DEVCFG1_DMTINV_SHIFT) /* Window/Interval value zero */
+#  define DEVCFG1_DMTINV_1_2     (1 << DEVCFG1_DMTINV_SHIFT) /* Window/Interval value 1/2 counter */
+#  define DEVCFG1_DMTINV_3_4     (2 << DEVCFG1_DMTINV_SHIFT) /* Window/Interval value 3/4 counter */
+#  define DEVCFG1_DMTINV_7_8     (3 << DEVCFG1_DMTINV_SHIFT) /* Window/Interval value 7/8 counter */
+#  define DEVCFG1_DMTINV_15_16   (4 << DEVCFG1_DMTINV_SHIFT) /* Window/Interval value 15/16 counter */
+#  define DEVCFG1_DMTINV_31_32   (5 << DEVCFG1_DMTINV_SHIFT) /* Window/Interval value 31/32 counter */
+#  define DEVCFG1_DMTINV_63_64   (6 << DEVCFG1_DMTINV_SHIFT) /* Window/Interval value 63/64 counter */
+#  define DEVCFG1_DMTINV_127_128 (7 << DEVCFG1_DMTINV_SHIFT) /* Window/Interval value 127/128 counter */
+#define DEVCFG1_FSOSCEN          (1 << 6)  /* Bit 6:  Secondary Oscillator Enable bit */
+#define DEVCFG1_IESO             (1 << 7)  /* Bit 7:  Internal External Switchover bit */
+#define DEVCFG1_POSCMOD_SHIFT    (8)       /* Bits 8-9: Primary Oscillator Configuration bits */
+#define DEVCFG1_POSCMOD_MASK     (3 << DEVCFG1_POSCMOD_SHIFT)
+#  define DEVCFG1_POSCMOD_EC     (0 << DEVCFG1_POSCMOD_SHIFT) /* EC mode selected */
+#  define DEVCFG1_POSCMOD_HS     (2 << DEVCFG1_POSCMOD_SHIFT) /* HS Oscillator mode selected */
+#  define DEVCFG1_POSCMOD_DIS    (3 << DEVCFG1_POSCMOD_SHIFT) /* POSC disabled */
+#define DEVCFG1_OSCIOFNC         (1 << 10) /* Bit 10: CLKO Enable Configuration bit */
+#define DEVCFG1_FCKSM_SHIFT      (14)      /* Bits 14-15: Clock Switching and Monitoring Selection */
+#define DEVCFG1_FCKSM_MASK       (3 << DEVCFG1_FCKSM_SHIFT)
+#  define DEVCFG1_FCKSM_NONE     (0 << DEVCFG1_FCKSM_SHIFT) /* Clock switching/monitoring disabled */
+#  define DEVCFG1_FCKSM_SWITCH   (1 << DEVCFG1_FCKSM_SHIFT) /* Clock switching enabled */
+#  define DEVCFG1_FCKSM_MONITOR  (2 << DEVCFG1_FCKSM_SHIFT) /* Clock monitoring enabled */
+#  define DEVCFG1_FCKSM_BOTH     (3 << DEVCFG1_FCKSM_SHIFT) /* Clock switching/monitoring enabled */
+#define DEVCFG1_WDTPS_SHIFT      (16)      /* Bits 16-20: Watchdog Timer Postscale Select bits */
+#define DEVCFG1_WDTPS_MASK       (31 << DEVCFG1_WDTPS_SHIFT)
+#  define DEVCFG1_WDTPS_1        (0 << DEVCFG1_WDTPS_SHIFT)  /* 1:1 */
+#  define DEVCFG1_WDTPS_2        (1 << DEVCFG1_WDTPS_SHIFT)  /* 1:2 */
+#  define DEVCFG1_WDTPS_4        (2 << DEVCFG1_WDTPS_SHIFT)  /* 1:4 */
+#  define DEVCFG1_WDTPS_8        (3 << DEVCFG1_WDTPS_SHIFT)  /* 1:8 */
+#  define DEVCFG1_WDTPS_16       (4 << DEVCFG1_WDTPS_SHIFT)  /* 1:16 */
+#  define DEVCFG1_WDTPS_32       (5 << DEVCFG1_WDTPS_SHIFT)  /* 1:32 */
+#  define DEVCFG1_WDTPS_64       (6 << DEVCFG1_WDTPS_SHIFT)  /* 1:64 */
+#  define DEVCFG1_WDTPS_128      (7 << DEVCFG1_WDTPS_SHIFT)  /* 1:128 */
+#  define DEVCFG1_WDTPS_256      (8 << DEVCFG1_WDTPS_SHIFT)  /* 1:256 */
+#  define DEVCFG1_WDTPS_512      (9 << DEVCFG1_WDTPS_SHIFT)  /* 1:512 */
+#  define DEVCFG1_WDTPS_1024     (10 << DEVCFG1_WDTPS_SHIFT) /* 1:1024 */
+#  define DEVCFG1_WDTPS_2048     (11 << DEVCFG1_WDTPS_SHIFT) /* 1:2048 */
+#  define DEVCFG1_WDTPS_4096     (12 << DEVCFG1_WDTPS_SHIFT) /* 1:4096 */
+#  define DEVCFG1_WDTPS_8192     (13 << DEVCFG1_WDTPS_SHIFT) /* 1:8192 */
+#  define DEVCFG1_WDTPS_16384    (14 << DEVCFG1_WDTPS_SHIFT) /* 1:16384 */
+#  define DEVCFG1_WDTPS_32768    (15 << DEVCFG1_WDTPS_SHIFT) /* 1:32768 */
+#  define DEVCFG1_WDTPS_65536    (16 << DEVCFG1_WDTPS_SHIFT) /* 1:65536 */
+#  define DEVCFG1_WDTPS_131072   (17 << DEVCFG1_WDTPS_SHIFT) /* 1:131072 */
+#  define DEVCFG1_WDTPS_262144   (18 << DEVCFG1_WDTPS_SHIFT) /* 1:262144 */
+#  define DEVCFG1_WDTPS_524288   (19 << DEVCFG1_WDTPS_SHIFT) /* 1:524288 */
+#  define DEVCFG1_WDTPS_1048576  (20 << DEVCFG1_WDTPS_SHIFT) /* 1:1048576 */
+#define DEVCFG1_WDTSPGM          (1 << 21)  /* Bit 21: Watchdog Timer Stop During Flash Programming bit */
+#define DEVCFG1_WINDIS           (1 << 22)  /* Bit 22: Watchdog Timer Window Enable bit */
+#define DEVCFG1_FWDTEN           (1 << 23)  /* Bit 23: Watchdog Timer Enable bit */
+#define DEVCFG1_FWDTWINSZ_SHIFT  (24)      /* Bits 24-25: Watchdog Timer Window Size bits */
+#define DEVCFG1_FWDTWINSZ_MASK   (3 << DEVCFG1_FWDTWINSZ_SHIFT)
+# define DEVCFG1_FWDTWINSZ_75    (0 << DEVCFG1_FWDTWINSZ_SHIFT) /* Window size is 75% */
+# define DEVCFG1_FWDTWINSZ_50    (1 << DEVCFG1_FWDTWINSZ_SHIFT) /* Window size is 50% */
+# define DEVCFG1_FWDTWINSZ_37p5  (2 << DEVCFG1_FWDTWINSZ_SHIFT) /* Window size is 37.5% */
+# define DEVCFG1_FWDTWINSZ_25    (3 << DEVCFG1_FWDTWINSZ_SHIFT) /* Window size is 25% */
+#define DEVCFG1_DMTCNT_SHIFT     (26)      /* Bits 26-30: Deadman Timer Count Select bits */
+#define DEVCFG1_DMTCNT_MASK      (31 << DEVCFG1_DMTCNT_SHIFT)
+#  define DEVCFG1_DMTCNT(n)      ((uint32_t)((n)-8) << DEVCFG1_DMTCNT_SHIFT) /* 2**n, n=8..31 */
+#define DEVCFG1_FDMTEN           (1 << 31)  /* Bit 31: Deadman Timer enable bit */
+
+#define DEVCFG1_RWO              0x00003800 /* Bits 11-13: Reserved, write as one */
+
+/*  Device configuration word 0  / Alternate device configuration word 0 */
+
+#define DEVCFG0_DEBUG_SHIFT      (0)       /* Bits 0-1: Background Debugger Enable bits */
+#define DEVCFG0_DEBUG_MASK       (3 << DEVCFG0_DEBUG_SHIFT)
+#  define DEVCFG0_DEBUG_ENABLED  (1 << DEVCFG0_DEBUG_SHIFT) /* Debugger is enabled */
+#  define DEVCFG0_DEBUG_DISABLED (3 << DEVCFG0_DEBUG_SHIFT) /* Debugger is disabled */
+#define DEVCFG0_JTAGEN           (1 << 2)  /* Bit 2: JTAG Enable bit(1) */
+#define DEVCFG0_ICESEL_SHIFT     (3)       /* Bits 3-4: ICE Communication Channel Select bits */
+#define DEVCFG0_ICESEL_MASK      (3 << DEVCFG0_ICESEL_SHIFT)
+#  define DEVCFG0_ICESEL_1       (3 << DEVCFG0_ICESEL_SHIFT) /* PGEC1/PGED1 pair is used */
+#  define DEVCFG0_ICESEL_2       (2 << DEVCFG0_ICESEL_SHIFT) /* PGEC2/PGED2 pair is used */
+#define DEVCFG0_TRCEN            (1 << 5)  /* Bit 5: Trace Enable bit */
+#define DEVCFG0_BOOTISA          (1 << 6)  /* Bit 6: Boot ISA Selection bit */
+#define DEVCFG0_FECCCON_SHIFT    (8)       /* Bit 8-9: Dynamic Flash ECC Configuration bits */
+#define DEVCFG0_FECCCON_MASK     (3 << DEVCFG0_FECCCON_SHIFT)
+#  define DEVCFG0_FECCCON_ECC    (0 << DEVCFG0_FECCCON_SHIFT) /* Flash ECC enabled (locked) */
+#  define DEVCFG0_FECCCON_DYNECC (1 << DEVCFG0_FECCCON_SHIFT) /* Dynamic Flash ECC enabled (locked) */
+#  define DEVCFG0_FECCCON_DISLCK (2 << DEVCFG0_FECCCON_SHIFT) /* ECC / dynamic ECC disabled (locked) */
+#  define DEVCFG0_FECCCON_DISWR  (3 << DEVCFG0_FECCCON_SHIFT) /* ECC / dynamic ECC disabled (writable) */
+#define DEVCFG0_FSLEEP           (1 << 10) /* Bit 10: Flash Sleep Mode bit */
+#define DEVCFG0_DBGPER_SHIFT     (12)      /* Bits 12-14: Debug Mode CPU Access Permission bits */
+#define DEVCFG0_DBGPER_MASK      (7 << DEVCFG0_DBGPER_SHIFT)
+#  define DEVCFG0_DBGPER_GROUP0  (1 << DEVCFG0_DBGPER_SHIFT) /* Allow/deny access to group 0 regions */
+#  define DEVCFG0_DBGPER_GROUP1  (2 << DEVCFG0_DBGPER_SHIFT) /* Allow/deny access to group 1 regions */
+#  define DEVCFG0_DBGPER_GROUP2  (4 << DEVCFG0_DBGPER_SHIFT) /* Allow/deny access to group 2 regions */
+#define DEVCFG0_EJTAGBEN         (1 << 30) /* Bit 30: EJTAG Boot Enable bit */
+
+#define DEVCFG0_RW0              0xbfff8880 /* Bits 7, 11, 15-29, 31: Reserved, write as one */
+
+/* Device code protect words 1-3 / Alternate device code protect words 1-3
+ *
+ * The DEVCP1 through DEVCP3 and ADEVCP1 through ADEVCP3 registers are used
+ * for Quad Word programming operation when programming the DEVCP0/ADEVCP0
+ * registers, and do not contain any valid information.
+ */
+
+/* Device code protect word 0 / Alternate device code protect word 0 */
+
+#define DEVCP0_CP                (1 << 28)  /* Bit 28: Code-protect bit */
+#define DEVCP0_RWO               0xefffffff /* Bits 0-27, 28-31: Reserved, write as one */
+
+/* Device signature words 1-3 / Alternate device signature words 1-3
+ *
+ * The DEVSIGN1 through DEVSIGN3 and ADEVSIGN1 through ADEVSIGN3 registers
+ * are used for Quad Word programming operation when programming the
+ * DEVSIGN0/ADESIGN0 registers, and do not contain any valid information.
+ */
+
+/* Device signature word 0 / Alternate device signature word 0 */
+
+#define DEVSIGN0_RWZ             0x80000000 /* Bit 31: Reserved, write as zero */
+#define DEVSIGN0_RWO             0x7fffffff /* Bits 0-30: Reserved, write as one */
 
 /* Device ADC Calibration (Boot Flash PIC32MZ_ADCCALIB_K1BASE) */
-/* ADC1 Calibration */
-#define DEVADC1_
-/* ADC2 Calibration */
-#define DEVADC2_
-/* ADC3 Calibration */
-#define DEVADC3_
-/* ADC4 Calibration */
-#define DEVADC4_
-/* ADC5 Calibration */
-#define DEVADC5_
+/* ADC1-5 Calibration:  32-bit calibration values */
 
 /* Device Serial Number (Boot Flash PIC32MZ_DEVSN_K1BASE) */
-/* Device serial number 0 */
-#define DEVSN0_OFFSET    0x0000 /* Device serial number 0 */
-/* Device serial number 1 */
-#define DEVSN1_OFFSET    0x0004 /* Device serial number 1 */
+/* Device serial number 0-1: 32-bit serial number data */
 
 #endif /* __ARCH_MIPS_SRC_PIC32MZ_CHIP_PIC32MZEC_FEATURES_H */
diff --git a/nuttx/arch/mips/src/pic32mz/chip/pic32mzec-memorymap.h b/nuttx/arch/mips/src/pic32mz/chip/pic32mzec-memorymap.h
index cb4cbd286..4f983c13c 100644
--- a/nuttx/arch/mips/src/pic32mz/chip/pic32mzec-memorymap.h
+++ b/nuttx/arch/mips/src/pic32mz/chip/pic32mzec-memorymap.h
@@ -60,7 +60,7 @@
 /* Boot FLASH */
 
 #define PIC32MZ_LOWERBOOT_PBASE   0x1fc00000 /* Lower boot alias */
-#define PIC32MZ_CONFIG_PBASE      0x1fc0ff40 /* Configuration space */
+#define PIC32MZ_BOOTCFG_PBASE     0x1fc0ff40 /* Configuration space */
 #define PIC32MZ_UPPERBOOT_PBASE   0x1fc20000 /* Upper boot alias */
 #define PIC32MZ_BOOT1_PBASE       0x1fc40000 /* Boot flash 1 */
 #define PIC32MZ_SEQCFG1_PBASE     0x1fc4ff40 /* Sequence/configuration space 1 */
@@ -88,7 +88,7 @@
 /* Boot FLASH */
 
 #define PIC32MZ_LOWERBOOT_K0BASE    (KSEG0_BASE + PIC32MZ_LOWERBOOT_PBASE)
-#define PIC32MZ_CONFIG_K0BASE       (KSEG0_BASE + PIC32MZ_CONFIG_PBASE)
+#define PIC32MZ_BOOTCFG_K0BASE      (KSEG0_BASE + PIC32MZ_BOOTCFG_PBASE)
 #define PIC32MZ_UPPERBOOT_K0BASE    (KSEG0_BASE + PIC32MZ_UPPERBOOT_PBASE)
 #define PIC32MZ_BOOT1_K0BASE        (KSEG0_BASE + PIC32MZ_BOOT1_PBASE)
 #define PIC32MZ_SEQCFG1_K0BASE      (KSEG0_BASE + PIC32MZ_SEQCFG1_PBASE)
@@ -98,7 +98,7 @@
 #define PIC32MZ_SEQCFG2_K0BASE      (KSEG0_BASE + PIC32MZ_SEQCFG2_PBASE)
 
 #define PIC32MZ_LOWERBOOT_K1BASE    (KSEG1_BASE + PIC32MZ_LOWERBOOT_PBASE)
-#define PIC32MZ_CONFIG_K1BASE       (KSEG1_BASE + PIC32MZ_CONFIG_PBASE)
+#define PIC32MZ_BOOTCFG_K1BASE      (KSEG1_BASE + PIC32MZ_BOOTCFG_PBASE)
 #define PIC32MZ_UPPERBOOT_K1BASE    (KSEG1_BASE + PIC32MZ_UPPERBOOT_PBASE)
 #define PIC32MZ_BOOT1_K1BASE        (KSEG1_BASE + PIC32MZ_BOOT1_PBASE)
 #define PIC32MZ_SEQCFG1_K1BASE      (KSEG1_BASE + PIC32MZ_SEQCFG1_PBASE)