diff --git a/hw/bsp/samd21/family.mk b/hw/bsp/samd21/family.mk
index d49d44630..2d0a64e79 100644
--- a/hw/bsp/samd21/family.mk
+++ b/hw/bsp/samd21/family.mk
@@ -13,24 +13,24 @@ CFLAGS += \
   -DCFG_TUSB_MCU=OPT_MCU_SAMD21
 
 SRC_C += \
-	hw/mcu/microchip/asf4/samd21/gcc/gcc/startup_samd21.c \
-	hw/mcu/microchip/asf4/samd21/gcc/system_samd21.c \
-	hw/mcu/microchip/asf4/samd21/hpl/gclk/hpl_gclk.c \
-	hw/mcu/microchip/asf4/samd21/hpl/pm/hpl_pm.c \
-	hw/mcu/microchip/asf4/samd21/hpl/sysctrl/hpl_sysctrl.c \
-	hw/mcu/microchip/asf4/samd21/hal/src/hal_atomic.c
+	hw/mcu/microchip/samd21/gcc/gcc/startup_samd21.c \
+	hw/mcu/microchip/samd21/gcc/system_samd21.c \
+	hw/mcu/microchip/samd21/hpl/gclk/hpl_gclk.c \
+	hw/mcu/microchip/samd21/hpl/pm/hpl_pm.c \
+	hw/mcu/microchip/samd21/hpl/sysctrl/hpl_sysctrl.c \
+	hw/mcu/microchip/samd21/hal/src/hal_atomic.c
 
 INC += \
 	$(TOP)/$(BOARD_PATH) \
-	$(TOP)/hw/mcu/microchip/asf4/samd21/ \
-	$(TOP)/hw/mcu/microchip/asf4/samd21/config \
-	$(TOP)/hw/mcu/microchip/asf4/samd21/include \
-	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/include \
-	$(TOP)/hw/mcu/microchip/asf4/samd21/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/pm/ \
-	$(TOP)/hw/mcu/microchip/asf4/samd21/hpl/port \
-	$(TOP)/hw/mcu/microchip/asf4/samd21/hri \
-	$(TOP)/hw/mcu/microchip/asf4/samd21/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/samd21/ \
+	$(TOP)/hw/mcu/microchip/samd21/config \
+	$(TOP)/hw/mcu/microchip/samd21/include \
+	$(TOP)/hw/mcu/microchip/samd21/hal/include \
+	$(TOP)/hw/mcu/microchip/samd21/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/samd21/hpl/pm/ \
+	$(TOP)/hw/mcu/microchip/samd21/hpl/port \
+	$(TOP)/hw/mcu/microchip/samd21/hri \
+	$(TOP)/hw/mcu/microchip/samd21/CMSIS/Include
 
 # For TinyUSB port source 
 VENDOR = microchip
diff --git a/hw/bsp/samd51/family.mk b/hw/bsp/samd51/family.mk
index 75dfb9ade..2c346680e 100644
--- a/hw/bsp/samd51/family.mk
+++ b/hw/bsp/samd51/family.mk
@@ -16,24 +16,24 @@ CFLAGS += \
 CFLAGS += -Wno-error=undef
 
 SRC_C += \
-	hw/mcu/microchip/asf4/samd51/gcc/gcc/startup_samd51.c \
-	hw/mcu/microchip/asf4/samd51/gcc/system_samd51.c \
-	hw/mcu/microchip/asf4/samd51/hpl/gclk/hpl_gclk.c \
-	hw/mcu/microchip/asf4/samd51/hpl/mclk/hpl_mclk.c \
-	hw/mcu/microchip/asf4/samd51/hpl/osc32kctrl/hpl_osc32kctrl.c \
-	hw/mcu/microchip/asf4/samd51/hpl/oscctrl/hpl_oscctrl.c \
-	hw/mcu/microchip/asf4/samd51/hal/src/hal_atomic.c
+	hw/mcu/microchip/samd51/gcc/gcc/startup_samd51.c \
+	hw/mcu/microchip/samd51/gcc/system_samd51.c \
+	hw/mcu/microchip/samd51/hpl/gclk/hpl_gclk.c \
+	hw/mcu/microchip/samd51/hpl/mclk/hpl_mclk.c \
+	hw/mcu/microchip/samd51/hpl/osc32kctrl/hpl_osc32kctrl.c \
+	hw/mcu/microchip/samd51/hpl/oscctrl/hpl_oscctrl.c \
+	hw/mcu/microchip/samd51/hal/src/hal_atomic.c
 
 INC += \
 	$(TOP)/$(BOARD_PATH) \
-	$(TOP)/hw/mcu/microchip/asf4/samd51/ \
-	$(TOP)/hw/mcu/microchip/asf4/samd51/config \
-	$(TOP)/hw/mcu/microchip/asf4/samd51/include \
-	$(TOP)/hw/mcu/microchip/asf4/samd51/hal/include \
-	$(TOP)/hw/mcu/microchip/asf4/samd51/hal/utils/include \
-	$(TOP)/hw/mcu/microchip/asf4/samd51/hpl/port \
-	$(TOP)/hw/mcu/microchip/asf4/samd51/hri \
-	$(TOP)/hw/mcu/microchip/asf4/samd51/CMSIS/Include
+	$(TOP)/hw/mcu/microchip/samd51/ \
+	$(TOP)/hw/mcu/microchip/samd51/config \
+	$(TOP)/hw/mcu/microchip/samd51/include \
+	$(TOP)/hw/mcu/microchip/samd51/hal/include \
+	$(TOP)/hw/mcu/microchip/samd51/hal/utils/include \
+	$(TOP)/hw/mcu/microchip/samd51/hpl/port \
+	$(TOP)/hw/mcu/microchip/samd51/hri \
+	$(TOP)/hw/mcu/microchip/samd51/CMSIS/Include
 
 # For TinyUSB port source
 VENDOR = microchip
diff --git a/hw/mcu/microchip b/hw/mcu/microchip
index 6fd71727d..d75bb2d8c 160000
--- a/hw/mcu/microchip
+++ b/hw/mcu/microchip
@@ -1 +1 @@
-Subproject commit 6fd71727de19733a96766fb93990d7d3ab24ce8a
+Subproject commit d75bb2d8c877043218de104257203bcba6e11cc8