mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 01:08:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'regulator-fix-v7.2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Browse Source 
Pull regulator fixes from Mark Brown:
 "A couple of unremarkable driver specific fixes that came in during the
  merge window"

* tag 'regulator-fix-v7.2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: da9121: Use subvariant ids in the I2C table
  regulator: pca9450: Correct default t_off_deb for PCA9451A/PCA9452
This commit is contained in:
Linus Torvalds
2026-06-26 11:07:26 -07:00
parent fa956617b8 7ddbf1cde4
commit 76bf0658d6
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/regulator/da9121-regulator.c
View File

@@ -1195,15 +1195,15 @@ static void da9121_i2c_remove(struct i2c_client *i2c)
}
static const struct i2c_device_id da9121_i2c_id[] = {
{"da9121", DA9121_TYPE_DA9121_DA9130},
{"da9130", DA9121_TYPE_DA9121_DA9130},
{"da9217", DA9121_TYPE_DA9217},
{"da9122", DA9121_TYPE_DA9122_DA9131},
{"da9131", DA9121_TYPE_DA9122_DA9131},
{"da9220", DA9121_TYPE_DA9220_DA9132},
{"da9132", DA9121_TYPE_DA9220_DA9132},
{"da9141", DA9121_TYPE_DA9141},
{"da9142", DA9121_TYPE_DA9142},
{"da9121", DA9121_SUBTYPE_DA9121},
{"da9130", DA9121_SUBTYPE_DA9130},
{"da9217", DA9121_SUBTYPE_DA9217},
{"da9122", DA9121_SUBTYPE_DA9122},
{"da9131", DA9121_SUBTYPE_DA9131},
{"da9220", DA9121_SUBTYPE_DA9220},
{"da9132", DA9121_SUBTYPE_DA9132},
{"da9141", DA9121_SUBTYPE_DA9141},
{"da9142", DA9121_SUBTYPE_DA9142},
{},
};
MODULE_DEVICE_TABLE(i2c, da9121_i2c_id);

7
drivers/regulator/pca9450-regulator.c
View File

@@ -44,6 +44,7 @@ struct pca9450 {
unsigned int rcnt;
int irq;
bool sd_vsel_fixed_low;
int default_t_off_deb;
};
static const struct regmap_range pca9450_status_range = {
@@ -1209,7 +1210,7 @@ static int pca9450_of_init(struct pca9450 *pca9450)
ret = of_property_read_u32(i2c->dev.of_node, "nxp,pmic-on-req-off-debounce-us", &val);
if (ret == -EINVAL)
t_off_deb = T_OFF_DEB_120US;
t_off_deb = pca9450->default_t_off_deb;
else if (ret)
return ret;
else {
@@ -1304,21 +1305,25 @@ static int pca9450_i2c_probe(struct i2c_client *i2c)
case PCA9450_TYPE_PCA9450A:
regulator_desc = pca9450a_regulators;
pca9450->rcnt = ARRAY_SIZE(pca9450a_regulators);
pca9450->default_t_off_deb = T_OFF_DEB_120US;
type_name = "pca9450a";
break;
case PCA9450_TYPE_PCA9450BC:
regulator_desc = pca9450bc_regulators;
pca9450->rcnt = ARRAY_SIZE(pca9450bc_regulators);
pca9450->default_t_off_deb = T_OFF_DEB_120US;
type_name = "pca9450bc";
break;
case PCA9450_TYPE_PCA9451A:
regulator_desc = pca9451a_regulators;
pca9450->rcnt = ARRAY_SIZE(pca9451a_regulators);
pca9450->default_t_off_deb = T_OFF_DEB_2MS;
type_name = "pca9451a";
break;
case PCA9450_TYPE_PCA9452:
regulator_desc = pca9451a_regulators;
pca9450->rcnt = ARRAY_SIZE(pca9451a_regulators);
pca9450->default_t_off_deb = T_OFF_DEB_2MS;
type_name = "pca9452";
break;
default: