Commit b5dabc8d authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branches 'regulator/fix/da9210' and...

Merge remote-tracking branches 'regulator/fix/da9210' and 'regulator/fix/rk808' into regulator-linus
...@@ -152,6 +152,15 @@ static int da9210_i2c_probe(struct i2c_client *i2c, ...@@ -152,6 +152,15 @@ static int da9210_i2c_probe(struct i2c_client *i2c,
config.regmap = chip->regmap; config.regmap = chip->regmap;
config.of_node = dev->of_node; config.of_node = dev->of_node;
/* Mask all interrupt sources to deassert interrupt line */
error = regmap_write(chip->regmap, DA9210_REG_MASK_A, ~0);
if (!error)
error = regmap_write(chip->regmap, DA9210_REG_MASK_B, ~0);
if (error) {
dev_err(&i2c->dev, "Failed to write to mask reg: %d\n", error);
return error;
}
rdev = devm_regulator_register(&i2c->dev, &da9210_reg, &config); rdev = devm_regulator_register(&i2c->dev, &da9210_reg, &config);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&i2c->dev, "Failed to register DA9210 regulator\n"); dev_err(&i2c->dev, "Failed to register DA9210 regulator\n");
......
...@@ -235,6 +235,7 @@ static const struct regulator_desc rk808_reg[] = { ...@@ -235,6 +235,7 @@ static const struct regulator_desc rk808_reg[] = {
.vsel_mask = RK808_LDO_VSEL_MASK, .vsel_mask = RK808_LDO_VSEL_MASK,
.enable_reg = RK808_LDO_EN_REG, .enable_reg = RK808_LDO_EN_REG,
.enable_mask = BIT(0), .enable_mask = BIT(0),
.enable_time = 400,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, { }, {
.name = "LDO_REG2", .name = "LDO_REG2",
...@@ -249,6 +250,7 @@ static const struct regulator_desc rk808_reg[] = { ...@@ -249,6 +250,7 @@ static const struct regulator_desc rk808_reg[] = {
.vsel_mask = RK808_LDO_VSEL_MASK, .vsel_mask = RK808_LDO_VSEL_MASK,
.enable_reg = RK808_LDO_EN_REG, .enable_reg = RK808_LDO_EN_REG,
.enable_mask = BIT(1), .enable_mask = BIT(1),
.enable_time = 400,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, { }, {
.name = "LDO_REG3", .name = "LDO_REG3",
...@@ -263,6 +265,7 @@ static const struct regulator_desc rk808_reg[] = { ...@@ -263,6 +265,7 @@ static const struct regulator_desc rk808_reg[] = {
.vsel_mask = RK808_BUCK4_VSEL_MASK, .vsel_mask = RK808_BUCK4_VSEL_MASK,
.enable_reg = RK808_LDO_EN_REG, .enable_reg = RK808_LDO_EN_REG,
.enable_mask = BIT(2), .enable_mask = BIT(2),
.enable_time = 400,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, { }, {
.name = "LDO_REG4", .name = "LDO_REG4",
...@@ -277,6 +280,7 @@ static const struct regulator_desc rk808_reg[] = { ...@@ -277,6 +280,7 @@ static const struct regulator_desc rk808_reg[] = {
.vsel_mask = RK808_LDO_VSEL_MASK, .vsel_mask = RK808_LDO_VSEL_MASK,
.enable_reg = RK808_LDO_EN_REG, .enable_reg = RK808_LDO_EN_REG,
.enable_mask = BIT(3), .enable_mask = BIT(3),
.enable_time = 400,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, { }, {
.name = "LDO_REG5", .name = "LDO_REG5",
...@@ -291,6 +295,7 @@ static const struct regulator_desc rk808_reg[] = { ...@@ -291,6 +295,7 @@ static const struct regulator_desc rk808_reg[] = {
.vsel_mask = RK808_LDO_VSEL_MASK, .vsel_mask = RK808_LDO_VSEL_MASK,
.enable_reg = RK808_LDO_EN_REG, .enable_reg = RK808_LDO_EN_REG,
.enable_mask = BIT(4), .enable_mask = BIT(4),
.enable_time = 400,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, { }, {
.name = "LDO_REG6", .name = "LDO_REG6",
...@@ -305,6 +310,7 @@ static const struct regulator_desc rk808_reg[] = { ...@@ -305,6 +310,7 @@ static const struct regulator_desc rk808_reg[] = {
.vsel_mask = RK808_LDO_VSEL_MASK, .vsel_mask = RK808_LDO_VSEL_MASK,
.enable_reg = RK808_LDO_EN_REG, .enable_reg = RK808_LDO_EN_REG,
.enable_mask = BIT(5), .enable_mask = BIT(5),
.enable_time = 400,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, { }, {
.name = "LDO_REG7", .name = "LDO_REG7",
...@@ -319,6 +325,7 @@ static const struct regulator_desc rk808_reg[] = { ...@@ -319,6 +325,7 @@ static const struct regulator_desc rk808_reg[] = {
.vsel_mask = RK808_LDO_VSEL_MASK, .vsel_mask = RK808_LDO_VSEL_MASK,
.enable_reg = RK808_LDO_EN_REG, .enable_reg = RK808_LDO_EN_REG,
.enable_mask = BIT(6), .enable_mask = BIT(6),
.enable_time = 400,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, { }, {
.name = "LDO_REG8", .name = "LDO_REG8",
...@@ -333,6 +340,7 @@ static const struct regulator_desc rk808_reg[] = { ...@@ -333,6 +340,7 @@ static const struct regulator_desc rk808_reg[] = {
.vsel_mask = RK808_LDO_VSEL_MASK, .vsel_mask = RK808_LDO_VSEL_MASK,
.enable_reg = RK808_LDO_EN_REG, .enable_reg = RK808_LDO_EN_REG,
.enable_mask = BIT(7), .enable_mask = BIT(7),
.enable_time = 400,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, { }, {
.name = "SWITCH_REG1", .name = "SWITCH_REG1",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment