Merge branch 'hallowings' of github.com:adafruit/ArduinoCore-samd into hallowings

Author: ladyada

variants/hallowing_mask_m4/variant.cpp

@@ -66,8 +66,8 @@ const PinDescription g_APinDescription[]=
   { PORTA,  14, PIO_DIGITAL, PIN_ATTR_PWM_F, No_ADC_Channel, TCC2_CH0, TC3_CH0, EXTERNAL_INT_14 }, // D20
 
   // D21 & D22 - SPI for PDM
-  { PORTA,  16, PIO_SERCOM_ALT, PIN_ATTR_PWM_F, No_ADC_Channel, TCC1_CH0, TC2_CH0, EXTERNAL_INT_0 }, // SPI clock for PDM (sercom 3)
-  { PORTA,  17, PIO_SERCOM_ALT, PIN_ATTR_PWM_F, No_ADC_Channel, TCC1_CH1, TC2_CH1, EXTERNAL_INT_1 }, // SPI MISO for PDM (sercom 3)
+  { PORTA,  16, PIO_SERCOM_ALT, PIN_ATTR_PWM_F, No_ADC_Channel, TCC1_CH0, TC2_CH0, EXTERNAL_INT_0 }, // SPI clock for PDM SERCOM 3.1
+  { PORTA,  17, PIO_SERCOM_ALT, PIN_ATTR_PWM_F, No_ADC_Channel, TCC1_CH1, TC2_CH1, EXTERNAL_INT_1 }, // SPI MISO for PDM SERCOM 3.3
 
 
   // 23..25 - USB

variants/hallowing_mask_m4/variant.h

@@ -155,8 +155,8 @@ static const uint8_t SCK1  = PIN_SPI_SCK ;
 #define PIN_SPI2_SCK          (21u)
 #define PIN_SPI2_MOSI         (13u)  // actually LED, ignored
 #define PERIPH_SPI2           sercom3
-#define PAD_SPI2_TX           SPI_PAD_0_SCK_1
-#define PAD_SPI2_RX           SERCOM_RX_PAD_3
+#define PAD_SPI2_TX           SPI_PAD_3_SCK_1
+#define PAD_SPI2_RX           SERCOM_RX_PAD_0
 
 static const uint8_t SS2   = 13 ;	 // also ignored
 static const uint8_t MOSI2 = PIN_SPI_MOSI ;