Skip to content

Commit cb8d6df

Browse files
asmellbykartben
authored andcommitted
drivers: mfd: npm13xx: Namespace register macros
Prefix macros for register access with NPM13XX_ to avoid symbol naming conflicts. Signed-off-by: Aksel Skauge Mellbye <aksel.mellbye@silabs.com>
1 parent 60ab988 commit cb8d6df

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

drivers/mfd/mfd_npm13xx.c

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#include <zephyr/drivers/gpio/gpio_utils.h>
1313
#include <zephyr/drivers/mfd/npm13xx.h>
1414

15-
#define TIME_BASE 0x07U
16-
#define MAIN_BASE 0x00U
17-
#define SHIP_BASE 0x0BU
18-
#define GPIO_BASE 0x06U
15+
#define NPM13XX_TIME_BASE 0x07U
16+
#define NPM13XX_MAIN_BASE 0x00U
17+
#define NPM13XX_SHIP_BASE 0x0BU
18+
#define NPM13XX_GPIO_BASE 0x06U
1919

2020
#define TIME_OFFSET_LOAD 0x03U
2121
#define TIME_OFFSET_TIMER 0x08U
@@ -93,7 +93,7 @@ static void work_callback(struct k_work *work)
9393
int ret;
9494

9595
/* Read all MAIN registers into temporary buffer */
96-
ret = mfd_npm13xx_reg_read_burst(data->dev, MAIN_BASE, 0U, buf, sizeof(buf));
96+
ret = mfd_npm13xx_reg_read_burst(data->dev, NPM13XX_MAIN_BASE, 0U, buf, sizeof(buf));
9797
if (ret < 0) {
9898
k_work_submit(&data->work);
9999
return;
@@ -105,7 +105,7 @@ static void work_callback(struct k_work *work)
105105
if ((buf[offset] & event_reg[i].mask) != 0U) {
106106
gpio_fire_callbacks(&data->callbacks, data->dev, BIT(i));
107107

108-
ret = mfd_npm13xx_reg_write(data->dev, MAIN_BASE, offset,
108+
ret = mfd_npm13xx_reg_write(data->dev, NPM13XX_MAIN_BASE, offset,
109109
event_reg[i].mask);
110110
if (ret < 0) {
111111
k_work_submit(&data->work);
@@ -136,7 +136,8 @@ static int mfd_npm13xx_init(const struct device *dev)
136136

137137
if (config->host_int_gpios.port != NULL) {
138138
/* Set specified PMIC pin to be interrupt output */
139-
ret = mfd_npm13xx_reg_write(dev, GPIO_BASE, GPIO_OFFSET_MODE + config->pmic_int_pin,
139+
ret = mfd_npm13xx_reg_write(dev, NPM13XX_GPIO_BASE,
140+
GPIO_OFFSET_MODE + config->pmic_int_pin,
140141
GPIO_MODE_GPOIRQ);
141142
if (ret < 0) {
142143
return ret;
@@ -169,17 +170,18 @@ static int mfd_npm13xx_init(const struct device *dev)
169170
}
170171
}
171172

172-
ret = mfd_npm13xx_reg_write(dev, SHIP_BASE, SHIP_OFFSET_CONFIG, config->active_time);
173+
ret = mfd_npm13xx_reg_write(dev, NPM13XX_SHIP_BASE, SHIP_OFFSET_CONFIG,
174+
config->active_time);
173175
if (ret < 0) {
174176
return ret;
175177
}
176178

177-
ret = mfd_npm13xx_reg_write(dev, SHIP_BASE, SHIP_OFFSET_LPCONFIG, config->lp_reset);
179+
ret = mfd_npm13xx_reg_write(dev, NPM13XX_SHIP_BASE, SHIP_OFFSET_LPCONFIG, config->lp_reset);
178180
if (ret < 0) {
179181
return ret;
180182
}
181183

182-
return mfd_npm13xx_reg_write(dev, SHIP_BASE, SHIP_OFFSET_CFGSTROBE, 1U);
184+
return mfd_npm13xx_reg_write(dev, NPM13XX_SHIP_BASE, SHIP_OFFSET_CFGSTROBE, 1U);
183185
}
184186

185187
int mfd_npm13xx_reg_read_burst(const struct device *dev, uint8_t base, uint8_t offset, void *data,
@@ -237,7 +239,7 @@ int mfd_npm13xx_reg_update(const struct device *dev, uint8_t base, uint8_t offse
237239
int mfd_npm13xx_set_timer(const struct device *dev, uint32_t time_ms)
238240
{
239241
const struct mfd_npm13xx_config *config = dev->config;
240-
uint8_t buff[5] = {TIME_BASE, TIME_OFFSET_TIMER};
242+
uint8_t buff[5] = {NPM13XX_TIME_BASE, TIME_OFFSET_TIMER};
241243
uint32_t ticks = time_ms / TIMER_PRESCALER_MS;
242244

243245
if (ticks > TIMER_MAX) {
@@ -252,12 +254,12 @@ int mfd_npm13xx_set_timer(const struct device *dev, uint32_t time_ms)
252254
return ret;
253255
}
254256

255-
return mfd_npm13xx_reg_write(dev, TIME_BASE, TIME_OFFSET_LOAD, 1U);
257+
return mfd_npm13xx_reg_write(dev, NPM13XX_TIME_BASE, TIME_OFFSET_LOAD, 1U);
256258
}
257259

258260
int mfd_npm13xx_reset(const struct device *dev)
259261
{
260-
return mfd_npm13xx_reg_write(dev, MAIN_BASE, MAIN_OFFSET_RESET, 1U);
262+
return mfd_npm13xx_reg_write(dev, NPM13XX_MAIN_BASE, MAIN_OFFSET_RESET, 1U);
261263
}
262264

263265
int mfd_npm13xx_hibernate(const struct device *dev, uint32_t time_ms)
@@ -268,7 +270,7 @@ int mfd_npm13xx_hibernate(const struct device *dev, uint32_t time_ms)
268270
return ret;
269271
}
270272

271-
return mfd_npm13xx_reg_write(dev, SHIP_BASE, SHIP_OFFSET_HIBERNATE, 1U);
273+
return mfd_npm13xx_reg_write(dev, NPM13XX_SHIP_BASE, SHIP_OFFSET_HIBERNATE, 1U);
272274
}
273275

274276
int mfd_npm13xx_add_callback(const struct device *dev, struct gpio_callback *callback)
@@ -279,15 +281,15 @@ int mfd_npm13xx_add_callback(const struct device *dev, struct gpio_callback *cal
279281
for (int i = 0; i < NPM13XX_EVENT_MAX; i++) {
280282
if ((callback->pin_mask & BIT(i)) != 0U) {
281283
/* Clear pending interrupt */
282-
int ret = mfd_npm13xx_reg_write(data->dev, MAIN_BASE,
284+
int ret = mfd_npm13xx_reg_write(data->dev, NPM13XX_MAIN_BASE,
283285
event_reg[i].offset + MAIN_OFFSET_CLR,
284286
event_reg[i].mask);
285287

286288
if (ret < 0) {
287289
return ret;
288290
}
289291

290-
ret = mfd_npm13xx_reg_write(data->dev, MAIN_BASE,
292+
ret = mfd_npm13xx_reg_write(data->dev, NPM13XX_MAIN_BASE,
291293
event_reg[i].offset + MAIN_OFFSET_INTENSET,
292294
event_reg[i].mask);
293295
if (ret < 0) {

0 commit comments

Comments
 (0)