adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

drivers: gpio: Update Numaker driver init function

Browse source 
To update Numaker driver to turn on clock in init function.

Signed-off-by: cyliang tw <cyliang@nuvoton.com>
This commit is contained in:
cyliang tw 2024-05-07 20:14:13 +08:00 committed by Johan Hedberg
parent c0813ef1f2
commit 796fc9d54f
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/gpio/gpio_numaker.c
View file

@ -52,21 +52,6 @@ static int gpio_numaker_configure(const struct device *dev, gpio_pin_t pin, gpio
return -EINVAL;
}
SYS_UnlockReg();
/* Enable GPIO clock */
struct numaker_scc_subsys scc_subsys;
memset(&scc_subsys, 0x00, sizeof(scc_subsys));
scc_subsys.subsys_id = NUMAKER_SCC_SUBSYS_ID_PCC;
scc_subsys.pcc.clk_modidx = config->clk_modidx;
/* Equivalent to CLK_EnableModuleClock(config->clk_modidx) */
err = clock_control_on(config->clk_dev, (clock_control_subsys_t)&scc_subsys);
if (err != 0) {
goto move_exit;
}
/* Configure GPIO direction */
switch (flags & GPIO_DIR_MASK) {
case GPIO_INPUT:
@ -114,7 +99,6 @@ static int gpio_numaker_configure(const struct device *dev, gpio_pin_t pin, gpio
}
move_exit:
SYS_LockReg();
return err;
}
@ -265,8 +249,21 @@ static void gpio_numaker_isr(const struct device *dev)
\
static int gpio_numaker_init##n(const struct device *dev) \
{ \
IF_ENABLED(DT_INST_IRQ_HAS_IDX(n, 0), (GPIO_NUMAKER_IRQ_INIT(n);)) \
return 0; \
const struct gpio_numaker_config *config = dev->config; \
struct numaker_scc_subsys scc_subsys; \
int err; \
\
SYS_UnlockReg(); \
memset(&scc_subsys, 0x00, sizeof(scc_subsys)); \
scc_subsys.subsys_id = NUMAKER_SCC_SUBSYS_ID_PCC; \
scc_subsys.pcc.clk_modidx = config->clk_modidx; \
err = clock_control_on(config->clk_dev, (clock_control_subsys_t)&scc_subsys); \
if (err == 0) { \
IF_ENABLED(DT_INST_IRQ_HAS_IDX(n, 0), (GPIO_NUMAKER_IRQ_INIT(n);)) \
} \
\
SYS_LockReg(); \
return err; \
} \
DEVICE_DT_INST_DEFINE(n, &gpio_numaker_init##n, NULL, &gpio_numaker_data##n, \
&gpio_numaker_config##n, PRE_KERNEL_1, CONFIG_GPIO_INIT_PRIORITY, \