diff --git a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
index 46960cab83..9bf2a8d191 100644
--- a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
+++ b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf9160"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_HW_PWM   (0)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
diff --git a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
index 71349e08c4..0e6c5a44ab 100644
--- a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h
@@ -14,7 +14,6 @@
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) NANO33_board_enter_bootloader()
 
 #define MICROPY_PY_MACHINE_UART         (1)
-#define MICROPY_PY_MACHINE_PWM          (1)
 #define MICROPY_PY_MACHINE_HW_PWM       (1)
 #define MICROPY_PY_MACHINE_HW_SPI       (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER    (1)
diff --git a/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
index 271cef0323..a16ce1a20d 100644
--- a/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
+++ b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h
@@ -32,7 +32,6 @@
 #define MICROPY_PY_MUSIC            (1)
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
index 0ca3ca1612..b69f6a882e 100644
--- a/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
+++ b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h
@@ -32,7 +32,6 @@
 #define MICROPY_PY_MUSIC            (1)
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/DVK_BL652/mpconfigboard.h b/ports/nrf/boards/DVK_BL652/mpconfigboard.h
index e83e555178..5eb666c975 100644
--- a/ports/nrf/boards/DVK_BL652/mpconfigboard.h
+++ b/ports/nrf/boards/DVK_BL652/mpconfigboard.h
@@ -29,7 +29,7 @@
 #define MICROPY_PY_SYS_PLATFORM     "bl652"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
+#define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
diff --git a/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
index 72aeb44928..8d3b3688f3 100644
--- a/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
+++ b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h
@@ -31,6 +31,7 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52"
 
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
diff --git a/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
index d4ce93a0ac..17903e576d 100644
--- a/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
+++ b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h
@@ -46,7 +46,6 @@
 
 // Peripherals Config
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/FEATHER52/mpconfigboard.h b/ports/nrf/boards/FEATHER52/mpconfigboard.h
index cef44ca403..f653832c62 100644
--- a/ports/nrf/boards/FEATHER52/mpconfigboard.h
+++ b/ports/nrf/boards/FEATHER52/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
index 63d2944f6c..85b48e1fb2 100644
--- a/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
+++ b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h
@@ -32,7 +32,6 @@
 #define MICROPY_PY_MUSIC            (1)
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
index 73b1c6ff74..1f47e9b06d 100644
--- a/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
+++ b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h
@@ -32,7 +32,6 @@
 #define MICROPY_PY_MUSIC            (1)
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/MICROBIT/mpconfigboard.h b/ports/nrf/boards/MICROBIT/mpconfigboard.h
index 4c6e05120d..63f45587af 100644
--- a/ports/nrf/boards/MICROBIT/mpconfigboard.h
+++ b/ports/nrf/boards/MICROBIT/mpconfigboard.h
@@ -30,7 +30,6 @@
 
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MUSIC            (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_SOFT_PWM (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
index feafe8a143..d502c86575 100644
--- a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
+++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM      "nrf52840-MDK-USB-Dongle"
 
 #define MICROPY_PY_MACHINE_UART      (1)
-#define MICROPY_PY_MACHINE_PWM       (1)
 #define MICROPY_PY_MACHINE_HW_PWM    (1)
 #define MICROPY_PY_MACHINE_HW_SPI    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
index 012a04458e..d77e104ce2 100644
--- a/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
+++ b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "PARTICLE-XENON"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/PCA10000/mpconfigboard.h b/ports/nrf/boards/PCA10000/mpconfigboard.h
index e56e0edf83..2f551612ea 100644
--- a/ports/nrf/boards/PCA10000/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10000/mpconfigboard.h
@@ -29,15 +29,13 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf51-dongle"
 
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_SOFT_PWM (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (0)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (0)
 #define MICROPY_PY_MACHINE_ADC      (0)
 #define MICROPY_PY_MACHINE_TEMP     (1)
 
-#define MICROPY_PY_MACHINE_PWM      (1)
-#define MICROPY_PY_MACHINE_SOFT_PWM (1)
-
 #define MICROPY_HW_ENABLE_RNG       (1)
 
 #define MICROPY_HW_HAS_LED          (1)
diff --git a/ports/nrf/boards/PCA10001/mpconfigboard.h b/ports/nrf/boards/PCA10001/mpconfigboard.h
index a2e8455398..2120ee0a88 100644
--- a/ports/nrf/boards/PCA10001/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10001/mpconfigboard.h
@@ -29,15 +29,13 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf51-DK"
 
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_SOFT_PWM (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (0)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_TEMP     (1)
 
-#define MICROPY_PY_MACHINE_PWM      (1)
-#define MICROPY_PY_MACHINE_SOFT_PWM (1)
-
 #define MICROPY_HW_ENABLE_RNG       (1)
 
 #define MICROPY_HW_HAS_LED          (1)
diff --git a/ports/nrf/boards/PCA10028/mpconfigboard.h b/ports/nrf/boards/PCA10028/mpconfigboard.h
index 7abb5845e3..f8e3541f37 100644
--- a/ports/nrf/boards/PCA10028/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10028/mpconfigboard.h
@@ -29,15 +29,13 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf51-DK"
 
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_SOFT_PWM (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_TEMP     (1)
 
-#define MICROPY_PY_MACHINE_PWM      (1)
-#define MICROPY_PY_MACHINE_SOFT_PWM (1)
-
 #define MICROPY_HW_ENABLE_RNG       (1)
 
 #define MICROPY_HW_HAS_LED          (1)
diff --git a/ports/nrf/boards/PCA10031/mpconfigboard.h b/ports/nrf/boards/PCA10031/mpconfigboard.h
index f162366233..b618f61b50 100644
--- a/ports/nrf/boards/PCA10031/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10031/mpconfigboard.h
@@ -29,15 +29,13 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf51-dongle"
 
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_SOFT_PWM (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
 #define MICROPY_PY_MACHINE_TEMP     (1)
 
-#define MICROPY_PY_MACHINE_PWM      (1)
-#define MICROPY_PY_MACHINE_SOFT_PWM (1)
-
 #define MICROPY_HW_ENABLE_RNG       (1)
 
 #define MICROPY_HW_HAS_LED          (1)
diff --git a/ports/nrf/boards/PCA10040/mpconfigboard.h b/ports/nrf/boards/PCA10040/mpconfigboard.h
index 00a56c2ea2..7202f6a0b1 100644
--- a/ports/nrf/boards/PCA10040/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10040/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52-DK"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/PCA10056/mpconfigboard.h b/ports/nrf/boards/PCA10056/mpconfigboard.h
index fa39764a7e..f7daf48a62 100644
--- a/ports/nrf/boards/PCA10056/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10056/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52840-PDK"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/PCA10059/mpconfigboard.h b/ports/nrf/boards/PCA10059/mpconfigboard.h
index 904a0871e4..f4c78915c6 100644
--- a/ports/nrf/boards/PCA10059/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10059/mpconfigboard.h
@@ -29,7 +29,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52840-Dongle"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/PCA10090/mpconfigboard.h b/ports/nrf/boards/PCA10090/mpconfigboard.h
index 95cf8d6544..f58ac8989b 100644
--- a/ports/nrf/boards/PCA10090/mpconfigboard.h
+++ b/ports/nrf/boards/PCA10090/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf9160-DK"
 
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_HW_PWM   (0)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_TIMER_NRF (0)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
index 18fbe327d0..1a2d14f1d4 100644
--- a/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
+++ b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h
@@ -34,7 +34,6 @@
 
 #define MICROPY_HW_USB_CDC          (1)
 #define MICROPY_PY_MACHINE_UART     (1)
-#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 3a311fe5d9..5a956311e2 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -196,6 +196,7 @@
 #define MICROPY_PY_MACHINE_SOFT_PWM (0)
 #endif
 
+#define MICROPY_PY_MACHINE_PWM      (MICROPY_PY_MACHINE_HW_PWM || MICROPY_PY_MACHINE_SOFT_PWM)
 #define MICROPY_PY_MACHINE_PWM_DUTY (1)
 
 #if MICROPY_PY_MACHINE_HW_PWM