diff --git a/ports/samd/mcu/samd21/pin-af-table.csv b/ports/samd/mcu/samd21/pin-af-table.csv
index 37bb592597ed..31ca2936f66c 100644
--- a/ports/samd/mcu/samd21/pin-af-table.csv
+++ b/ports/samd/mcu/samd21/pin-af-table.csv
@@ -42,7 +42,7 @@ PA16,0,,10,30,20,06
 PA17,1,,11,31,21,07
 PA18,2,,12,32,30,02
 PA19,3,,13,33,31,03
-PB16,9,,50,,60,04
+PB16,0,,50,,60,04
 PB17,1,,51,,61,05
 PA20,4,,52,32,70,04
 PA21,5,,53,33,71,07
diff --git a/ports/samd/mcu/samd51/pin-af-table.csv b/ports/samd/mcu/samd51/pin-af-table.csv
index 69f51a33ca17..c8f9a240dd38 100644
--- a/ports/samd/mcu/samd51/pin-af-table.csv
+++ b/ports/samd/mcu/samd51/pin-af-table.csv
@@ -11,7 +11,7 @@
 # Rows not starting with pa, pb, pc or pd are ignored.
 # When editing the table with a spread sheet, take care to import the data as text.
 Pin,EIC,ADC0,ADC1,SERCOM1,SERCOM2,TC,TCC1,TCC2
-PB03,9,15,,,51,61,,
+PB03,3,15,,,51,61,,
 PA00,0,,,,10,20,,
 PA01,1,,,,11,21,,
 PC00,0,,10,,,,,
@@ -87,7 +87,7 @@ PA22,6,,,30,51,40,16,02
 PA23,7,,,31,50,41,17,03
 PA24,8,,,32,52,50,22,
 PA25,9,,,33,53,51,,
-PB22,22,,,12,52,70,,
+PB22,6,,,12,52,70,,
 PB23,7,,,13,53,71,,
 PB24,8,,,00,21,,,
 PB25,9,,,01,20,,,
@@ -107,6 +107,6 @@ PB30,14,,,70,51,00,40,06
 PB31,15,,,71,50,01,41,07
 PC30,14,,12,,,,,
 PC31,15,,13,,,,,
-PB00,9,12,,,52,70,,
+PB00,0,12,,,52,70,,
 PB01,1,13,,,53,71,,
 PB02,2,14,,,50,60,22,