From 597777e80b0daa8d3252924cf2948ce820363e86 Mon Sep 17 00:00:00 2001
From: Scott Shawcroft <scott.shawcroft@gmail.com>
Date: Thu, 2 Feb 2017 12:12:05 -0800
Subject: [PATCH] atmel-samd: Update internal pins for Feather M0 Express Rev B

---
 .../boards/feather_m0_flash/mpconfigboard.h   | 42 ++++++++++++++-----
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/atmel-samd/boards/feather_m0_flash/mpconfigboard.h b/atmel-samd/boards/feather_m0_flash/mpconfigboard.h
index 68c2a72e48..52987c68a9 100644
--- a/atmel-samd/boards/feather_m0_flash/mpconfigboard.h
+++ b/atmel-samd/boards/feather_m0_flash/mpconfigboard.h
@@ -4,22 +4,42 @@
 #define MICROPY_HW_BOARD_NAME "Adafruit Feather M0 Flash"
 #define MICROPY_HW_MCU_NAME "samd21g18"
 
-#define MICROPY_HW_NEOPIXEL &pin_PA14
+// Rev. A
+// #define MICROPY_HW_NEOPIXEL &pin_PA14
+
+// Rev. B
+#define MICROPY_HW_NEOPIXEL &pin_PA06
 
 #define SPI_FLASH_BAUDRATE  (1000000)
 
 // On-board flash
-#define SPI_FLASH_MUX_SETTING SPI_SIGNAL_MUX_SETTING_E
-#define SPI_FLASH_PAD0_PINMUX PINMUX_PA12D_SERCOM4_PAD0 // MISO
-// Use default pinmux for the chip select since we manage it ourselves.
-#define SPI_FLASH_PAD1_PINMUX PINMUX_DEFAULT // CS
-#define SPI_FLASH_PAD2_PINMUX PINMUX_PB10D_SERCOM4_PAD2 // MOSI
-#define SPI_FLASH_PAD3_PINMUX PINMUX_PB11D_SERCOM4_PAD3 // SCK
-#define SPI_FLASH_CS          PIN_PA13
-#define SPI_FLASH_SERCOM      SERCOM4
+// Rev A.
+// #define SPI_FLASH_MUX_SETTING SPI_SIGNAL_MUX_SETTING_E
+// #define SPI_FLASH_PAD0_PINMUX PINMUX_PA12D_SERCOM4_PAD0 // MISO
+// // Use default pinmux for the chip select since we manage it ourselves.
+// #define SPI_FLASH_PAD1_PINMUX PINMUX_DEFAULT // CS
+// #define SPI_FLASH_PAD2_PINMUX PINMUX_PB10D_SERCOM4_PAD2 // MOSI
+// #define SPI_FLASH_PAD3_PINMUX PINMUX_PB11D_SERCOM4_PAD3 // SCK
+// #define SPI_FLASH_SERCOM      SERCOM4
 
-#define MICROPY_PORT_A        (PORT_PA12 | PORT_PA13 | PORT_PA14 | PORT_PA24 | PORT_PA25)
-#define MICROPY_PORT_B        (PORT_PB10 | PORT_PB11)
+// Rev B.
+#define SPI_FLASH_MUX_SETTING SPI_SIGNAL_MUX_SETTING_C
+#define SPI_FLASH_PAD0_PINMUX PINMUX_PA08D_SERCOM2_PAD0 // MOSI
+// Use default pinmux for the chip select since we manage it ourselves.
+#define SPI_FLASH_PAD1_PINMUX PINMUX_PA09D_SERCOM2_PAD1 // SCK
+#define SPI_FLASH_PAD2_PINMUX PINMUX_PA14C_SERCOM2_PAD2 // MISO
+#define SPI_FLASH_PAD3_PINMUX PINMUX_DEFAULT // SCK
+#define SPI_FLASH_SERCOM      SERCOM2
+
+#define SPI_FLASH_CS          PIN_PA13
+
+// Rev. A
+// #define MICROPY_PORT_A        (PORT_PA12 | PORT_PA13 | PORT_PA14 | PORT_PA24 | PORT_PA25)
+// #define MICROPY_PORT_B        (PORT_PB10 | PORT_PB11)
+
+// Rev. B
+#define MICROPY_PORT_A        (PORT_PA06 | PORT_PA08 | PORT_PA09 | PORT_PA14 | PORT_PA13 | PORT_PA14 | PORT_PA24 | PORT_PA25)
+#define MICROPY_PORT_B        ( 0 )
 
 #define AUTORESET_DELAY_MS 500