diff --git a/arch/arm/src/samdl/samd_clockconfig.c b/arch/arm/src/samdl/samd_clockconfig.c
index 20aedae751f..87f9bfd0d99 100644
--- a/arch/arm/src/samdl/samd_clockconfig.c
+++ b/arch/arm/src/samdl/samd_clockconfig.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/samdl/samd_clockconfig.c
  *
- *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014-2015, 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * References:
@@ -492,7 +492,6 @@ static inline void sam_osc32k_config(void)
   regval = getreg32(SAM_SYSCTRL_OSC32K);
   regval |= calib << SYSCTRL_OSC32K_CALIB_SHIFT;
   putreg32(regval, SAM_SYSCTRL_OSC32K);
-
 }
 #else
 #  define sam_osc32k_config()
diff --git a/arch/mips/src/pic32mz/chip/pic32mz-spi.h b/arch/mips/src/pic32mz/chip/pic32mz-spi.h
index 42d7fdf7a12..c2359c0ae44 100644
--- a/arch/mips/src/pic32mz/chip/pic32mz-spi.h
+++ b/arch/mips/src/pic32mz/chip/pic32mz-spi.h
@@ -275,6 +275,7 @@
 
 #define SPI_STAT_SPIRBF            (1 << 0)  /* Bit 0: SPI receive buffer full status */
 #define SPI_STAT_SPITBF            (1 << 1)  /* Bit 1: SPI transmit buffer full status */
+                                             /* Bit 2: Reserved */
 #define SPI_STAT_SPITBE            (1 << 3)  /* Bit 3: SPI transmit buffer empty status */
                                              /* Bit 4: Reserved */
 #define SPI_STAT_SPIRBE            (1 << 5)  /* Bit 5: RX FIFO Empty */
diff --git a/configs/flipnclick-pic32mz/README.txt b/configs/flipnclick-pic32mz/README.txt
index e23cb11f4a0..3d3c4522e1f 100644
--- a/configs/flipnclick-pic32mz/README.txt
+++ b/configs/flipnclick-pic32mz/README.txt
@@ -230,8 +230,8 @@ SPI
      Pin J1 Board Signal PIC32MZ
      --- -- ------------ -------
      D10 8  SPI3_SCK     RB14
-     D10 7  SPI3_MISO    RB9
-     D11 6  SPI3_MOSI    RB10
+     D11 7  SPI3_MISO    RB9
+     D12 6  SPI3_MOSI    RB10
      D13 5  SPI3_SS      RB9
 
    SPI1 and SPI2 are also available on the mikroBUS Click connectors (in
diff --git a/configs/flipnclick-pic32mz/include/board.h b/configs/flipnclick-pic32mz/include/board.h
index 87e48bc0009..9fa460dd5d3 100644
--- a/configs/flipnclick-pic32mz/include/board.h
+++ b/configs/flipnclick-pic32mz/include/board.h
@@ -310,8 +310,8 @@
  *   Pin J1 Board Signal PIC32MZ
  *   --- -- ------------ -------
  *   D10 8  SPI3_SCK     RB14
- *   D10 7  SPI3_MISO    RB9
- *   D11 6  SPI3_MOSI    RB10
+ *   D11 7  SPI3_MISO    RB9
+ *   D12 6  SPI3_MOSI    RB10
  *   D13 5  SPI3_SS      RB9
  *
  * SPI1 and SPI2 are also available on the mikroBUS Click connectors (in