Skip to content

Commit 846d819

Browse files
xodus7dkalowsk
xodus7
authored and
dkalowsk
committed
drivers: gpio: gpio_dw: move base_addr to config struct
This variable should be const and inside the driver config struct. Signed-off-by: Corey Wharton <xodus7@cwharton.com>
1 parent 338c505 commit 846d819

File tree

2 files changed

+28
-33
lines changed

2 files changed

+28
-33
lines changed

‎drivers/gpio/gpio_dw.c

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,9 @@ static int gpio_dw_pin_interrupt_configure(const struct device *port,
171171
enum gpio_int_mode mode,
172172
enum gpio_int_trig trig)
173173
{
174-
struct gpio_dw_runtime *context = port->data;
175174
const struct gpio_dw_config *config = port->config;
176-
uint32_t base_addr = dw_base_to_block_base(context->base_addr);
177-
uint32_t port_base_addr = context->base_addr;
175+
uint32_t base_addr = dw_base_to_block_base(config->base_addr);
176+
uint32_t port_base_addr = config->base_addr;
178177
uint32_t dir_port = dw_get_dir_port(port_base_addr);
179178
uint32_t data_port = dw_get_data_port(port_base_addr);
180179
uint32_t dir_reg;
@@ -235,10 +234,9 @@ static int gpio_dw_pin_interrupt_configure(const struct device *port,
235234
static inline void dw_pin_config(const struct device *port,
236235
uint32_t pin, int flags)
237236
{
238-
struct gpio_dw_runtime *context = port->data;
239237
const struct gpio_dw_config *config = port->config;
240-
uint32_t base_addr = dw_base_to_block_base(context->base_addr);
241-
uint32_t port_base_addr = context->base_addr;
238+
uint32_t base_addr = dw_base_to_block_base(config->base_addr);
239+
uint32_t port_base_addr = config->base_addr;
242240
uint32_t dir_port = dw_get_dir_port(port_base_addr);
243241
bool pin_is_output, need_debounce;
244242

@@ -267,11 +265,9 @@ static inline void dw_pin_config(const struct device *port,
267265

268266
static void gpio_dw_set_hw_mode(const struct device *port, gpio_pin_t pin, bool hw_mode)
269267
{
270-
struct gpio_dw_runtime *context = port->data;
271-
__unused const struct gpio_driver_config *const cfg =
272-
(const struct gpio_driver_config *)port->config;
273-
uint32_t base_addr = dw_base_to_block_base(context->base_addr);
274-
uint32_t port_id = dw_derive_port_from_base(context->base_addr);
268+
const struct gpio_dw_config *config = port->config;
269+
uint32_t base_addr = dw_base_to_block_base(config->base_addr);
270+
uint32_t port_id = dw_derive_port_from_base(config->base_addr);
275271
uint32_t ctl_port;
276272

277273
/* 4-port GPIO implementation translates from base address to port */
@@ -339,9 +335,9 @@ static inline int gpio_dw_config(const struct device *port,
339335

340336
static int gpio_dw_port_get_raw(const struct device *port, uint32_t *value)
341337
{
342-
struct gpio_dw_runtime *context = port->data;
343-
uint32_t base_addr = dw_base_to_block_base(context->base_addr);
344-
uint32_t port_base_addr = context->base_addr;
338+
const struct gpio_dw_config *config = port->config;
339+
uint32_t base_addr = dw_base_to_block_base(config->base_addr);
340+
uint32_t port_base_addr = config->base_addr;
345341
uint32_t ext_port = dw_get_ext_port(port_base_addr);
346342

347343
*value = dw_read(base_addr, ext_port);
@@ -352,9 +348,9 @@ static int gpio_dw_port_get_raw(const struct device *port, uint32_t *value)
352348
static int gpio_dw_port_set_masked_raw(const struct device *port,
353349
uint32_t mask, uint32_t value)
354350
{
355-
struct gpio_dw_runtime *context = port->data;
356-
uint32_t base_addr = dw_base_to_block_base(context->base_addr);
357-
uint32_t port_base_addr = context->base_addr;
351+
const struct gpio_dw_config *config = port->config;
352+
uint32_t base_addr = dw_base_to_block_base(config->base_addr);
353+
uint32_t port_base_addr = config->base_addr;
358354
uint32_t data_port = dw_get_data_port(port_base_addr);
359355
uint32_t pins;
360356

@@ -367,9 +363,9 @@ static int gpio_dw_port_set_masked_raw(const struct device *port,
367363

368364
static int gpio_dw_port_set_bits_raw(const struct device *port, uint32_t mask)
369365
{
370-
struct gpio_dw_runtime *context = port->data;
371-
uint32_t base_addr = dw_base_to_block_base(context->base_addr);
372-
uint32_t port_base_addr = context->base_addr;
366+
const struct gpio_dw_config *config = port->config;
367+
uint32_t base_addr = dw_base_to_block_base(config->base_addr);
368+
uint32_t port_base_addr = config->base_addr;
373369
uint32_t data_port = dw_get_data_port(port_base_addr);
374370
uint32_t pins;
375371

@@ -383,9 +379,9 @@ static int gpio_dw_port_set_bits_raw(const struct device *port, uint32_t mask)
383379
static int gpio_dw_port_clear_bits_raw(const struct device *port,
384380
uint32_t mask)
385381
{
386-
struct gpio_dw_runtime *context = port->data;
387-
uint32_t base_addr = dw_base_to_block_base(context->base_addr);
388-
uint32_t port_base_addr = context->base_addr;
382+
const struct gpio_dw_config *config = port->config;
383+
uint32_t base_addr = dw_base_to_block_base(config->base_addr);
384+
uint32_t port_base_addr = config->base_addr;
389385
uint32_t data_port = dw_get_data_port(port_base_addr);
390386
uint32_t pins;
391387

@@ -398,9 +394,9 @@ static int gpio_dw_port_clear_bits_raw(const struct device *port,
398394

399395
static int gpio_dw_port_toggle_bits(const struct device *port, uint32_t mask)
400396
{
401-
struct gpio_dw_runtime *context = port->data;
402-
uint32_t base_addr = dw_base_to_block_base(context->base_addr);
403-
uint32_t port_base_addr = context->base_addr;
397+
const struct gpio_dw_config *config = port->config;
398+
uint32_t base_addr = dw_base_to_block_base(config->base_addr);
399+
uint32_t port_base_addr = config->base_addr;
404400
uint32_t data_port = dw_get_data_port(port_base_addr);
405401
uint32_t pins;
406402

@@ -424,7 +420,8 @@ static inline int gpio_dw_manage_callback(const struct device *port,
424420
static void gpio_dw_isr(const struct device *port)
425421
{
426422
struct gpio_dw_runtime *context = port->data;
427-
uint32_t base_addr = dw_base_to_block_base(context->base_addr);
423+
const struct gpio_dw_config *config = port->config;
424+
uint32_t base_addr = dw_base_to_block_base(config->base_addr);
428425
uint32_t int_status;
429426

430427
int_status = dw_read(base_addr, INTSTATUS);
@@ -448,13 +445,12 @@ static DEVICE_API(gpio, api_funcs) = {
448445

449446
static int gpio_dw_initialize(const struct device *port)
450447
{
451-
struct gpio_dw_runtime *context = port->data;
452448
const struct gpio_dw_config *config = port->config;
453449
uint32_t base_addr;
454450

455451
if (dw_interrupt_support(config)) {
456452

457-
base_addr = dw_base_to_block_base(context->base_addr);
453+
base_addr = dw_base_to_block_base(config->base_addr);
458454

459455
/* interrupts in sync with system clock */
460456
dw_set_bit(base_addr, INT_CLOCK_SYNC, LS_SYNC_POS, 1);
@@ -491,14 +487,13 @@ static int gpio_dw_initialize(const struct device *port)
491487
.common = { \
492488
.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(n), \
493489
}, \
490+
.base_addr = DT_INST_REG_ADDR(n), \
494491
.irq_num = COND_CODE_1(DT_INST_IRQ_HAS_IDX(n, 0), (DT_INST_IRQN(n)), (0)), \
495492
.ngpios = DT_INST_PROP(n, ngpios), \
496493
.config_func = gpio_config_##n##_irq, \
497494
}; \
498495
\
499-
static struct gpio_dw_runtime gpio_##n##_runtime = { \
500-
.base_addr = DT_INST_REG_ADDR(n), \
501-
}; \
496+
static struct gpio_dw_runtime gpio_##n##_runtime; \
502497
\
503498
DEVICE_DT_INST_DEFINE(n, gpio_dw_initialize, NULL, &gpio_##n##_runtime, \
504499
&gpio_dw_config_##n, PRE_KERNEL_1, \

‎drivers/gpio/gpio_dw.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ typedef void (*gpio_config_irq_t)(const struct device *port);
2020
struct gpio_dw_config {
2121
/* gpio_driver_config needs to be first */
2222
struct gpio_driver_config common;
23+
uint32_t base_addr;
2324
uint32_t ngpios;
2425
uint32_t irq_num; /* set to 0 if GPIO port cannot interrupt */
2526
gpio_config_irq_t config_func;
@@ -28,7 +29,6 @@ struct gpio_dw_config {
2829
struct gpio_dw_runtime {
2930
/* gpio_driver_data needs to be first */
3031
struct gpio_driver_data common;
31-
uint32_t base_addr;
3232
sys_slist_t callbacks;
3333
};
3434

0 commit comments

Comments
 (0)