| Message ID | 1546523226-358-3-git-send-email-Christian.Hohnstaedt@wago.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On Thursday 03 January 2019 07:17 PM, Christian Hohnstaedt wrote: > These options apply to all regulators in this chip. > > ti,strict-supply-voltage-supervision: > Set STRICT flag in CONFIG1 > ti,under-voltage-limit-microvolt: > Select 2.75, 2.95, 3.25 or 3.35 V UVLO in CONFIG1 > ti,under-voltage-hyst-microvolt: > Select 200mV or 400mV UVLOHYS in CONFIG2 CHECK: Alignment should match open parenthesis #146: FILE: drivers/mfd/tps65218.c:219: + if (of_property_read_u32(tps->dev->of_node, + "ti,strict-supply-voltage-supervision", &strict)) CHECK: Alignment should match open parenthesis #156: FILE: drivers/mfd/tps65218.c:229: + tps65218_update_bits(tps, TPS65218_REG_CONFIG1, + TPS65218_CONFIG1_STRICT, CHECK: Alignment should match open parenthesis #166: FILE: drivers/mfd/tps65218.c:239: + if (of_property_read_u32(tps->dev->of_node, + "ti,under-voltage-hyst-microvolt", &hyst)) CHECK: Alignment should match open parenthesis #176: FILE: drivers/mfd/tps65218.c:249: + tps65218_update_bits(tps, TPS65218_REG_CONFIG2, + TPS65218_CONFIG2_UVLOHYS, CHECK: Alignment should match open parenthesis #188: FILE: drivers/mfd/tps65218.c:261: + if (of_property_read_u32(tps->dev->of_node, + "ti,under-voltage-limit-microvolt", &uvlo)) CHECK: Alignment should match open parenthesis #211: FILE: drivers/mfd/tps65218.c:284: + tps65218_update_bits(tps, TPS65218_REG_CONFIG1, + TPS65218_CONFIG1_UVLO_MASK, uvloval, Some checkpatch warnings to be fixed. Other than that i tested your patch on am437x-gp-evm for boot and suspend/resume. After fixing them you can add my: Tested-by: Keerthy <j-keerthy@ti.com> Reviewed-by: Keerthy <j-keerthy@ti.com> > > Signed-off-by: Christian Hohnstaedt <Christian.Hohnstaedt@wago.com> > --- > drivers/mfd/tps65218.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ > include/linux/mfd/tps65218.h | 4 ++ > 2 files changed, 91 insertions(+) > > diff --git a/drivers/mfd/tps65218.c b/drivers/mfd/tps65218.c > index 8bcdecf..b5e0f3a 100644 > --- a/drivers/mfd/tps65218.c > +++ b/drivers/mfd/tps65218.c > @@ -211,6 +211,81 @@ static const struct of_device_id of_tps65218_match_table[] = { > }; > MODULE_DEVICE_TABLE(of, of_tps65218_match_table); > > +static int tps65218_voltage_set_strict(struct tps65218 *tps) > +{ > + u32 strict; > + > + if (of_property_read_u32(tps->dev->of_node, > + "ti,strict-supply-voltage-supervision", &strict)) > + return 0; > + > + if (strict != 0 && strict != 1) { > + dev_err(tps->dev, > + "Invalid ti,strict-supply-voltage-supervision value\n"); > + return -EINVAL; > + } > + > + tps65218_update_bits(tps, TPS65218_REG_CONFIG1, > + TPS65218_CONFIG1_STRICT, > + strict ? TPS65218_CONFIG1_STRICT : 0, TPS65218_PROTECT_L1); > + return 0; > +} > + > +static int tps65218_voltage_set_uv_hyst(struct tps65218 *tps) > +{ > + u32 hyst; > + > + if (of_property_read_u32(tps->dev->of_node, > + "ti,under-voltage-hyst-microvolt", &hyst)) > + return 0; > + > + if (hyst != 400000 && hyst != 200000) { > + dev_err(tps->dev, > + "Invalid ti,under-voltage-hyst-microvolt value\n"); > + return -EINVAL; > + } > + > + tps65218_update_bits(tps, TPS65218_REG_CONFIG2, > + TPS65218_CONFIG2_UVLOHYS, > + hyst == 400000 ? TPS65218_CONFIG2_UVLOHYS : 0, > + TPS65218_PROTECT_L1); > + return 0; > +} > + > +static int tps65218_voltage_set_uvlo(struct tps65218 *tps) > +{ > + u32 uvlo; > + int uvloval; > + > + if (of_property_read_u32(tps->dev->of_node, > + "ti,under-voltage-limit-microvolt", &uvlo)) > + return 0; > + > + switch (uvlo) { > + case 2750000: > + uvloval = TPS65218_CONFIG1_UVLO_2750000; > + break; > + case 2950000: > + uvloval = TPS65218_CONFIG1_UVLO_2950000; > + break; > + case 3250000: > + uvloval = TPS65218_CONFIG1_UVLO_3250000; > + break; > + case 3350000: > + uvloval = TPS65218_CONFIG1_UVLO_3350000; > + break; > + default: > + dev_err(tps->dev, > + "Invalid ti,under-voltage-limit-microvolt value\n"); > + return -EINVAL; > + } > + > + tps65218_update_bits(tps, TPS65218_REG_CONFIG1, > + TPS65218_CONFIG1_UVLO_MASK, uvloval, > + TPS65218_PROTECT_L1); > + return 0; > +} > + > static int tps65218_probe(struct i2c_client *client, > const struct i2c_device_id *ids) > { > @@ -249,6 +324,18 @@ static int tps65218_probe(struct i2c_client *client, > > tps->rev = chipid & TPS65218_CHIPID_REV_MASK; > > + ret = tps65218_voltage_set_strict(tps); > + if (ret) > + return ret; > + > + ret = tps65218_voltage_set_uvlo(tps); > + if (ret) > + return ret; > + > + ret = tps65218_voltage_set_uv_hyst(tps); > + if (ret) > + return ret; > + > ret = mfd_add_devices(tps->dev, PLATFORM_DEVID_AUTO, tps65218_cells, > ARRAY_SIZE(tps65218_cells), NULL, 0, > regmap_irq_get_domain(tps->irq_data)); > diff --git a/include/linux/mfd/tps65218.h b/include/linux/mfd/tps65218.h > index c204d9a..3cbe103 100644 > --- a/include/linux/mfd/tps65218.h > +++ b/include/linux/mfd/tps65218.h > @@ -137,6 +137,10 @@ > #define TPS65218_CONFIG1_PGDLY_MASK 0x18 > #define TPS65218_CONFIG1_STRICT BIT(2) > #define TPS65218_CONFIG1_UVLO_MASK 0x3 > +#define TPS65218_CONFIG1_UVLO_2750000 0x0 > +#define TPS65218_CONFIG1_UVLO_2950000 0x1 > +#define TPS65218_CONFIG1_UVLO_3250000 0x2 > +#define TPS65218_CONFIG1_UVLO_3350000 0x3 > > #define TPS65218_CONFIG2_DC12_RST BIT(7) > #define TPS65218_CONFIG2_UVLOHYS BIT(6) >
diff --git a/drivers/mfd/tps65218.c b/drivers/mfd/tps65218.c index 8bcdecf..b5e0f3a 100644 --- a/drivers/mfd/tps65218.c +++ b/drivers/mfd/tps65218.c @@ -211,6 +211,81 @@ static const struct of_device_id of_tps65218_match_table[] = { }; MODULE_DEVICE_TABLE(of, of_tps65218_match_table); +static int tps65218_voltage_set_strict(struct tps65218 *tps) +{ + u32 strict; + + if (of_property_read_u32(tps->dev->of_node, + "ti,strict-supply-voltage-supervision", &strict)) + return 0; + + if (strict != 0 && strict != 1) { + dev_err(tps->dev, + "Invalid ti,strict-supply-voltage-supervision value\n"); + return -EINVAL; + } + + tps65218_update_bits(tps, TPS65218_REG_CONFIG1, + TPS65218_CONFIG1_STRICT, + strict ? TPS65218_CONFIG1_STRICT : 0, TPS65218_PROTECT_L1); + return 0; +} + +static int tps65218_voltage_set_uv_hyst(struct tps65218 *tps) +{ + u32 hyst; + + if (of_property_read_u32(tps->dev->of_node, + "ti,under-voltage-hyst-microvolt", &hyst)) + return 0; + + if (hyst != 400000 && hyst != 200000) { + dev_err(tps->dev, + "Invalid ti,under-voltage-hyst-microvolt value\n"); + return -EINVAL; + } + + tps65218_update_bits(tps, TPS65218_REG_CONFIG2, + TPS65218_CONFIG2_UVLOHYS, + hyst == 400000 ? TPS65218_CONFIG2_UVLOHYS : 0, + TPS65218_PROTECT_L1); + return 0; +} + +static int tps65218_voltage_set_uvlo(struct tps65218 *tps) +{ + u32 uvlo; + int uvloval; + + if (of_property_read_u32(tps->dev->of_node, + "ti,under-voltage-limit-microvolt", &uvlo)) + return 0; + + switch (uvlo) { + case 2750000: + uvloval = TPS65218_CONFIG1_UVLO_2750000; + break; + case 2950000: + uvloval = TPS65218_CONFIG1_UVLO_2950000; + break; + case 3250000: + uvloval = TPS65218_CONFIG1_UVLO_3250000; + break; + case 3350000: + uvloval = TPS65218_CONFIG1_UVLO_3350000; + break; + default: + dev_err(tps->dev, + "Invalid ti,under-voltage-limit-microvolt value\n"); + return -EINVAL; + } + + tps65218_update_bits(tps, TPS65218_REG_CONFIG1, + TPS65218_CONFIG1_UVLO_MASK, uvloval, + TPS65218_PROTECT_L1); + return 0; +} + static int tps65218_probe(struct i2c_client *client, const struct i2c_device_id *ids) { @@ -249,6 +324,18 @@ static int tps65218_probe(struct i2c_client *client, tps->rev = chipid & TPS65218_CHIPID_REV_MASK; + ret = tps65218_voltage_set_strict(tps); + if (ret) + return ret; + + ret = tps65218_voltage_set_uvlo(tps); + if (ret) + return ret; + + ret = tps65218_voltage_set_uv_hyst(tps); + if (ret) + return ret; + ret = mfd_add_devices(tps->dev, PLATFORM_DEVID_AUTO, tps65218_cells, ARRAY_SIZE(tps65218_cells), NULL, 0, regmap_irq_get_domain(tps->irq_data)); diff --git a/include/linux/mfd/tps65218.h b/include/linux/mfd/tps65218.h index c204d9a..3cbe103 100644 --- a/include/linux/mfd/tps65218.h +++ b/include/linux/mfd/tps65218.h @@ -137,6 +137,10 @@ #define TPS65218_CONFIG1_PGDLY_MASK 0x18 #define TPS65218_CONFIG1_STRICT BIT(2) #define TPS65218_CONFIG1_UVLO_MASK 0x3 +#define TPS65218_CONFIG1_UVLO_2750000 0x0 +#define TPS65218_CONFIG1_UVLO_2950000 0x1 +#define TPS65218_CONFIG1_UVLO_3250000 0x2 +#define TPS65218_CONFIG1_UVLO_3350000 0x3 #define TPS65218_CONFIG2_DC12_RST BIT(7) #define TPS65218_CONFIG2_UVLOHYS BIT(6)
These options apply to all regulators in this chip. ti,strict-supply-voltage-supervision: Set STRICT flag in CONFIG1 ti,under-voltage-limit-microvolt: Select 2.75, 2.95, 3.25 or 3.35 V UVLO in CONFIG1 ti,under-voltage-hyst-microvolt: Select 200mV or 400mV UVLOHYS in CONFIG2 Signed-off-by: Christian Hohnstaedt <Christian.Hohnstaedt@wago.com> --- drivers/mfd/tps65218.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/mfd/tps65218.h | 4 ++ 2 files changed, 91 insertions(+)