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

Conflicts:
	variants/trellis_m4/variant.cpp
	variants/trellis_m4/variant.h

Author: ladyada

variants/trellis_m4/variant.cpp

@@ -65,8 +65,8 @@ const PinDescription g_APinDescription[]=
 
   // 21..22 I2C pins (SDA/SCL)
   // ----------------------
-  { PORTB,  8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_12 }, // SERCOM 4.0
-  { PORTB,  9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_13 }, // SERCOM 4.1
+  { PORTB,  8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_12 }, // SERCOM 2.0
+  { PORTB,  9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER_ALT), No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_13 }, // SERCOM 2.1
 
   // ----------------------
   // 23 - 28 QSPI (SCK, CS, IO0, IO1, IO2, IO3)

variants/trellis_m4/variant.h

@@ -146,7 +146,8 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define PIN_WIRE_SDA         (21u)
 #define PIN_WIRE_SCL         (22u)
 #define PERIPH_WIRE          sercom4
-#define WIRE_IT_HANDLER      SERCOM2_Handler
+#define WIRE_IT_HANDLER      SERCOM4_Handler
+
 
 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;