Update based on PR Comments

Author: mjs513

locale/circuitpython.pot

@@ -1107,6 +1107,10 @@ msgstr ""
 msgid "Framebuffer requires %d bytes"
 msgstr ""
 
+#: ports/mimxrt10xx/common-hal/microcontroller/Processor.c
+msgid "Frequency Out of Range Must be between 24Mhz and 1.008Ghz"
+msgstr ""
+
 #: shared-bindings/pwmio/PWMOut.c
 msgid "Frequency must match existing PWMOut using this timer"
 msgstr ""

ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.h

@@ -19,5 +19,3 @@
 
 #define CIRCUITPY_USB_DEVICE_INSTANCE 0
 #define CIRCUITPY_USB_HOST_INSTANCE 1
-
-#define HAS_SETTABLE_CLOCK 1

ports/mimxrt10xx/boards/sparkfun_teensy_micromod/mpconfigboard.mk

@@ -8,3 +8,4 @@ CHIP_FAMILY = MIMXRT1062
 FLASH = W25Q128JV
 CIRCUITPY__EVE = 1
 CIRCUITPY_USB_HOST = 1
+CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 1

ports/mimxrt10xx/boards/teensy40/mpconfigboard.h

@@ -16,5 +16,3 @@
 
 #define DEFAULT_UART_BUS_RX (&pin_GPIO_AD_B0_03)
 #define DEFAULT_UART_BUS_TX (&pin_GPIO_AD_B0_02)
-
-#define HAS_SETTABLE_CLOCK 1

ports/mimxrt10xx/boards/teensy40/mpconfigboard.mk

@@ -7,3 +7,4 @@ CHIP_VARIANT = MIMXRT1062DVJ6A
 CHIP_FAMILY = MIMXRT1062
 FLASH = W25Q16JV
 CIRCUITPY__EVE = 1
+CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 1

ports/mimxrt10xx/boards/teensy41/mpconfigboard.h

@@ -19,5 +19,3 @@
 
 #define CIRCUITPY_USB_DEVICE_INSTANCE 0
 #define CIRCUITPY_USB_HOST_INSTANCE 1
-
-#define HAS_SETTABLE_CLOCK 1

ports/mimxrt10xx/boards/teensy41/mpconfigboard.mk

@@ -8,3 +8,4 @@ CHIP_FAMILY = MIMXRT1062
 FLASH = W25Q64JV
 CIRCUITPY__EVE = 1
 CIRCUITPY_USB_HOST = 1
+CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY = 1

ports/mimxrt10xx/common-hal/microcontroller/Processor.c

@@ -25,10 +25,10 @@
  * THE SOFTWARE.
  */
 
-// https://raw.githubusercontent.com/adafruit/circuitpython/main/ports/mimxrt10xx/common-hal/microcontroller/Processor.c
-
 #include <math.h>
 
+#include "py/runtime.h"
+
 #include "common-hal/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/Processor.h"
 #include "shared-bindings/microcontroller/ResetReason.h"
@@ -52,8 +52,11 @@ float common_hal_mcu_processor_get_temperature(void) {
     return temp;
 }
 
-uint32_t common_hal_mcu_processor_set_sys_clock(mcu_processor_obj_t *self,
+uint32_t common_hal_mcu_processor_set_frequency(mcu_processor_obj_t *self,
     uint32_t frequency) {
+    if (frequency < 24000000 || frequency > 1008000000) {
+        mp_raise_ValueError(translate("Frequency Out of Range Must be between 24Mhz and 1.008Ghz"));
+    }
     SystemCoreClock = setarmclock(frequency);
     return SystemCoreClock;
 }

ports/mimxrt10xx/common-hal/microcontroller/Processor.h

@@ -35,7 +35,6 @@
 
 typedef struct {
     mp_obj_base_t base;
-    // Stores no state currently.
     uint32_t frequency;
 } mcu_processor_obj_t;
 

ports/mimxrt10xx/peripherals/mimxrt10xx/MIMXRT1062/clocks.c

@@ -456,7 +456,6 @@ uint32_t setarmclock(uint32_t frequency) {
     // if voltage needs to increase, do it before switch clock speed
     CCM->CCGR6 |= CCM_CCGR6_DCDC(CCM_CCGR_ON);
     if ((dcdc & ((uint32_t)(0x1F << 0))) < ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0)) {
-        // printf("Increasing voltage to %u mV\n", voltage);
         dcdc &= ~((uint32_t)(0x1F << 0));
         dcdc |= ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0);
         DCDC->REG3 = dcdc;
@@ -466,16 +465,13 @@ uint32_t setarmclock(uint32_t frequency) {
     }
 
     if (!(cbcdr & CCM_CBCDR_PERIPH_CLK_SEL_L)) {
-        // printf("need to switch to alternate clock during reconfigure of ARM PLL\n");
         const uint32_t need1s = CCM_ANALOG_PLL_USB1_ENABLE_L | CCM_ANALOG_PLL_USB1_POWER_L |
             CCM_ANALOG_PLL_USB1_LOCK_L | CCM_ANALOG_PLL_USB1_EN_USB_CLKS_L;
         uint32_t sel, div;
         if ((CCM_ANALOG->PLL_USB1 & need1s) == need1s) {
-            // printf("USB PLL is running, so we can use 120 MHz\n");
             sel = 0;
             div = 3;             // divide down to 120 MHz, so IPG is ok even if IPG_PODF=0
         } else {
-            // printf("USB PLL is off, use 24 MHz crystal\n");
             sel = 1;
             div = 0;
         }
@@ -500,8 +496,6 @@ uint32_t setarmclock(uint32_t frequency) {
         while (CCM->CDHIPR & ((uint32_t)(1 << 5))) {
             ;                                              // wait
         }
-    } else {
-        // printf("already running from PERIPH_CLK2, safe to mess with ARM PLL\n");
     }
 
     // TODO: check if PLL2 running, can 352, 396 or 528 can work? (no need for ARM PLL)
@@ -528,10 +522,9 @@ uint32_t setarmclock(uint32_t frequency) {
     if (mult < 54) {
         mult = 54;
     }
-    // printf("Freq: 12 MHz * %u / %u / %u\n", mult, div_arm, div_ahb);
+
     frequency = mult * 12000000 / div_arm / div_ahb;
 
-    // printf("ARM PLL=%x\n", CCM_ANALOG->PLL_ARM);
     const uint32_t arm_pll_mask = CCM_ANALOG_PLL_ARM_LOCK_L | CCM_ANALOG_PLL_ARM_BYPASS_L |
         CCM_ANALOG_PLL_ARM_ENABLE_L | CCM_ANALOG_PLL_ARM_POWERDOWN_L |
         CCM_ANALOG_PLL_ARM_DIV_SELECT_MASK;
@@ -545,9 +538,6 @@ uint32_t setarmclock(uint32_t frequency) {
         while (!(CCM_ANALOG->PLL_ARM & CCM_ANALOG_PLL_ARM_LOCK_L)) {
             ;                                                                // wait for lock
         }
-        // printf("ARM PLL=%x\n", CCM_ANALOG->PLL_ARM);
-    } else {
-        // printf("ARM PLL already running at required frequency\n");
     }
 
     if ((CCM->CACRR & ((uint32_t)(0x07 << 0))) != (div_arm - 1)) {
@@ -588,11 +578,8 @@ uint32_t setarmclock(uint32_t frequency) {
     F_BUS_ACTUAL = frequency / div_ipg;
     // scale_cpu_cycles_to_microseconds = 0xFFFFFFFFu / (uint32_t)(frequency / 1000000u);
 
-    // printf("New Frequency: ARM=%u, IPG=%u\n", frequency, frequency / div_ipg);
-
     // if voltage needs to decrease, do it after switch clock speed
     if ((dcdc & ((uint32_t)(0x1F << 0))) > ((uint32_t)(((voltage - 800) / 25) & 0x1F) << 0)) {
-        // printf("Decreasing voltage to %u mV\n", voltage);
         dcdc &= ~((uint32_t)(0x1F << 0));
         dcdc |= ((uint32_t)(0x1F << 0));
         DCDC->REG3 = dcdc;