123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129 |
- From 60fd7eb89670d2636ac3156881acbd103c6eba6a Mon Sep 17 00:00:00 2001
- From: Martin Botka <[email protected]>
- Date: Wed, 24 May 2023 01:00:11 +0100
- Subject: [PATCH] regulator: axp20x: Add support for AXP313a variant
- The AXP313a is your typical I2C controlled PMIC, although in a lighter
- fashion compared to the other X-Powers PMICs: it has only three DCDC
- rails, three LDOs, and no battery charging support.
- The AXP313a datasheet does not describe a register to change the DCDC
- switching frequency, and talks of it being fixed at 3 MHz. Check that
- the property allowing to change that frequency is absent from the DT,
- and bail out otherwise.
- The third LDO, RTCLDO, is fixed, and cannot even be turned on or off,
- programmatically. On top of that, its voltage is customisable (either
- 1.8V or 3.3V), which we cannot describe easily using the existing
- regulator wrapper functions. This should be fixed properly, using
- regulator-{min,max}-microvolt in the DT, but this requires more changes
- to the code. As some other PMICs (AXP2xx, AXP803) seem to paper over the
- same problem as well, we follow suit here and pretend it's a fixed 1.8V
- regulator. A proper fix can follow later. The BSP code seems to ignore
- this regulator altogether.
- Describe the AXP313A's voltage settings and switch registers, how the
- voltages are encoded, and connect this to the MFD device via its
- regulator ID.
- Signed-off-by: Martin Botka <[email protected]>
- Signed-off-by: Andre Przywara <[email protected]>
- Reviewed-by: Chen-Yu Tsai <[email protected]>
- Reviewed-by: Mark Brown <[email protected]>
- Tested-by: Shengyu Qu <[email protected]>
- Link: https://lore.kernel.org/r/[email protected]
- Signed-off-by: Mark Brown <[email protected]>
- ---
- drivers/regulator/axp20x-regulator.c | 60 ++++++++++++++++++++++++++++
- 1 file changed, 60 insertions(+)
- --- a/drivers/regulator/axp20x-regulator.c
- +++ b/drivers/regulator/axp20x-regulator.c
- @@ -134,6 +134,11 @@
- #define AXP22X_PWR_OUT_DLDO4_MASK BIT_MASK(6)
- #define AXP22X_PWR_OUT_ALDO3_MASK BIT_MASK(7)
-
- +#define AXP313A_DCDC1_NUM_VOLTAGES 107
- +#define AXP313A_DCDC23_NUM_VOLTAGES 88
- +#define AXP313A_DCDC_V_OUT_MASK GENMASK(6, 0)
- +#define AXP313A_LDO_V_OUT_MASK GENMASK(4, 0)
- +
- #define AXP803_PWR_OUT_DCDC1_MASK BIT_MASK(0)
- #define AXP803_PWR_OUT_DCDC2_MASK BIT_MASK(1)
- #define AXP803_PWR_OUT_DCDC3_MASK BIT_MASK(2)
- @@ -638,6 +643,48 @@ static const struct regulator_desc axp22
- .ops = &axp20x_ops_sw,
- };
-
- +static const struct linear_range axp313a_dcdc1_ranges[] = {
- + REGULATOR_LINEAR_RANGE(500000, 0, 70, 10000),
- + REGULATOR_LINEAR_RANGE(1220000, 71, 87, 20000),
- + REGULATOR_LINEAR_RANGE(1600000, 88, 106, 100000),
- +};
- +
- +static const struct linear_range axp313a_dcdc2_ranges[] = {
- + REGULATOR_LINEAR_RANGE(500000, 0, 70, 10000),
- + REGULATOR_LINEAR_RANGE(1220000, 71, 87, 20000),
- +};
- +
- +/*
- + * This is deviating from the datasheet. The values here are taken from the
- + * BSP driver and have been confirmed by measurements.
- + */
- +static const struct linear_range axp313a_dcdc3_ranges[] = {
- + REGULATOR_LINEAR_RANGE(500000, 0, 70, 10000),
- + REGULATOR_LINEAR_RANGE(1220000, 71, 102, 20000),
- +};
- +
- +static const struct regulator_desc axp313a_regulators[] = {
- + AXP_DESC_RANGES(AXP313A, DCDC1, "dcdc1", "vin1",
- + axp313a_dcdc1_ranges, AXP313A_DCDC1_NUM_VOLTAGES,
- + AXP313A_DCDC1_CONRTOL, AXP313A_DCDC_V_OUT_MASK,
- + AXP313A_OUTPUT_CONTROL, BIT(0)),
- + AXP_DESC_RANGES(AXP313A, DCDC2, "dcdc2", "vin2",
- + axp313a_dcdc2_ranges, AXP313A_DCDC23_NUM_VOLTAGES,
- + AXP313A_DCDC2_CONRTOL, AXP313A_DCDC_V_OUT_MASK,
- + AXP313A_OUTPUT_CONTROL, BIT(1)),
- + AXP_DESC_RANGES(AXP313A, DCDC3, "dcdc3", "vin3",
- + axp313a_dcdc3_ranges, AXP313A_DCDC23_NUM_VOLTAGES,
- + AXP313A_DCDC3_CONRTOL, AXP313A_DCDC_V_OUT_MASK,
- + AXP313A_OUTPUT_CONTROL, BIT(2)),
- + AXP_DESC(AXP313A, ALDO1, "aldo1", "vin1", 500, 3500, 100,
- + AXP313A_ALDO1_CONRTOL, AXP313A_LDO_V_OUT_MASK,
- + AXP313A_OUTPUT_CONTROL, BIT(3)),
- + AXP_DESC(AXP313A, DLDO1, "dldo1", "vin1", 500, 3500, 100,
- + AXP313A_DLDO1_CONRTOL, AXP313A_LDO_V_OUT_MASK,
- + AXP313A_OUTPUT_CONTROL, BIT(4)),
- + AXP_DESC_FIXED(AXP313A, RTC_LDO, "rtc-ldo", "vin1", 1800),
- +};
- +
- /* DCDC ranges shared with AXP813 */
- static const struct linear_range axp803_dcdc234_ranges[] = {
- REGULATOR_LINEAR_RANGE(500000,
- @@ -1040,6 +1087,15 @@ static int axp20x_set_dcdc_freq(struct p
- def = 3000;
- step = 150;
- break;
- + case AXP313A_ID:
- + /* The DCDC PWM frequency seems to be fixed to 3 MHz. */
- + if (dcdcfreq != 0) {
- + dev_err(&pdev->dev,
- + "DCDC frequency on AXP313a is fixed to 3 MHz.\n");
- + return -EINVAL;
- + }
- +
- + return 0;
- default:
- dev_err(&pdev->dev,
- "Setting DCDC frequency for unsupported AXP variant\n");
- @@ -1232,6 +1288,10 @@ static int axp20x_regulator_probe(struct
- drivevbus = of_property_read_bool(pdev->dev.parent->of_node,
- "x-powers,drive-vbus-en");
- break;
- + case AXP313A_ID:
- + regulators = axp313a_regulators;
- + nregulators = AXP313A_REG_ID_MAX;
- + break;
- case AXP803_ID:
- regulators = axp803_regulators;
- nregulators = AXP803_REG_ID_MAX;
|