a5fd0d184a
The init infrastructure, found in `init.h`, is currently used by: - `SYS_INIT`: to call functions before `main` - `DEVICE_*`: to initialize devices They are all sorted according to an initialization level + a priority. `SYS_INIT` calls are really orthogonal to devices, however, the required function signature requires a `const struct device *dev` as a first argument. The only reason for that is because the same init machinery is used by devices, so we have something like: ```c struct init_entry { int (*init)(const struct device *dev); /* only set by DEVICE_*, otherwise NULL */ const struct device *dev; } ``` As a result, we end up with such weird/ugly pattern: ```c static int my_init(const struct device *dev) { /* always NULL! add ARG_UNUSED to avoid compiler warning */ ARG_UNUSED(dev); ... } ``` This is really a result of poor internals isolation. This patch proposes a to make init entries more flexible so that they can accept sytem initialization calls like this: ```c static int my_init(void) { ... } ``` This is achieved using a union: ```c union init_function { /* for SYS_INIT, used when init_entry.dev == NULL */ int (*sys)(void); /* for DEVICE*, used when init_entry.dev != NULL */ int (*dev)(const struct device *dev); }; struct init_entry { /* stores init function (either for SYS_INIT or DEVICE*) union init_function init_fn; /* stores device pointer for DEVICE*, NULL for SYS_INIT. Allows * to know which union entry to call. */ const struct device *dev; } ``` This solution **does not increase ROM usage**, and allows to offer clean public APIs for both SYS_INIT and DEVICE*. Note that however, init machinery keeps a coupling with devices. **NOTE**: This is a breaking change! All `SYS_INIT` functions will need to be converted to the new signature. See the script offered in the following commit. Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no> init: convert SYS_INIT functions to the new signature Conversion scripted using scripts/utils/migrate_sys_init.py. Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no> manifest: update projects for SYS_INIT changes Update modules with updated SYS_INIT calls: - hal_ti - lvgl - sof - TraceRecorderSource Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no> tests: devicetree: devices: adjust test Adjust test according to the recently introduced SYS_INIT infrastructure. Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no> tests: kernel: threads: adjust SYS_INIT call Adjust to the new signature: int (*init_fn)(void); Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
63 lines
1.4 KiB
C
63 lines
1.4 KiB
C
/*
|
|
* Copyright 2022, NXP
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <zephyr/drivers/pinctrl.h>
|
|
#if !defined(CONFIG_SOC_SERIES_LPC11U6X)
|
|
#include <fsl_clock.h>
|
|
#endif
|
|
|
|
#define OFFSET(mux) (((mux) & 0xFFF00000) >> 20)
|
|
#define TYPE(mux) (((mux) & 0xC0000) >> 18)
|
|
|
|
#define IOCON_TYPE_D 0x0
|
|
#define IOCON_TYPE_I 0x1
|
|
#define IOCON_TYPE_A 0x2
|
|
|
|
static volatile uint32_t *iocon =
|
|
(volatile uint32_t *)DT_REG_ADDR(DT_NODELABEL(iocon));
|
|
|
|
int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
|
|
uintptr_t reg)
|
|
{
|
|
for (uint8_t i = 0; i < pin_cnt; i++) {
|
|
uint32_t pin_mux = pins[i];
|
|
uint32_t offset = OFFSET(pin_mux);
|
|
|
|
/* Check if this is an analog or i2c type pin */
|
|
switch (TYPE(pin_mux)) {
|
|
case IOCON_TYPE_D:
|
|
pin_mux &= Z_PINCTRL_IOCON_D_PIN_MASK;
|
|
break;
|
|
case IOCON_TYPE_I:
|
|
pin_mux &= Z_PINCTRL_IOCON_I_PIN_MASK;
|
|
break;
|
|
case IOCON_TYPE_A:
|
|
pin_mux &= Z_PINCTRL_IOCON_A_PIN_MASK;
|
|
break;
|
|
default:
|
|
/* Should not occur */
|
|
__ASSERT_NO_MSG(TYPE(pin_mux) <= IOCON_TYPE_A);
|
|
}
|
|
/* Set pinmux */
|
|
*(iocon + offset) = pin_mux;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#if defined(CONFIG_SOC_FAMILY_LPC) && !defined(CONFIG_SOC_SERIES_LPC11U6X)
|
|
/* LPC family (except 11u6x) needs iocon clock to be enabled */
|
|
|
|
static int pinctrl_clock_init(void)
|
|
{
|
|
/* Enable IOCon clock */
|
|
CLOCK_EnableClock(kCLOCK_Iocon);
|
|
return 0;
|
|
}
|
|
|
|
SYS_INIT(pinctrl_clock_init, PRE_KERNEL_1, 0);
|
|
|
|
#endif /* CONFIG_SOC_FAMILY_LPC && !CONFIG_SOC_SERIES_LPC11U6X */
|