lkml.org 
[lkml]   [2018]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/4] power: supply: add AXP803/AXP813 AC and battery power supply support
Date
AXP803 PMIC is register compatible with AXP813.

Added support for AXP803/AXP813 AC power supply.
AXP8x3 is capable to limit input current and minimum input voltage.
Both of these register values are writeable.

Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
---
drivers/iio/adc/axp20x_adc.c | 1 +
drivers/mfd/axp20x.c | 22 ++-
drivers/pinctrl/pinctrl-axp209.c | 1 +
drivers/power/supply/axp20x_ac_power.c | 194 +++++++++++++++++++++++++
drivers/power/supply/axp20x_battery.c | 3 +
include/linux/mfd/axp20x.h | 1 +
6 files changed, 221 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c
index 5be789269353..f919a16a8533 100644
--- a/drivers/iio/adc/axp20x_adc.c
+++ b/drivers/iio/adc/axp20x_adc.c
@@ -641,6 +641,7 @@ static const struct axp_data axp813_data = {
static const struct of_device_id axp20x_adc_of_match[] = {
{ .compatible = "x-powers,axp209-adc", .data = (void *)&axp20x_data, },
{ .compatible = "x-powers,axp221-adc", .data = (void *)&axp22x_data, },
+ { .compatible = "x-powers,axp803-adc", .data = (void *)&axp813_data, },
{ .compatible = "x-powers,axp813-adc", .data = (void *)&axp813_data, },
{ /* sentinel */ }
};
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 0be511dd93d0..c540f17549d5 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -731,8 +731,23 @@ static const struct mfd_cell axp803_cells[] = {
.name = "axp221-pek",
.num_resources = ARRAY_SIZE(axp803_pek_resources),
.resources = axp803_pek_resources,
+ }, {
+ .name = "axp20x-regulator"
+ }, {
+ .name = "axp20x-gpio",
+ .of_compatible = "x-powers,axp803-gpio",
+ }, {
+ .name = "axp813-adc",
+ .of_compatible = "x-powers,axp803-adc",
+ }, {
+ .name = "axp20x-battery-power-supply",
+ .of_compatible = "x-powers,axp803-battery-power-supply",
+ }, {
+ .name = "axp20x-ac-power-supply",
+ .of_compatible = "x-powers,axp803-ac-power-supply",
+ .num_resources = ARRAY_SIZE(axp20x_ac_power_supply_resources),
+ .resources = axp20x_ac_power_supply_resources,
},
- { .name = "axp20x-regulator" },
};

static const struct mfd_cell axp806_self_working_cells[] = {
@@ -778,6 +793,11 @@ static const struct mfd_cell axp813_cells[] = {
}, {
.name = "axp20x-battery-power-supply",
.of_compatible = "x-powers,axp813-battery-power-supply",
+ }, {
+ .name = "axp20x-ac-power-supply",
+ .of_compatible = "x-powers,axp813-ac-power-supply",
+ .num_resources = ARRAY_SIZE(axp20x_ac_power_supply_resources),
+ .resources = axp20x_ac_power_supply_resources,
},
};

diff --git a/drivers/pinctrl/pinctrl-axp209.c b/drivers/pinctrl/pinctrl-axp209.c
index afd0b533c40a..21859579e0a2 100644
--- a/drivers/pinctrl/pinctrl-axp209.c
+++ b/drivers/pinctrl/pinctrl-axp209.c
@@ -387,6 +387,7 @@ static int axp20x_build_funcs_groups(struct platform_device *pdev)

static const struct of_device_id axp20x_pctl_match[] = {
{ .compatible = "x-powers,axp209-gpio", .data = &axp20x_data, },
+ { .compatible = "x-powers,axp803-gpio", .data = &axp813_data, },
{ .compatible = "x-powers,axp813-gpio", .data = &axp813_data, },
{ }
};
diff --git a/drivers/power/supply/axp20x_ac_power.c b/drivers/power/supply/axp20x_ac_power.c
index 0771f951b11f..3247efb81cd1 100644
--- a/drivers/power/supply/axp20x_ac_power.c
+++ b/drivers/power/supply/axp20x_ac_power.c
@@ -27,6 +27,23 @@
#define AXP20X_PWR_STATUS_ACIN_PRESENT BIT(7)
#define AXP20X_PWR_STATUS_ACIN_AVAIL BIT(6)

+#define AXP8X3_PWR_ACIN_VHOLD GENMASK(5, 3)
+#define AXP8X3_PWR_ACIN_VHOLD_4_0V (0 << 3)
+#define AXP8X3_PWR_ACIN_VHOLD_4_1V (1 << 3)
+#define AXP8X3_PWR_ACIN_VHOLD_4_2V (2 << 3)
+#define AXP8X3_PWR_ACIN_VHOLD_4_3V (3 << 3)
+#define AXP8X3_PWR_ACIN_VHOLD_4_4V (4 << 3)
+#define AXP8X3_PWR_ACIN_VHOLD_4_5V (5 << 3)
+#define AXP8X3_PWR_ACIN_VHOLD_4_6V (6 << 3)
+#define AXP8X3_PWR_ACIN_VHOLD_4_7V (7 << 3)
+#define AXP8X3_PWR_ACIN_CURR_LIMIT GENMASK(2, 0)
+#define AXP8X3_PWR_ACIN_CURR_1_5A 0
+#define AXP8X3_PWR_ACIN_CURR_2_0A 1
+#define AXP8X3_PWR_ACIN_CURR_2_5A 2
+#define AXP8X3_PWR_ACIN_CURR_3_0A 3
+#define AXP8X3_PWR_ACIN_CURR_3_5A 4
+#define AXP8X3_PWR_ACIN_CURR_4_0A 5
+
#define DRVNAME "axp20x-ac-power-supply"

struct axp20x_ac_power {
@@ -102,6 +119,72 @@ static int axp20x_ac_power_get_property(struct power_supply *psy,

return 0;

+ case POWER_SUPPLY_PROP_VOLTAGE_MIN:
+ ret = regmap_read(power->regmap, AXP803_ACIN_PATH_CTRL, &reg);
+ if (ret)
+ return ret;
+
+ switch (reg & AXP8X3_PWR_ACIN_VHOLD) {
+ case AXP8X3_PWR_ACIN_VHOLD_4_0V:
+ val->intval = 4000000;
+ break;
+ case AXP8X3_PWR_ACIN_VHOLD_4_1V:
+ val->intval = 4100000;
+ break;
+ case AXP8X3_PWR_ACIN_VHOLD_4_2V:
+ val->intval = 4200000;
+ break;
+ case AXP8X3_PWR_ACIN_VHOLD_4_3V:
+ val->intval = 4300000;
+ break;
+ case AXP8X3_PWR_ACIN_VHOLD_4_4V:
+ val->intval = 4400000;
+ break;
+ case AXP8X3_PWR_ACIN_VHOLD_4_5V:
+ val->intval = 4500000;
+ break;
+ case AXP8X3_PWR_ACIN_VHOLD_4_6V:
+ val->intval = 4600000;
+ break;
+ case AXP8X3_PWR_ACIN_VHOLD_4_7V:
+ val->intval = 4700000;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+
+ case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
+ ret = regmap_read(power->regmap, AXP803_ACIN_PATH_CTRL, &reg);
+ if (ret)
+ return ret;
+
+ switch (reg & AXP8X3_PWR_ACIN_CURR_LIMIT) {
+ case AXP8X3_PWR_ACIN_CURR_1_5A:
+ val->intval = 1500000;
+ break;
+ case AXP8X3_PWR_ACIN_CURR_2_0A:
+ val->intval = 2000000;
+ break;
+ case AXP8X3_PWR_ACIN_CURR_2_5A:
+ val->intval = 2500000;
+ break;
+ case AXP8X3_PWR_ACIN_CURR_3_0A:
+ val->intval = 3000000;
+ break;
+ case AXP8X3_PWR_ACIN_CURR_3_5A:
+ val->intval = 3500000;
+ break;
+ case AXP8X3_PWR_ACIN_CURR_4_0A:
+ val->intval = 4000000;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+
default:
return -EINVAL;
}
@@ -109,6 +192,88 @@ static int axp20x_ac_power_get_property(struct power_supply *psy,
return -EINVAL;
}

+static int axp20x_ac_power_set_property(struct power_supply *psy,
+ enum power_supply_property psp,
+ const union power_supply_propval *val)
+{
+ struct axp20x_ac_power *power = power_supply_get_drvdata(psy);
+ int setval;
+
+ switch (psp) {
+ case POWER_SUPPLY_PROP_VOLTAGE_MIN:
+ switch (val->intval) {
+ case 4000000:
+ setval = AXP8X3_PWR_ACIN_VHOLD_4_0V;
+ break;
+ case 4100000:
+ setval = AXP8X3_PWR_ACIN_VHOLD_4_1V;
+ break;
+ case 4200000:
+ setval = AXP8X3_PWR_ACIN_VHOLD_4_2V;
+ break;
+ case 4300000:
+ setval = AXP8X3_PWR_ACIN_VHOLD_4_3V;
+ break;
+ case 4400000:
+ setval = AXP8X3_PWR_ACIN_VHOLD_4_4V;
+ break;
+ case 4500000:
+ setval = AXP8X3_PWR_ACIN_VHOLD_4_5V;
+ break;
+ case 4600000:
+ setval = AXP8X3_PWR_ACIN_VHOLD_4_6V;
+ break;
+ case 4700000:
+ setval = AXP8X3_PWR_ACIN_VHOLD_4_7V;
+ break;
+
+ default:
+ return -EINVAL;
+ }
+ return regmap_update_bits(power->regmap, AXP803_ACIN_PATH_CTRL,
+ AXP8X3_PWR_ACIN_VHOLD, setval);
+
+ case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
+
+ switch (val->intval) {
+ case 1500000:
+ setval = AXP8X3_PWR_ACIN_CURR_1_5A;
+ break;
+ case 2000000:
+ setval = AXP8X3_PWR_ACIN_CURR_2_0A;
+ break;
+ case 2500000:
+ setval = AXP8X3_PWR_ACIN_CURR_2_5A;
+ break;
+ case 3000000:
+ setval = AXP8X3_PWR_ACIN_CURR_3_0A;
+ break;
+ case 3500000:
+ setval = AXP8X3_PWR_ACIN_CURR_3_5A;
+ break;
+ case 4000000:
+ setval = AXP8X3_PWR_ACIN_CURR_4_0A;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return regmap_update_bits(power->regmap, AXP803_ACIN_PATH_CTRL,
+ AXP8X3_PWR_ACIN_CURR_LIMIT, setval);
+
+ default:
+ return -EINVAL;
+ }
+
+ return -EINVAL;
+}
+
+static int axp20x_ac_power_prop_writeable(struct power_supply *psy,
+ enum power_supply_property psp)
+{
+ return psp == POWER_SUPPLY_PROP_VOLTAGE_MIN ||
+ psp == POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT;
+}
+
static enum power_supply_property axp20x_ac_power_properties[] = {
POWER_SUPPLY_PROP_HEALTH,
POWER_SUPPLY_PROP_PRESENT,
@@ -123,6 +288,14 @@ static enum power_supply_property axp22x_ac_power_properties[] = {
POWER_SUPPLY_PROP_ONLINE,
};

+static enum power_supply_property axp8x3_ac_power_properties[] = {
+ POWER_SUPPLY_PROP_HEALTH,
+ POWER_SUPPLY_PROP_PRESENT,
+ POWER_SUPPLY_PROP_ONLINE,
+ POWER_SUPPLY_PROP_VOLTAGE_MIN,
+ POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT,
+};
+
static const struct power_supply_desc axp20x_ac_power_desc = {
.name = "axp20x-ac",
.type = POWER_SUPPLY_TYPE_MAINS,
@@ -139,6 +312,16 @@ static const struct power_supply_desc axp22x_ac_power_desc = {
.get_property = axp20x_ac_power_get_property,
};

+static const struct power_supply_desc axp8x3_ac_power_desc = {
+ .name = "axp8x3-ac",
+ .type = POWER_SUPPLY_TYPE_MAINS,
+ .properties = axp8x3_ac_power_properties,
+ .num_properties = ARRAY_SIZE(axp8x3_ac_power_properties),
+ .property_is_writeable = axp20x_ac_power_prop_writeable,
+ .get_property = axp20x_ac_power_get_property,
+ .set_property = axp20x_ac_power_set_property,
+};
+
struct axp_data {
const struct power_supply_desc *power_desc;
bool acin_adc;
@@ -154,6 +337,11 @@ static const struct axp_data axp22x_data = {
.acin_adc = false,
};

+static const struct axp_data axp8x3_data = {
+ .power_desc = &axp8x3_ac_power_desc,
+ .acin_adc = false,
+};
+
static int axp20x_ac_power_probe(struct platform_device *pdev)
{
struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
@@ -234,6 +422,12 @@ static const struct of_device_id axp20x_ac_power_match[] = {
}, {
.compatible = "x-powers,axp221-ac-power-supply",
.data = &axp22x_data,
+ }, {
+ .compatible = "x-powers,axp803-ac-power-supply",
+ .data = &axp8x3_data,
+ }, {
+ .compatible = "x-powers,axp813-ac-power-supply",
+ .data = &axp8x3_data,
}, { /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, axp20x_ac_power_match);
diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c
index e84b6e4da14a..932027f4a993 100644
--- a/drivers/power/supply/axp20x_battery.c
+++ b/drivers/power/supply/axp20x_battery.c
@@ -537,6 +537,9 @@ static const struct of_device_id axp20x_battery_ps_id[] = {
}, {
.compatible = "x-powers,axp221-battery-power-supply",
.data = (void *)&axp221_data,
+ }, {
+ .compatible = "x-powers,axp803-battery-power-supply",
+ .data = (void *)&axp813_data,
}, {
.compatible = "x-powers,axp813-battery-power-supply",
.data = (void *)&axp813_data,
diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index 517e60eecbcb..23d58e243d01 100644
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -266,6 +266,7 @@ enum axp20x_variants {
#define AXP288_RT_BATT_V_H 0xa0
#define AXP288_RT_BATT_V_L 0xa1

+#define AXP803_ACIN_PATH_CTRL 0x3a
#define AXP813_ADC_RATE 0x85

/* Fuel Gauge */
--
2.17.1
\
 
 \ /
  Last update: 2018-10-04 21:41    [W:0.167 / U:3.276 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site