patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

drivers: regulator: npm6001: remove common device

Browse source 
Common device part is now handled by the nPM6001 MFD device driver.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2023-05-24 12:06:31 +02:00 committed by Anas Nashif
parent 5521db3576
commit 9494981181
3 changed files with 43 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/regulator/Kconfig.npm6001
View file

@ -6,23 +6,13 @@ config REGULATOR_NPM6001
default y default y
depends on DT_HAS_NORDIC_NPM6001_REGULATOR_ENABLED depends on DT_HAS_NORDIC_NPM6001_REGULATOR_ENABLED
select I2C select I2C
select MFD
help help
Enable the Nordic nPM6001 PMIC regulator driver Enable the Nordic nPM6001 PMIC regulator driver
if REGULATOR_NPM6001
config REGULATOR_NPM6001_COMMON_INIT_PRIORITY
int "nPM6001 regulator driver init priority (common part)"
default 75
help
Init priority for the Nordic nPM6001 regulator driver (common part).
It must be greater than I2C init priority.
config REGULATOR_NPM6001_INIT_PRIORITY config REGULATOR_NPM6001_INIT_PRIORITY
int "nPM6001 regulator driver init priority" int "nPM6001 regulator driver init priority"
default 76 default 76
depends on REGULATOR_NPM6001
help help
Init priority for the Nordic nPM6001 regulator driver. It must be Init priority for the Nordic nPM6001 regulator driver.
greater than REGULATOR_NPM6001_COMMON_INIT_PRIORITY.
endif

164
drivers/regulator/regulator_npm6001.c
View file

@ -40,7 +40,6 @@ enum npm6001_sources {
#define NPM6001_BUCK0VOUTULP 0x3AU #define NPM6001_BUCK0VOUTULP 0x3AU
#define NPM6001_BUCK1VOUTULP 0x3CU #define NPM6001_BUCK1VOUTULP 0x3CU
#define NPM6001_BUCK2VOUTULP 0x40U #define NPM6001_BUCK2VOUTULP 0x40U
#define NPM6001_BUCK3SELDAC 0x44U
#define NPM6001_BUCK3VOUT 0x45U #define NPM6001_BUCK3VOUT 0x45U
#define NPM6001_LDO0VOUT 0x46U #define NPM6001_LDO0VOUT 0x46U
#define NPM6001_BUCK0CONFPWMMODE 0x4AU #define NPM6001_BUCK0CONFPWMMODE 0x4AU
@ -64,33 +63,15 @@ enum npm6001_sources {
#define NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM_POS 3 #define NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM_POS 3
#define NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM BIT(NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM_POS) #define NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM BIT(NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM_POS)
#define NPM6001_BUCKMODEPADCONF_BUCKMODE0PADTYPE_CMOS BIT(0)
#define NPM6001_BUCKMODEPADCONF_BUCKMODE1PADTYPE_CMOS BIT(1)
#define NPM6001_BUCKMODEPADCONF_BUCKMODE2PADTYPE_CMOS BIT(2)
#define NPM6001_BUCKMODEPADCONF_BUCKMODE0PULLD_ENABLED BIT(4)
#define NPM6001_BUCKMODEPADCONF_BUCKMODE1PULLD_ENABLED BIT(5)
#define NPM6001_BUCKMODEPADCONF_BUCKMODE2PULLD_ENABLED BIT(6)
/* nPM6001 PADDRIVESTRENGTH fields */
#define NPM6001_PADDRIVESTRENGTH_READY_HIGH BIT(2)
#define NPM6001_PADDRIVESTRENGTH_NINT_HIGH BIT(3)
#define NPM6001_PADDRIVESTRENGTH_SDA_HIGH BIT(5)
/* nPM6001 OVERRIDEPWRUPBUCK fields */ /* nPM6001 OVERRIDEPWRUPBUCK fields */
#define NPM6001_OVERRIDEPWRUPBUCK_BUCK1DISABLE_MSK 0x22U #define NPM6001_OVERRIDEPWRUPBUCK_BUCK1DISABLE_MSK 0x22U
#define NPM6001_OVERRIDEPWRUPBUCK_BUCK2DISABLE_MSK 0x44U #define NPM6001_OVERRIDEPWRUPBUCK_BUCK2DISABLE_MSK 0x44U
#define NPM6001_OVERRIDEPWRUPBUCK_BUCK1DISABLE BIT(1) #define NPM6001_OVERRIDEPWRUPBUCK_BUCK1DISABLE BIT(1)
#define NPM6001_OVERRIDEPWRUPBUCK_BUCK2DISABLE BIT(2) #define NPM6001_OVERRIDEPWRUPBUCK_BUCK2DISABLE BIT(2)
struct regulator_npm6001_pconfig {
struct i2c_dt_spec i2c;
uint8_t buck_pad_val;
uint8_t pad_val;
};
struct regulator_npm6001_config { struct regulator_npm6001_config {
struct regulator_common_config common; struct regulator_common_config common;
const struct device *p; struct i2c_dt_spec i2c;
uint8_t source; uint8_t source;
}; };
@ -134,7 +115,6 @@ static int regulator_npm6001_buck012_set_voltage(const struct device *dev, int32
uint8_t vout_reg, uint8_t conf_reg) uint8_t vout_reg, uint8_t conf_reg)
{ {
const struct regulator_npm6001_config *config = dev->config; const struct regulator_npm6001_config *config = dev->config;
const struct regulator_npm6001_pconfig *pconfig = config->p->config;
uint8_t conf, buf[3]; uint8_t conf, buf[3];
uint16_t idx; uint16_t idx;
int ret; int ret;
@ -145,13 +125,13 @@ static int regulator_npm6001_buck012_set_voltage(const struct device *dev, int32
} }
/* force PWM mode when updating voltage */ /* force PWM mode when updating voltage */
ret = i2c_reg_read_byte_dt(&pconfig->i2c, conf_reg, &conf); ret = i2c_reg_read_byte_dt(&config->i2c, conf_reg, &conf);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
if ((conf & NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM) == 0U) { if ((conf & NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM) == 0U) {
ret = i2c_reg_write_byte_dt(&pconfig->i2c, conf_reg, ret = i2c_reg_write_byte_dt(&config->i2c, conf_reg,
conf | NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM); conf | NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
@ -163,19 +143,19 @@ static int regulator_npm6001_buck012_set_voltage(const struct device *dev, int32
buf[1] = (uint8_t)idx; buf[1] = (uint8_t)idx;
buf[2] = (uint8_t)idx; buf[2] = (uint8_t)idx;
ret = i2c_write_dt(&pconfig->i2c, buf, sizeof(buf)); ret = i2c_write_dt(&config->i2c, buf, sizeof(buf));
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
ret = i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_TASKS_UPDATE_VOUTPWM, 1U); ret = i2c_reg_write_byte_dt(&config->i2c, NPM6001_TASKS_UPDATE_VOUTPWM, 1U);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
/* restore HYS mode if enabled before */ /* restore HYS mode if enabled before */
if ((conf & NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM) == 0U) { if ((conf & NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM) == 0U) {
ret = i2c_reg_write_byte_dt(&pconfig->i2c, conf_reg, conf); ret = i2c_reg_write_byte_dt(&config->i2c, conf_reg, conf);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -188,7 +168,6 @@ static int regulator_npm6001_buck3_set_voltage(const struct device *dev, int32_t
int32_t max_uv) int32_t max_uv)
{ {
const struct regulator_npm6001_config *config = dev->config; const struct regulator_npm6001_config *config = dev->config;
const struct regulator_npm6001_pconfig *pconfig = config->p->config;
uint16_t idx; uint16_t idx;
uint8_t conf; uint8_t conf;
int ret; int ret;
@ -199,27 +178,27 @@ static int regulator_npm6001_buck3_set_voltage(const struct device *dev, int32_t
} }
/* force PWM mode when updating voltage */ /* force PWM mode when updating voltage */
ret = i2c_reg_read_byte_dt(&pconfig->i2c, NPM6001_BUCK3CONFPWMMODE, &conf); ret = i2c_reg_read_byte_dt(&config->i2c, NPM6001_BUCK3CONFPWMMODE, &conf);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
if ((conf & NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM) == 0U) { if ((conf & NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM) == 0U) {
ret = i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_BUCK3CONFPWMMODE, ret = i2c_reg_write_byte_dt(&config->i2c, NPM6001_BUCK3CONFPWMMODE,
conf | NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM); conf | NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
} }
ret = i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_BUCK3VOUT, (uint8_t)idx); ret = i2c_reg_write_byte_dt(&config->i2c, NPM6001_BUCK3VOUT, (uint8_t)idx);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
/* restore HYS mode if enabled before */ /* restore HYS mode if enabled before */
if ((conf & NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM) == 0U) { if ((conf & NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM) == 0U) {
ret = i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_BUCK3CONFPWMMODE, conf); ret = i2c_reg_write_byte_dt(&config->i2c, NPM6001_BUCK3CONFPWMMODE, conf);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -232,7 +211,6 @@ static int regulator_npm6001_ldo0_set_voltage(const struct device *dev, int32_t
int32_t max_uv) int32_t max_uv)
{ {
const struct regulator_npm6001_config *config = dev->config; const struct regulator_npm6001_config *config = dev->config;
const struct regulator_npm6001_pconfig *pconfig = config->p->config;
uint8_t val; uint8_t val;
size_t i; size_t i;
@ -247,7 +225,7 @@ static int regulator_npm6001_ldo0_set_voltage(const struct device *dev, int32_t
return -EINVAL; return -EINVAL;
} }
return i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_LDO0VOUT, val); return i2c_reg_write_byte_dt(&config->i2c, NPM6001_LDO0VOUT, val);
} }
static int regulator_npm6001_buck0123_get_voltage(const struct device *dev, static int regulator_npm6001_buck0123_get_voltage(const struct device *dev,
@ -255,11 +233,10 @@ static int regulator_npm6001_buck0123_get_voltage(const struct device *dev,
uint8_t vout_reg, int32_t *volt_uv) uint8_t vout_reg, int32_t *volt_uv)
{ {
const struct regulator_npm6001_config *config = dev->config; const struct regulator_npm6001_config *config = dev->config;
const struct regulator_npm6001_pconfig *pconfig = config->p->config;
uint8_t idx; uint8_t idx;
int ret; int ret;
ret = i2c_reg_read_byte_dt(&pconfig->i2c, vout_reg, &idx); ret = i2c_reg_read_byte_dt(&config->i2c, vout_reg, &idx);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -270,11 +247,10 @@ static int regulator_npm6001_buck0123_get_voltage(const struct device *dev,
static int regulator_npm6001_ldo0_get_voltage(const struct device *dev, int32_t *volt_uv) static int regulator_npm6001_ldo0_get_voltage(const struct device *dev, int32_t *volt_uv)
{ {
const struct regulator_npm6001_config *config = dev->config; const struct regulator_npm6001_config *config = dev->config;
const struct regulator_npm6001_pconfig *pconfig = config->p->config;
uint8_t val; uint8_t val;
int ret; int ret;
ret = i2c_reg_read_byte_dt(&pconfig->i2c, NPM6001_LDO0VOUT, &val); ret = i2c_reg_read_byte_dt(&config->i2c, NPM6001_LDO0VOUT, &val);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -406,7 +382,6 @@ static int regulator_npm6001_get_voltage(const struct device *dev, int32_t *volt
static int regulator_npm6001_set_mode(const struct device *dev, regulator_mode_t mode) static int regulator_npm6001_set_mode(const struct device *dev, regulator_mode_t mode)
{ {
const struct regulator_npm6001_config *config = dev->config; const struct regulator_npm6001_config *config = dev->config;
const struct regulator_npm6001_pconfig *pconfig = config->p->config;
uint8_t conf_reg; uint8_t conf_reg;
if (mode > NPM6001_MODE_PWM) { if (mode > NPM6001_MODE_PWM) {
@ -430,7 +405,7 @@ static int regulator_npm6001_set_mode(const struct device *dev, regulator_mode_t
return -ENOTSUP; return -ENOTSUP;
} }
return i2c_reg_update_byte_dt(&pconfig->i2c, conf_reg, return i2c_reg_update_byte_dt(&config->i2c, conf_reg,
NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM_MSK, NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM_MSK,
mode << NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM_POS); mode << NPM6001_BUCKXCONFPWMMODE_SETFORCEPWM_POS);
} }
@ -438,7 +413,6 @@ static int regulator_npm6001_set_mode(const struct device *dev, regulator_mode_t
static int regulator_npm6001_get_mode(const struct device *dev, regulator_mode_t *mode) static int regulator_npm6001_get_mode(const struct device *dev, regulator_mode_t *mode)
{ {
const struct regulator_npm6001_config *config = dev->config; const struct regulator_npm6001_config *config = dev->config;
const struct regulator_npm6001_pconfig *pconfig = config->p->config;
uint8_t conf_reg, conf; uint8_t conf_reg, conf;
int ret; int ret;
@ -459,7 +433,7 @@ static int regulator_npm6001_get_mode(const struct device *dev, regulator_mode_t
return -ENOTSUP; return -ENOTSUP;
} }
ret = i2c_reg_read_byte_dt(&pconfig->i2c, conf_reg, &conf); ret = i2c_reg_read_byte_dt(&config->i2c, conf_reg, &conf);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -473,21 +447,20 @@ static int regulator_npm6001_get_mode(const struct device *dev, regulator_mode_t
static int regulator_npm6001_enable(const struct device *dev) static int regulator_npm6001_enable(const struct device *dev)
{ {
const struct regulator_npm6001_config *config = dev->config; const struct regulator_npm6001_config *config = dev->config;
const struct regulator_npm6001_pconfig *pconfig = config->p->config;
switch (config->source) { switch (config->source) {
case NPM6001_SOURCE_BUCK1: case NPM6001_SOURCE_BUCK1:
return i2c_reg_update_byte_dt(&pconfig->i2c, NPM6001_OVERRIDEPWRUPBUCK, return i2c_reg_update_byte_dt(&config->i2c, NPM6001_OVERRIDEPWRUPBUCK,
NPM6001_OVERRIDEPWRUPBUCK_BUCK1DISABLE_MSK, 0U); NPM6001_OVERRIDEPWRUPBUCK_BUCK1DISABLE_MSK, 0U);
case NPM6001_SOURCE_BUCK2: case NPM6001_SOURCE_BUCK2:
return i2c_reg_update_byte_dt(&pconfig->i2c, NPM6001_OVERRIDEPWRUPBUCK, return i2c_reg_update_byte_dt(&config->i2c, NPM6001_OVERRIDEPWRUPBUCK,
NPM6001_OVERRIDEPWRUPBUCK_BUCK2DISABLE_MSK, 0U); NPM6001_OVERRIDEPWRUPBUCK_BUCK2DISABLE_MSK, 0U);
case NPM6001_SOURCE_BUCK3: case NPM6001_SOURCE_BUCK3:
return i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_TASKS_START_BUCK3, 1U); return i2c_reg_write_byte_dt(&config->i2c, NPM6001_TASKS_START_BUCK3, 1U);
case NPM6001_SOURCE_LDO0: case NPM6001_SOURCE_LDO0:
return i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_TASKS_START_LDO0, 1U); return i2c_reg_write_byte_dt(&config->i2c, NPM6001_TASKS_START_LDO0, 1U);
case NPM6001_SOURCE_LDO1: case NPM6001_SOURCE_LDO1:
return i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_TASKS_START_LDO1, 1U); return i2c_reg_write_byte_dt(&config->i2c, NPM6001_TASKS_START_LDO1, 1U);
default: default:
return 0; return 0;
} }
@ -496,23 +469,22 @@ static int regulator_npm6001_enable(const struct device *dev)
static int regulator_npm6001_disable(const struct device *dev) static int regulator_npm6001_disable(const struct device *dev)
{ {
const struct regulator_npm6001_config *config = dev->config; const struct regulator_npm6001_config *config = dev->config;
const struct regulator_npm6001_pconfig *pconfig = config->p->config;
switch (config->source) { switch (config->source) {
case NPM6001_SOURCE_BUCK1: case NPM6001_SOURCE_BUCK1:
return i2c_reg_update_byte_dt(&pconfig->i2c, NPM6001_OVERRIDEPWRUPBUCK, return i2c_reg_update_byte_dt(&config->i2c, NPM6001_OVERRIDEPWRUPBUCK,
NPM6001_OVERRIDEPWRUPBUCK_BUCK1DISABLE_MSK, NPM6001_OVERRIDEPWRUPBUCK_BUCK1DISABLE_MSK,
NPM6001_OVERRIDEPWRUPBUCK_BUCK1DISABLE); NPM6001_OVERRIDEPWRUPBUCK_BUCK1DISABLE);
case NPM6001_SOURCE_BUCK2: case NPM6001_SOURCE_BUCK2:
return i2c_reg_update_byte_dt(&pconfig->i2c, NPM6001_OVERRIDEPWRUPBUCK, return i2c_reg_update_byte_dt(&config->i2c, NPM6001_OVERRIDEPWRUPBUCK,
NPM6001_OVERRIDEPWRUPBUCK_BUCK2DISABLE_MSK, NPM6001_OVERRIDEPWRUPBUCK_BUCK2DISABLE_MSK,
NPM6001_OVERRIDEPWRUPBUCK_BUCK2DISABLE); NPM6001_OVERRIDEPWRUPBUCK_BUCK2DISABLE);
case NPM6001_SOURCE_BUCK3: case NPM6001_SOURCE_BUCK3:
return i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_TASKS_STOP_BUCK3, 1U); return i2c_reg_write_byte_dt(&config->i2c, NPM6001_TASKS_STOP_BUCK3, 1U);
case NPM6001_SOURCE_LDO0: case NPM6001_SOURCE_LDO0:
return i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_TASKS_STOP_LDO0, 1U); return i2c_reg_write_byte_dt(&config->i2c, NPM6001_TASKS_STOP_LDO0, 1U);
case NPM6001_SOURCE_LDO1: case NPM6001_SOURCE_LDO1:
return i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_TASKS_STOP_LDO1, 1U); return i2c_reg_write_byte_dt(&config->i2c, NPM6001_TASKS_STOP_LDO1, 1U);
default: default:
return 0; return 0;
} }
@ -522,21 +494,20 @@ static int regulator_npm6001_get_error_flags(const struct device *dev,
regulator_error_flags_t *flags) regulator_error_flags_t *flags)
{ {
const struct regulator_npm6001_config *config = dev->config; const struct regulator_npm6001_config *config = dev->config;
const struct regulator_npm6001_pconfig *pconfig = config->p->config;
uint8_t oc_reg, val; uint8_t oc_reg, val;
int ret; int ret;
*flags = 0U; *flags = 0U;
/* read thermal warning */ /* read thermal warning */
ret = i2c_reg_read_byte_dt(&pconfig->i2c, NPM6001_EVENTS_THWARN, &val); ret = i2c_reg_read_byte_dt(&config->i2c, NPM6001_EVENTS_THWARN, &val);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
if (val != 0U) { if (val != 0U) {
/* clear thermal warning */ /* clear thermal warning */
ret = i2c_reg_write_byte_dt(&pconfig->i2c, NPM6001_EVENTS_THWARN, 0U); ret = i2c_reg_write_byte_dt(&config->i2c, NPM6001_EVENTS_THWARN, 0U);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -562,14 +533,14 @@ static int regulator_npm6001_get_error_flags(const struct device *dev,
return 0; return 0;
} }
ret = i2c_reg_read_byte_dt(&pconfig->i2c, oc_reg, &val); ret = i2c_reg_read_byte_dt(&config->i2c, oc_reg, &val);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
if (val != 0U) { if (val != 0U) {
/* clear overcurrent event */ /* clear overcurrent event */
ret = i2c_reg_write_byte_dt(&pconfig->i2c, oc_reg, 0U); ret = i2c_reg_write_byte_dt(&config->i2c, oc_reg, 0U);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -587,7 +558,7 @@ static int regulator_npm6001_init(const struct device *dev)
regulator_common_data_init(dev); regulator_common_data_init(dev);
if (!device_is_ready(config->p)) { if (!i2c_is_ready_dt(&config->i2c)) {
return -ENODEV; return -ENODEV;
} }
@ -598,35 +569,6 @@ static int regulator_npm6001_init(const struct device *dev)
return regulator_common_init(dev, is_enabled); return regulator_common_init(dev, is_enabled);
} }
static int regulator_npm6001_common_init(const struct device *dev)
{
const struct regulator_npm6001_pconfig *config = dev->config;
int ret;
if (!device_is_ready(config->i2c.bus)) {
return -ENODEV;
}
/* always select BUCK3 DAC (does not increase power consumption) */
ret = i2c_reg_write_byte_dt(&config->i2c, NPM6001_BUCK3SELDAC, 1U);
if (ret < 0) {
return ret;
}
/* configure pad properties */
ret = i2c_reg_write_byte_dt(&config->i2c, NPM6001_BUCKMODEPADCONF, config->buck_pad_val);
if (ret < 0) {
return ret;
}
ret = i2c_reg_write_byte_dt(&config->i2c, NPM6001_PADDRIVESTRENGTH, config->pad_val);
if (ret < 0) {
return ret;
}
return 0;
}
static const struct regulator_driver_api api = { static const struct regulator_driver_api api = {
.enable = regulator_npm6001_enable, .enable = regulator_npm6001_enable,
.disable = regulator_npm6001_disable, .disable = regulator_npm6001_disable,
@ -639,55 +581,29 @@ static const struct regulator_driver_api api = {
.get_error_flags = regulator_npm6001_get_error_flags, .get_error_flags = regulator_npm6001_get_error_flags,
}; };
#define REGULATOR_NPM6001_DEFINE(node_id, id, _source, parent) \ #define REGULATOR_NPM6001_DEFINE(node_id, id, _source) \
static struct regulator_npm6001_data data_##id; \ static struct regulator_npm6001_data data_##id; \
\ \
static const struct regulator_npm6001_config config_##id = { \ static const struct regulator_npm6001_config config_##id = { \
.common = REGULATOR_DT_COMMON_CONFIG_INIT(node_id), \ .common = REGULATOR_DT_COMMON_CONFIG_INIT(node_id), \
.p = parent, \ .i2c = I2C_DT_SPEC_GET(DT_GPARENT(node_id)), \
.source = _source, \ .source = _source, \
}; \ }; \
\ \
DEVICE_DT_DEFINE(node_id, regulator_npm6001_init, NULL, &data_##id, &config_##id, \ DEVICE_DT_DEFINE(node_id, regulator_npm6001_init, NULL, &data_##id, &config_##id, \
POST_KERNEL, CONFIG_REGULATOR_NPM6001_INIT_PRIORITY, &api); POST_KERNEL, CONFIG_REGULATOR_NPM6001_INIT_PRIORITY, &api);
#define REGULATOR_NPM6001_DEFINE_COND(inst, child, source, parent) \ #define REGULATOR_NPM6001_DEFINE_COND(inst, child, source) \
COND_CODE_1(DT_NODE_EXISTS(DT_INST_CHILD(inst, child)), \ COND_CODE_1(DT_NODE_EXISTS(DT_INST_CHILD(inst, child)), \
(REGULATOR_NPM6001_DEFINE(DT_INST_CHILD(inst, child), child##inst, source, \ (REGULATOR_NPM6001_DEFINE(DT_INST_CHILD(inst, child), child##inst, source)), \
parent)), \
()) ())
#define REGULATOR_NPM6001_DEFINE_ALL(inst) \ #define REGULATOR_NPM6001_DEFINE_ALL(inst) \
static const struct regulator_npm6001_pconfig config_##inst = { \ REGULATOR_NPM6001_DEFINE_COND(inst, buck0, NPM6001_SOURCE_BUCK0) \
.i2c = I2C_DT_SPEC_GET(DT_INST_PARENT(inst)), \ REGULATOR_NPM6001_DEFINE_COND(inst, buck1, NPM6001_SOURCE_BUCK1) \
.buck_pad_val = ((DT_INST_ENUM_IDX(inst, nordic_buck_mode0_input_type) * \ REGULATOR_NPM6001_DEFINE_COND(inst, buck2, NPM6001_SOURCE_BUCK2) \
NPM6001_BUCKMODEPADCONF_BUCKMODE0PADTYPE_CMOS) | \ REGULATOR_NPM6001_DEFINE_COND(inst, buck3, NPM6001_SOURCE_BUCK3) \
(DT_INST_ENUM_IDX(inst, nordic_buck_mode1_input_type) * \ REGULATOR_NPM6001_DEFINE_COND(inst, ldo0, NPM6001_SOURCE_LDO0) \
NPM6001_BUCKMODEPADCONF_BUCKMODE1PADTYPE_CMOS) | \ REGULATOR_NPM6001_DEFINE_COND(inst, ldo1, NPM6001_SOURCE_LDO1)
(DT_INST_ENUM_IDX(inst, nordic_buck_mode2_input_type) * \
NPM6001_BUCKMODEPADCONF_BUCKMODE2PADTYPE_CMOS) | \
(DT_INST_PROP(inst, nordic_buck_mode0_pull_down) * \
NPM6001_BUCKMODEPADCONF_BUCKMODE0PULLD_ENABLED) | \
(DT_INST_PROP(inst, nordic_buck_mode1_pull_down) * \
NPM6001_BUCKMODEPADCONF_BUCKMODE1PULLD_ENABLED) | \
(DT_INST_PROP(inst, nordic_buck_mode2_pull_down) * \
NPM6001_BUCKMODEPADCONF_BUCKMODE2PULLD_ENABLED)), \
.pad_val = ((DT_INST_PROP(inst, nordic_ready_high_drive) * \
NPM6001_PADDRIVESTRENGTH_READY_HIGH) | \
(DT_INST_PROP(inst, nordic_nint_high_drive) * \
NPM6001_PADDRIVESTRENGTH_NINT_HIGH) | \
(DT_INST_PROP(inst, nordic_sda_high_drive) * \
NPM6001_PADDRIVESTRENGTH_SDA_HIGH)), \
}; \
\
DEVICE_DT_INST_DEFINE(inst, regulator_npm6001_common_init, NULL, NULL, &config_##inst, \
POST_KERNEL, CONFIG_REGULATOR_NPM6001_COMMON_INIT_PRIORITY, NULL); \
\
REGULATOR_NPM6001_DEFINE_COND(inst, buck0, NPM6001_SOURCE_BUCK0, DEVICE_DT_INST_GET(inst)) \
REGULATOR_NPM6001_DEFINE_COND(inst, buck1, NPM6001_SOURCE_BUCK1, DEVICE_DT_INST_GET(inst)) \
REGULATOR_NPM6001_DEFINE_COND(inst, buck2, NPM6001_SOURCE_BUCK2, DEVICE_DT_INST_GET(inst)) \
REGULATOR_NPM6001_DEFINE_COND(inst, buck3, NPM6001_SOURCE_BUCK3, DEVICE_DT_INST_GET(inst)) \
REGULATOR_NPM6001_DEFINE_COND(inst, ldo0, NPM6001_SOURCE_LDO0, DEVICE_DT_INST_GET(inst)) \
REGULATOR_NPM6001_DEFINE_COND(inst, ldo1, NPM6001_SOURCE_LDO1, DEVICE_DT_INST_GET(inst))
DT_INST_FOREACH_STATUS_OKAY(REGULATOR_NPM6001_DEFINE_ALL) DT_INST_FOREACH_STATUS_OKAY(REGULATOR_NPM6001_DEFINE_ALL)

43
dts/bindings/regulator/nordic,npm6001-regulator.yaml
View file

@ -39,49 +39,6 @@ compatible: "nordic,npm6001-regulator"
include: base.yaml include: base.yaml
properties:
nordic,ready-high-drive:
type: boolean
description: Set drive strength to high for READY pin.
nordic,nint-high-drive:
type: boolean
description: Set drive strength to high for NINT pin.
nordic,sda-high-drive:
type: boolean
description: Set drive strength to high for SDA pin.
nordic,buck-mode0-input-type:
type: string
default: "schmitt"
enum: ["schmitt", "cmos"]
description: Input type for BUCK_MODE0 pin. Defaults IC boot-time value.
nordic,buck-mode0-pull-down:
type: boolean
description: Enable pull-down resistor for BUCK_MODE0 pin.
nordic,buck-mode1-input-type:
type: string
default: "schmitt"
enum: ["schmitt", "cmos"]
description: Input type for BUCK_MODE1 pin. Defaults IC boot-time value.
nordic,buck-mode1-pull-down:
type: boolean
description: Enable pull-down resistor for BUCK_MODE1 pin.
nordic,buck-mode2-input-type:
type: string
default: "schmitt"
enum: ["schmitt", "cmos"]
description: Input type for BUCK_MODE2 pin. Defaults IC boot-time value.
nordic,buck-mode2-pull-down:
type: boolean
description: Enable pull-down resistor for BUCK_MODE2 pin.
child-binding: child-binding:
include: include:
- name: regulator.yaml - name: regulator.yaml