Patchwork [U-Boot,05/22] power: Add AXP209 Power Management controller (I2C)

login
register
mail settings
Submitter Henrik Nordström
Date Nov. 25, 2012, 11:39 a.m.
Message ID <1353843579.17518.16.camel@home.hno.se>
Download mbox | patch
Permalink /patch/201521/
State Changes Requested
Delegated to: Heiko Schocher
Headers show

Comments

Henrik Nordström - Nov. 25, 2012, 11:39 a.m.
This adds support for AXP209 Power Management controller,
used by most sunxi (Allwinner A10/A13) based boards.

From: Henrik Nordstrom <henrik@henriknordstrom.net>
Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
Signed-off-by: Stefan Roese <sr@denx.de>
---
 drivers/power/Makefile |    1 +
 drivers/power/axp209.c |  183 ++++++++++++++++++++++++++++++++++++++++++++++++
 include/axp209.h       |   29 ++++++++
 3 files changed, 213 insertions(+), 0 deletions(-)
 create mode 100644 drivers/power/axp209.c
 create mode 100644 include/axp209.h
Luka Perkov - Nov. 25, 2012, 2:44 p.m.
Hi Henrik,

On Sun, Nov 25, 2012 at 12:39:39PM +0100, Henrik Nordström wrote:
> This adds support for AXP209 Power Management controller,
> used by most sunxi (Allwinner A10/A13) based boards.
> 
> From: Henrik Nordstrom <henrik@henriknordstrom.net>
> Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>  drivers/power/Makefile |    1 +
>  drivers/power/axp209.c |  183 ++++++++++++++++++++++++++++++++++++++++++++++++
>  include/axp209.h       |   29 ++++++++
>  3 files changed, 213 insertions(+), 0 deletions(-)
>  create mode 100644 drivers/power/axp209.c
>  create mode 100644 include/axp209.h
> 
> diff --git a/drivers/power/Makefile b/drivers/power/Makefile
> index 8c71901..ad768ff 100644
> --- a/drivers/power/Makefile
> +++ b/drivers/power/Makefile
> @@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk
>  
>  LIB	:= $(obj)libpower.o
>  
> +COBJS-$(CONFIG_AXP209_POWER)	+= axp209.o
>  COBJS-$(CONFIG_FTPMU010_POWER)	+= ftpmu010.o
>  COBJS-$(CONFIG_TPS6586X_POWER)	+= tps6586x.o
>  COBJS-$(CONFIG_TWL4030_POWER)	+= twl4030.o
> diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
> new file mode 100644
> index 0000000..be98d80
> --- /dev/null
> +++ b/drivers/power/axp209.c
> @@ -0,0 +1,183 @@
> +/*
> + * (C) Copyright 2012
> + * Henrik Nordstrom <henrik@henriknordstrom.net>
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#include <common.h>
> +#include <i2c.h>
> +#include <axp209.h>
> +
> +enum axp209_reg {
> +	AXP209_CHIP_VERSION = 0x3,
> +	AXP209_DCDC2_VOLTAGE = 0x23,
> +	AXP209_DCDC3_VOLTAGE = 0x27,
> +	AXP209_LDO24_VOLTAGE = 0x28,
> +	AXP209_LDO3_VOLTAGE = 0x29,
> +	AXP209_SHUTDOWN = 0x32,
> +};
> +
> +int axp209_write(enum axp209_reg reg, u8 val)
> +{
> +	return i2c_write(0x34, reg, 1, &val, 1);
> +}
> +
> +int axp209_read(enum axp209_reg reg, u8 *val)
> +{
> +	return i2c_read(0x34, reg, 1, val, 1);
> +}
> +
> +int axp209_set_dcdc2(int mvolt)
> +{
> +	int cfg = (mvolt - 700) / 25;
> +	int rc;
> +	u8 current;
> +
> +	if (cfg < 0)
> +		cfg = 0;
> +	if (cfg > (1 << 6) - 1)
> +		cfg = (1 << 6) - 1;
> +
> +	/* Do we really need to be this gentle? It has built-in voltage slope */
> +	while ((rc = axp209_read(AXP209_DCDC2_VOLTAGE, &current)) == 0
> +	       && current != cfg) {
> +		if (current < cfg)
> +			current++;
> +		else
> +			current--;
> +
> +		rc = axp209_write(AXP209_DCDC2_VOLTAGE, current);
> +		if (rc)
> +			break;
> +	}
> +
> +	return rc;
> +}
> +
> +int axp209_set_dcdc3(int mvolt)
> +{
> +	int cfg = (mvolt - 700) / 25;
> +	u8 reg;
> +	int rc;
> +
> +	if (cfg < 0)
> +		cfg = 0;
> +	if (cfg > (1 << 7) - 1)
> +		cfg = (1 << 7) - 1;
> +
> +	rc = axp209_write(AXP209_DCDC3_VOLTAGE, cfg);
> +	rc |= axp209_read(AXP209_DCDC3_VOLTAGE, &reg);
> +
> +	return rc;
> +}
> +
> +int axp209_set_ldo2(int mvolt)
> +{
> +	int cfg = (mvolt - 1800) / 100;
> +	int rc;
> +	u8 reg;
> +
> +	if (cfg < 0)
> +		cfg = 0;
> +	if (cfg > 15)
> +		cfg = 15;
> +
> +	rc = axp209_read(AXP209_LDO24_VOLTAGE, &reg);
> +	if (rc)
> +		return rc;
> +
> +	reg = (reg & 0x0f) | (cfg << 4);
> +	rc = axp209_write(AXP209_LDO24_VOLTAGE, reg);
> +	if (rc)
> +		return rc;
> +
> +	return 0;
> +}
> +
> +int axp209_set_ldo3(int mvolt)
> +{
> +	int cfg = (mvolt - 700) / 25;
> +
> +	if (cfg < 0)
> +		cfg = 0;
> +	if (cfg > 127)
> +		cfg = 127;
> +	if (mvolt == -1)
> +		cfg = 0x80;	/* detemined by LDO3IN pin */
> +
> +	return axp209_write(AXP209_LDO3_VOLTAGE, cfg);
> +}
> +
> +int axp209_set_ldo4(int mvolt)
> +{
> +	int cfg = (mvolt - 1800) / 100;
> +	int rc;
> +	static const int vindex[] = {
> +		1250, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000, 2500,
> +		2700, 2800, 3000, 3100, 3200, 3300
> +	};
> +	u8 reg;
> +
> +	/* Translate mvolt to register cfg value, requested <= selected */
> +	for (cfg = 0; mvolt < vindex[cfg] && cfg < 15; cfg++)
> +		;
> +
> +	rc = axp209_read(AXP209_LDO24_VOLTAGE, &reg);
> +	if (rc)
> +		return rc;
> +
> +	/* LDO4 configuration is in lower 4 bits */
> +	reg = (reg & 0xf0) | (cfg << 0);
> +	rc = axp209_write(AXP209_LDO24_VOLTAGE, reg);
> +	if (rc)
> +		return rc;
> +
> +	return 0;
> +}
> +
> +void axp209_poweroff(void)
> +{
> +	u8 val;
> +
> +	if (axp209_read(AXP209_SHUTDOWN, &val) != 0)
> +		return;
> +
> +	val |= 1 << 7;
> +
> +	if (axp209_write(AXP209_SHUTDOWN, val) != 0)
> +		return;
> +
> +	udelay(10000);		/* wait for power to drain */
> +}
> +
> +int axp209_init(void)
> +{
> +	u8 ver;
> +	int rc;
> +
> +	rc = axp209_read(AXP209_CHIP_VERSION, &ver);
> +	if (rc)
> +		return rc;
> +
> +	if (ver != 0x21)
> +		return -1;
> +
> +	return 0;
> +}
> diff --git a/include/axp209.h b/include/axp209.h
> new file mode 100644
> index 0000000..61338ac
> --- /dev/null
> +++ b/include/axp209.h
> @@ -0,0 +1,29 @@
> +/*
> + * (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +

Please add:

#ifndef
#define 

> +extern int axp209_set_dcdc2(int mvolt);
> +extern int axp209_set_dcdc3(int mvolt);
> +extern int axp209_set_ldo2(int mvolt);
> +extern int axp209_set_ldo3(int mvolt);
> +extern int axp209_set_ldo4(int mvolt);
> +extern void axp209_poweroff(void);
> +extern int axp209_init(void);

And end with:

#endif

> -- 
> 1.7.7.6

Luka
Marek Vasut - Nov. 25, 2012, 6:13 p.m.
Dear Henrik Nordström,

> This adds support for AXP209 Power Management controller,
> used by most sunxi (Allwinner A10/A13) based boards.
> 
> From: Henrik Nordstrom <henrik@henriknordstrom.net>
> Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>  drivers/power/Makefile |    1 +
>  drivers/power/axp209.c |  183
> ++++++++++++++++++++++++++++++++++++++++++++++++ include/axp209.h       | 
>  29 ++++++++
>  3 files changed, 213 insertions(+), 0 deletions(-)
>  create mode 100644 drivers/power/axp209.c
>  create mode 100644 include/axp209.h

Did you not reference this header in 01/22 ?

[...]

Is it possible to at least #define the magic constants ?

Best regards,
Marek Vasut
Wolfgang Denk - Nov. 25, 2012, 7:48 p.m.
Dear Henrik Nordström,

In message <1353843579.17518.16.camel@home.hno.se> you wrote:
> This adds support for AXP209 Power Management controller,
> used by most sunxi (Allwinner A10/A13) based boards.
> 
> From: Henrik Nordstrom <henrik@henriknordstrom.net>
> Signed-off-by: Henrik Nordstrom <henrik@henriknordstrom.net>
> Signed-off-by: Stefan Roese <sr@denx.de>
...
> +extern int axp209_set_dcdc2(int mvolt);
> +extern int axp209_set_dcdc3(int mvolt);
> +extern int axp209_set_ldo2(int mvolt);
> +extern int axp209_set_ldo3(int mvolt);
> +extern int axp209_set_ldo4(int mvolt);
> +extern void axp209_poweroff(void);
> +extern int axp209_init(void);

Drop extern?

Best regards,

Wolfgang Denk

Patch

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 8c71901..ad768ff 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -25,6 +25,7 @@  include $(TOPDIR)/config.mk
 
 LIB	:= $(obj)libpower.o
 
+COBJS-$(CONFIG_AXP209_POWER)	+= axp209.o
 COBJS-$(CONFIG_FTPMU010_POWER)	+= ftpmu010.o
 COBJS-$(CONFIG_TPS6586X_POWER)	+= tps6586x.o
 COBJS-$(CONFIG_TWL4030_POWER)	+= twl4030.o
diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
new file mode 100644
index 0000000..be98d80
--- /dev/null
+++ b/drivers/power/axp209.c
@@ -0,0 +1,183 @@ 
+/*
+ * (C) Copyright 2012
+ * Henrik Nordstrom <henrik@henriknordstrom.net>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <i2c.h>
+#include <axp209.h>
+
+enum axp209_reg {
+	AXP209_CHIP_VERSION = 0x3,
+	AXP209_DCDC2_VOLTAGE = 0x23,
+	AXP209_DCDC3_VOLTAGE = 0x27,
+	AXP209_LDO24_VOLTAGE = 0x28,
+	AXP209_LDO3_VOLTAGE = 0x29,
+	AXP209_SHUTDOWN = 0x32,
+};
+
+int axp209_write(enum axp209_reg reg, u8 val)
+{
+	return i2c_write(0x34, reg, 1, &val, 1);
+}
+
+int axp209_read(enum axp209_reg reg, u8 *val)
+{
+	return i2c_read(0x34, reg, 1, val, 1);
+}
+
+int axp209_set_dcdc2(int mvolt)
+{
+	int cfg = (mvolt - 700) / 25;
+	int rc;
+	u8 current;
+
+	if (cfg < 0)
+		cfg = 0;
+	if (cfg > (1 << 6) - 1)
+		cfg = (1 << 6) - 1;
+
+	/* Do we really need to be this gentle? It has built-in voltage slope */
+	while ((rc = axp209_read(AXP209_DCDC2_VOLTAGE, &current)) == 0
+	       && current != cfg) {
+		if (current < cfg)
+			current++;
+		else
+			current--;
+
+		rc = axp209_write(AXP209_DCDC2_VOLTAGE, current);
+		if (rc)
+			break;
+	}
+
+	return rc;
+}
+
+int axp209_set_dcdc3(int mvolt)
+{
+	int cfg = (mvolt - 700) / 25;
+	u8 reg;
+	int rc;
+
+	if (cfg < 0)
+		cfg = 0;
+	if (cfg > (1 << 7) - 1)
+		cfg = (1 << 7) - 1;
+
+	rc = axp209_write(AXP209_DCDC3_VOLTAGE, cfg);
+	rc |= axp209_read(AXP209_DCDC3_VOLTAGE, &reg);
+
+	return rc;
+}
+
+int axp209_set_ldo2(int mvolt)
+{
+	int cfg = (mvolt - 1800) / 100;
+	int rc;
+	u8 reg;
+
+	if (cfg < 0)
+		cfg = 0;
+	if (cfg > 15)
+		cfg = 15;
+
+	rc = axp209_read(AXP209_LDO24_VOLTAGE, &reg);
+	if (rc)
+		return rc;
+
+	reg = (reg & 0x0f) | (cfg << 4);
+	rc = axp209_write(AXP209_LDO24_VOLTAGE, reg);
+	if (rc)
+		return rc;
+
+	return 0;
+}
+
+int axp209_set_ldo3(int mvolt)
+{
+	int cfg = (mvolt - 700) / 25;
+
+	if (cfg < 0)
+		cfg = 0;
+	if (cfg > 127)
+		cfg = 127;
+	if (mvolt == -1)
+		cfg = 0x80;	/* detemined by LDO3IN pin */
+
+	return axp209_write(AXP209_LDO3_VOLTAGE, cfg);
+}
+
+int axp209_set_ldo4(int mvolt)
+{
+	int cfg = (mvolt - 1800) / 100;
+	int rc;
+	static const int vindex[] = {
+		1250, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000, 2500,
+		2700, 2800, 3000, 3100, 3200, 3300
+	};
+	u8 reg;
+
+	/* Translate mvolt to register cfg value, requested <= selected */
+	for (cfg = 0; mvolt < vindex[cfg] && cfg < 15; cfg++)
+		;
+
+	rc = axp209_read(AXP209_LDO24_VOLTAGE, &reg);
+	if (rc)
+		return rc;
+
+	/* LDO4 configuration is in lower 4 bits */
+	reg = (reg & 0xf0) | (cfg << 0);
+	rc = axp209_write(AXP209_LDO24_VOLTAGE, reg);
+	if (rc)
+		return rc;
+
+	return 0;
+}
+
+void axp209_poweroff(void)
+{
+	u8 val;
+
+	if (axp209_read(AXP209_SHUTDOWN, &val) != 0)
+		return;
+
+	val |= 1 << 7;
+
+	if (axp209_write(AXP209_SHUTDOWN, val) != 0)
+		return;
+
+	udelay(10000);		/* wait for power to drain */
+}
+
+int axp209_init(void)
+{
+	u8 ver;
+	int rc;
+
+	rc = axp209_read(AXP209_CHIP_VERSION, &ver);
+	if (rc)
+		return rc;
+
+	if (ver != 0x21)
+		return -1;
+
+	return 0;
+}
diff --git a/include/axp209.h b/include/axp209.h
new file mode 100644
index 0000000..61338ac
--- /dev/null
+++ b/include/axp209.h
@@ -0,0 +1,29 @@ 
+/*
+ * (C) Copyright 2012 Henrik Nordstrom <henrik@henriknordstrom.net>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+extern int axp209_set_dcdc2(int mvolt);
+extern int axp209_set_dcdc3(int mvolt);
+extern int axp209_set_ldo2(int mvolt);
+extern int axp209_set_ldo3(int mvolt);
+extern int axp209_set_ldo4(int mvolt);
+extern void axp209_poweroff(void);
+extern int axp209_init(void);