Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-06 20:20:14 +01:00
Code Issues Actions 52 Packages Projects Releases Wiki Activity

renesas-ra/machine_pin: Support drive keyword and fix GPIO setting.

Browse Source 
Changes are:
- Support drive= keyword argument.
- Fix trigger keyword check.
- Fix GPIO pin setting.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
This commit is contained in:
Takeo Takahashi
2022-06-23 22:27:47 +09:00
committed by Damien George
parent 85a25895ff
commit 621bff8557
14 changed files with 177 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ports/renesas-ra/ra/ra_gpio.c
View File

@@ -31,23 +31,17 @@ void ra_gpio_config(uint32_t pin, uint32_t mode, uint32_t pull, uint32_t drive,
uint32_t port = GPIO_PORT(pin);
uint32_t bit = GPIO_BIT(pin);
pwpr_unprotect();
_PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK | NCODR_MASK | PCR_MASK | PDR_MASK | DSCR1_MASK | DSCR_MASK);
switch (mode) {
case GPIO_MODE_INPUT:
_PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK); // GPIO
_PXXPFS(port, bit) &= ~PDR_MASK; // input
if (pull != 0) {
if (pull == GPIO_PULLUP) {
_PXXPFS(port, bit) |= PCR_MASK; // set pullup
} else {
_PXXPFS(port, bit) &= ~PCR_MASK; // clear pullup
}
break;
case GPIO_MODE_OUTPUT_PP:
_PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK); // GPIO
_PXXPFS(port, bit) |= PDR_MASK; // output
_PXXPFS(port, bit) &= ~PCR_MASK; // pullup clear
break;
case GPIO_MODE_OUTPUT_OD:
_PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK); // GPIO
_PXXPFS(port, bit) |= (PDR_MASK | NCODR_MASK);
break;
case GPIO_MODE_AF_PP:
@@ -56,20 +50,23 @@ void ra_gpio_config(uint32_t pin, uint32_t mode, uint32_t pull, uint32_t drive,
case GPIO_MODE_AF_OD:
_PXXPFS(port, bit) |= (PMR_MASK | PDR_MASK | NCODR_MASK);
break;
case GPIO_MODE_ANALOG:
_PXXPFS(port, bit) |= ASEL_MASK;
break;
}
switch (drive) {
case GPIO_HIGH_POWER:
_PXXPFS(port, bit) |= (DSCR1_MASK | DSCR_MASK);
break;
case GPIO_MED_POWER:
_PXXPFS(port, bit) &= ~DSCR1_MASK;
case GPIO_MID_FAST_POWER:
_PXXPFS(port, bit) |= DSCR1_MASK;
break;
case GPIO_MID_POWER:
_PXXPFS(port, bit) |= DSCR_MASK;
break;
case GPIO_LOW_POWER:
_PXXPFS(port, bit) &= ~(DSCR1_MASK | DSCR_MASK);
break;
default: /* GPIO_NOTOUCH_POWER */
/* do not modify */
default:
/* Bits are already cleared */
break;
}
_PXXPFS(port, bit) &= ~(uint32_t)(0x1f000000);
@@ -102,7 +99,6 @@ void ra_gpio_toggle(uint32_t pin) {
uint32_t port = GPIO_PORT(pin);
uint32_t bit = GPIO_BIT(pin);
pwpr_unprotect();
_PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK); // GPIO
_PXXPFS(port, bit) ^= 1;
pwpr_protect();
}
@@ -111,7 +107,6 @@ void ra_gpio_write(uint32_t pin, uint32_t value) {
uint32_t port = GPIO_PORT(pin);
uint32_t bit = GPIO_BIT(pin);
pwpr_unprotect();
_PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK); // GPIO
if (value != 0) {
_PXXPFS(port, bit) |= 1;
} else {
@@ -123,15 +118,26 @@ void ra_gpio_write(uint32_t pin, uint32_t value) {
uint32_t ra_gpio_read(uint32_t pin) {
uint32_t port = GPIO_PORT(pin);
uint32_t bit = GPIO_BIT(pin);
return ((_PXXPFS(port, bit) &= PIDR_MASK) != 0) ? 1 : 0;
return ((_PXXPFS(port, bit) & PIDR_MASK) != 0) ? 1 : 0;
}
uint32_t ra_gpio_get_mode(uint32_t pin) {
uint8_t mode = 0;
uint32_t port = GPIO_PORT(pin);
uint32_t bit = GPIO_BIT(pin);
if ((_PXXPFS(port, bit) &= PDR_MASK) != 0) {
mode = GPIO_MODE_OUTPUT_PP;
uint32_t pfs = _PXXPFS(GPIO_PORT(pin), GPIO_BIT(pin));
if ((pfs & ASEL_MASK) != 0) {
mode = GPIO_MODE_ANALOG;
} else if ((pfs & PMR_MASK) != 0) {
if ((pfs & NCODR_MASK) != 0) {
mode = GPIO_MODE_AF_OD;
} else {
mode = GPIO_MODE_AF_PP;
}
} else if ((pfs & PDR_MASK) != 0) {
if ((pfs & NCODR_MASK) != 0) {
mode = GPIO_MODE_OUTPUT_OD;
} else {
mode = GPIO_MODE_OUTPUT_PP;
}
} else {
mode = GPIO_MODE_INPUT;
}
@@ -142,7 +148,7 @@ uint32_t ra_gpio_get_pull(uint32_t pin) {
uint8_t pull = 0;
uint32_t port = GPIO_PORT(pin);
uint32_t bit = GPIO_BIT(pin);
if ((_PXXPFS(port, bit) &= PCR_MASK) != 0) {
if ((_PXXPFS(port, bit) & PCR_MASK) != 0) {
pull = GPIO_PULLUP;
} else {
pull = GPIO_NOPULL;
@@ -153,19 +159,22 @@ uint32_t ra_gpio_get_pull(uint32_t pin) {
uint32_t ra_gpio_get_af(uint32_t pin) {
uint32_t port = GPIO_PORT(pin);
uint32_t bit = GPIO_BIT(pin);
return (_PXXPFS(port, bit) &= PMR_MASK) != 0;
return (_PXXPFS(port, bit) & PMR_MASK) != 0;
}
uint32_t ra_gpio_get_drive(uint32_t pin) {
uint8_t drive = 0;
uint32_t port = GPIO_PORT(pin);
uint32_t bit = GPIO_BIT(pin);
switch (_PXXPFS(port, bit) &= (DSCR1_MASK | DSCR_MASK)) {
switch (_PXXPFS(port, bit) & (DSCR1_MASK | DSCR_MASK)) {
case (DSCR1_MASK | DSCR_MASK):
drive = GPIO_HIGH_POWER;
break;
case DSCR1_MASK:
drive = GPIO_MID_FAST_POWER;
break;
case DSCR_MASK:
drive = GPIO_MED_POWER;
drive = GPIO_MID_POWER;
break;
case 0:
default:

57
ports/renesas-ra/ra/ra_gpio.h
View File

@@ -1,7 +1,7 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2021 Renesas Electronics Corporation
* Copyright (c) 2021,2022 Renesas Electronics Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -69,47 +69,42 @@ enum AF_INDEX {
AF_END = 0xff,
};
#define GPIO_MODE_INPUT 1
#define GPIO_MODE_OUTPUT_PP 2
#define GPIO_MODE_OUTPUT_OD 3
#define GPIO_MODE_AF_PP 4
#define GPIO_MODE_AF_OD 5
#define GPIO_MODE_ANALOG 6
#define GPIO_MODE_IT_RISING 7
#define GPIO_MODE_IT_FALLING 8
#define GPIO_MODE_IT_RISING_FALLING 9
#define GPIO_MODE_EVT_RISING 10
#define GPIO_MODE_EVT_FALLING 11
#define GPIO_MODE_EVT_RISING_FALLING 12
#define GPIO_NOPULL 13
#define GPIO_PULLUP 14
#define GPIO_PULLDOWN 15
#define GPIO_PULLHOLD 16
#define GPIO_LOW_POWER 17
#define GPIO_MED_POWER 18
#define GPIO_HIGH_POWER 19
#define GPIO_NOTOUCH_POWER 20
#define GPIO_IRQ_LOWLEVEL 21
#define GPIO_IRQ_HIGHLEVEL 22
#define GPIO_MODE_INPUT 0
#define GPIO_MODE_OUTPUT_PP 1
#define GPIO_MODE_OUTPUT_OD 2
#define GPIO_MODE_AF_PP 3
#define GPIO_MODE_AF_OD 4
#define GPIO_MODE_ANALOG 5
#define GPIO_IRQ_FALLING 0x1
#define GPIO_IRQ_RISING 0x2
#define GPIO_IRQ_LOWLEVEL 0x4
#define GPIO_IRQ_HIGHLEVEL 0x8
#define GPIO_NOPULL 0
#define GPIO_PULLUP 1
#define GPIO_PULLDOWN 2
#define GPIO_LOW_POWER 0
#define GPIO_MID_POWER 1
#define GPIO_MID_FAST_POWER 2
#define GPIO_HIGH_POWER 3
#define IS_GPIO_MODE(MODE) (((MODE) == GPIO_MODE_INPUT) || \
((MODE) == GPIO_MODE_OUTPUT_PP) || \
((MODE) == GPIO_MODE_OUTPUT_OD) || \
((MODE) == GPIO_MODE_AF_PP) || \
((MODE) == GPIO_MODE_AF_OD) || \
((MODE) == GPIO_MODE_IT_RISING) || \
((MODE) == GPIO_MODE_IT_FALLING) || \
((MODE) == GPIO_MODE_IT_RISING_FALLING) || \
((MODE) == GPIO_MODE_EVT_RISING) || \
((MODE) == GPIO_MODE_EVT_FALLING) || \
((MODE) == GPIO_MODE_EVT_RISING_FALLING) || \
((MODE) == GPIO_MODE_ANALOG))
#define IS_GPIO_DRIVE(DRIVE) (((DRIVE) == GPIO_LOW_POWER) || \
((DRIVE) == GPIO_MED_POWER) || \
((DRIVE) == GPIO_MID_POWER) || \
((DRIVE) == GPIO_MID_FAST_POWER) || \
((DRIVE) == GPIO_HIGH_POWER))
#define IS_GPIO_PULL(PULL) (((PULL) == GPIO_NOPULL) || ((PULL) == GPIO_PULLUP))
#define IS_GPIO_PULL(PULL) (((PULL) == GPIO_NOPULL) || \
((PULL) == GPIO_PULLUP) || \
((PULL) == GPIO_PULLDOWN))
#define IS_GPIO_AF(AF) ((AF) <= (uint8_t)0x1F)

4
ports/renesas-ra/ra/ra_i2c.c
View File

@@ -362,8 +362,8 @@ void ra_i2c_set_baudrate(R_IIC0_Type *i2c_inst, uint32_t baudrate) {
void ra_i2c_init(R_IIC0_Type *i2c_inst, uint32_t scl, uint32_t sda, uint32_t baudrate) {
ra_i2c_module_start(i2c_inst);
ra_gpio_config(scl, GPIO_MODE_AF_OD, 0, GPIO_NOTOUCH_POWER, AF_I2C);
ra_gpio_config(sda, GPIO_MODE_AF_OD, 0, GPIO_NOTOUCH_POWER, AF_I2C);
ra_gpio_config(scl, GPIO_MODE_AF_OD, GPIO_NOPULL, GPIO_LOW_POWER, AF_I2C);
ra_gpio_config(sda, GPIO_MODE_AF_OD, GPIO_NOPULL, GPIO_LOW_POWER, AF_I2C);
ra_i2c_priority(i2c_inst, RA_PRI_I2C);
i2c_inst->ICCR1_b.ICE = 0; // I2C disable
i2c_inst->ICCR1_b.IICRST = 1; // I2C internal reset

8
ports/renesas-ra/ra/ra_sci.c
View File

@@ -788,7 +788,7 @@ static void ra_sci_tx_set_pin(uint32_t pin) {
uint32_t af;
find = ra_af_find_ch_af((ra_af_pin_t *)&ra_sci_tx_pins, SCI_TX_PINS_SIZE, pin, &ch, &af);
if (find) {
ra_gpio_config(pin, GPIO_MODE_AF_PP, 0, 0, af);
ra_gpio_config(pin, GPIO_MODE_AF_PP, GPIO_NOPULL, GPIO_LOW_POWER, af);
}
}
@@ -798,7 +798,7 @@ static void ra_sci_rx_set_pin(uint32_t pin) {
uint32_t af;
find = ra_af_find_ch_af((ra_af_pin_t *)&ra_sci_rx_pins, SCI_RX_PINS_SIZE, pin, &ch, &af);
if (find) {
ra_gpio_config(pin, GPIO_MODE_INPUT, 1, 0, af);
ra_gpio_config(pin, GPIO_MODE_INPUT, GPIO_PULLUP, GPIO_LOW_POWER, af);
}
}
@@ -808,7 +808,7 @@ static void ra_sci_cts_set_pin(uint32_t pin) {
uint32_t af;
find = ra_af_find_ch_af((ra_af_pin_t *)&ra_sci_cts_pins, SCI_CTS_PINS_SIZE, pin, &ch, &af);
if (find) {
ra_gpio_config(pin, GPIO_MODE_INPUT, 1, 0, af);
ra_gpio_config(pin, GPIO_MODE_INPUT, GPIO_PULLUP, GPIO_LOW_POWER, af);
}
}
@@ -1134,7 +1134,7 @@ void ra_sci_init_with_flow(uint32_t ch, uint32_t tx_pin, uint32_t rx_pin, uint32
}
if (rts_pin != (uint32_t)PIN_END) {
m_rts_pin[idx] = rts_pin;
ra_gpio_config(rts_pin, GPIO_MODE_OUTPUT_PP, false, 0, 0);
ra_gpio_config(rts_pin, GPIO_MODE_OUTPUT_PP, GPIO_NOPULL, GPIO_LOW_POWER, 0);
ra_gpio_write(rts_pin, 0);
}
}

4
ports/renesas-ra/ra/ra_spi.c
View File

@@ -196,9 +196,9 @@ static void ra_spi_module_stop(uint32_t ch) {
static void ra_spi_set_pin(uint32_t pin, bool miso) {
if (miso) {
ra_gpio_config(pin, GPIO_MODE_INPUT, 1, 0, AF_SPI);
ra_gpio_config(pin, GPIO_MODE_INPUT, GPIO_PULLUP, GPIO_LOW_POWER, AF_SPI);
} else {
ra_gpio_config(pin, GPIO_MODE_AF_PP, 0, 0, AF_SPI);
ra_gpio_config(pin, GPIO_MODE_AF_PP, GPIO_NOPULL, GPIO_LOW_POWER, AF_SPI);
}
}