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>
67 lines
1.9 KiB
C
67 lines
1.9 KiB
C
/*
|
|
* Copyright (c) 2019-2020 Linaro Limited
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <zephyr/device.h>
|
|
#include <zephyr/init.h>
|
|
#include <zephyr/kernel.h>
|
|
#include <soc.h>
|
|
#include <zephyr/sys/sys_io.h>
|
|
|
|
#define IOMUX_MAIN_INSEL (0x868 >> 2)
|
|
#define IOMUX_MAIN_OUTSEL (0x870 >> 2)
|
|
#define IOMUX_MAIN_OENSEL (0x878 >> 2)
|
|
#define IOMUX_MAIN_DEFAULT_IN (0x880 >> 2)
|
|
#define IOMUX_ALTF1_INSEL (0x888 >> 2)
|
|
#define IOMUX_ALTF1_OUTSEL (0x890 >> 2)
|
|
#define IOMUX_ALTF1_OENSEL (0x898 >> 2)
|
|
#define IOMUX_ALTF1_DEFAULT_IN (0x8A0 >> 2)
|
|
#define IOMUX_ALTF2_INSEL (0x8A8 >> 2)
|
|
#define IOMUX_ALTF2_OUTSEL (0x8B0 >> 2)
|
|
#define IOMUX_ALTF2_OENSEL (0x8B8 >> 2)
|
|
#define IOMUX_ALTF2_DEFAULT_IN (0x8C0 >> 2)
|
|
|
|
#ifdef CONFIG_TRUSTED_EXECUTION_NONSECURE
|
|
static void arm_musca_s1_pinmux_defaults(void)
|
|
{
|
|
}
|
|
#else
|
|
/*
|
|
* Only configure pins if we are secure. Otherwise secure violation will occur.
|
|
*/
|
|
static void arm_musca_s1_pinmux_defaults(void)
|
|
{
|
|
volatile uint32_t *scc = (uint32_t *)DT_REG_ADDR(DT_INST(0, arm_scc));
|
|
|
|
/* there is only altfunc1, so steer all alt funcs to use 1 */
|
|
scc[IOMUX_ALTF1_INSEL] = 0xffff;
|
|
scc[IOMUX_ALTF1_OUTSEL] = 0xffff;
|
|
scc[IOMUX_ALTF1_OENSEL] = 0xffff;
|
|
|
|
#if DT_NODE_HAS_STATUS(DT_NODELABEL(uart0), okay)
|
|
/* clear bit 0/1 for GPIO0/1 to steer from ALTF1 */
|
|
scc[IOMUX_MAIN_INSEL] &= ~(BIT(0) | BIT(1));
|
|
scc[IOMUX_MAIN_OUTSEL] &= ~(BIT(0) | BIT(1));
|
|
scc[IOMUX_MAIN_OENSEL] &= ~(BIT(0) | BIT(1));
|
|
#endif
|
|
/* Enable PINs for LEDS */
|
|
scc[IOMUX_ALTF1_OUTSEL] &= ~(BIT(2) | BIT(3) | BIT(4));
|
|
scc[IOMUX_ALTF1_OENSEL] &= ~(BIT(2) | BIT(3) | BIT(4));
|
|
scc[IOMUX_ALTF2_OUTSEL] &= ~(BIT(2) | BIT(3) | BIT(4));
|
|
scc[IOMUX_ALTF2_OENSEL] &= ~(BIT(2) | BIT(3) | BIT(4));
|
|
}
|
|
#endif
|
|
|
|
static int arm_musca_pinmux_init(void)
|
|
{
|
|
|
|
arm_musca_s1_pinmux_defaults();
|
|
|
|
return 0;
|
|
}
|
|
|
|
SYS_INIT(arm_musca_pinmux_init, PRE_KERNEL_1,
|
|
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
|