diff options
| author | robert-hh <robert@hammelrath.com> | 2023-05-06 15:31:43 +0200 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2023-05-09 16:15:05 +1000 |
| commit | 65d376b11d8087ba07df503669cc5292d4f1d0e2 (patch) | |
| tree | 50969a9bd988ac30cca7014ba469ecff5988c875 | |
| parent | 14b862f70fdf61cf4040d99439f59f0d0aa925b0 (diff) | |
| download | micropython-65d376b11d8087ba07df503669cc5292d4f1d0e2.tar.gz micropython-65d376b11d8087ba07df503669cc5292d4f1d0e2.zip | |
mimxrt/machine_pin: Perform full configuration in machine_pin_set_mode.
machine_pin_set_mode() is used by the internal mp_hal_pin_xxx() set of
functions to configure pins.
| -rw-r--r-- | ports/mimxrt/machine_pin.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c index d44e649964..f005e38d69 100644 --- a/ports/mimxrt/machine_pin.c +++ b/ports/mimxrt/machine_pin.c @@ -174,15 +174,17 @@ void machine_pin_irq_deinit(void) { // Simplified mode setting used by the extmod modules void machine_pin_set_mode(const machine_pin_obj_t *self, uint8_t mode) { gpio_pin_config_t pin_config = {kGPIO_DigitalInput, 1, kGPIO_NoIntmode}; + uint32_t pad_config; pin_config.direction = (mode == PIN_MODE_IN ? kGPIO_DigitalInput : kGPIO_DigitalOutput); - GPIO_PinInit(self->gpio, self->pin, &pin_config); if (mode == PIN_MODE_OPEN_DRAIN) { - uint32_t pad_config = *(uint32_t *)self->configRegister; - pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b1) | IOMUXC_SW_PAD_CTL_PAD_DSE(0b110); - IOMUXC_SetPinMux(self->muxRegister, PIN_AF_MODE_ALT5, 0, 0, self->configRegister, 1U); // Software Input On Field: Input Path is determined by functionality - IOMUXC_SetPinConfig(self->muxRegister, PIN_AF_MODE_ALT5, 0, 0, self->configRegister, pad_config); + pad_config = pin_generate_config(PIN_PULL_UP_22K, mode, PIN_DRIVE_3, self->configRegister); + } else { + pad_config = pin_generate_config(PIN_PULL_DISABLED, mode, PIN_DRIVE_3, self->configRegister); } + IOMUXC_SetPinConfig(self->muxRegister, PIN_AF_MODE_ALT5, 0, 0, self->configRegister, pad_config); + IOMUXC_SetPinMux(self->muxRegister, PIN_AF_MODE_ALT5, 0, 0, self->configRegister, 1U); + GPIO_PinInit(self->gpio, self->pin, &pin_config); } STATIC mp_obj_t machine_pin_obj_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { |