Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sunxi: axp: Move axp pmic register helpers to a separate file

Browse Source 
Move the register helpers used to access the registers via p2wi resp.
rsb bus on the otherwise identical axp221 and axp223 pmics to a separate
file, so that they can be used by the upcoming standalone axp gpio driver
too.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
master
Hans de Goede 10 years ago
parent 12ce15538a
commit 1d624a4f08
5 changed files with 166 additions and 126 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/arm/cpu/armv7/sunxi/Makefile
  2. 93
      arch/arm/cpu/armv7/sunxi/pmic_bus.c
  3. 18
      arch/arm/include/asm/arch-sunxi/pmic_bus.h
  4. 172
      drivers/power/axp221.c
  5. 7
      include/axp221.h

2
arch/arm/cpu/armv7/sunxi/Makefile
Unescape View File

@ -27,6 +27,8 @@ obj-$(CONFIG_MACH_SUN7I) += clock_sun4i.o
obj-$(CONFIG_MACH_SUN8I) += clock_sun6i.o
obj-$(CONFIG_MACH_SUN9I) += clock_sun9i.o
obj-$(CONFIG_AXP221_POWER) += pmic_bus.o
ifndef CONFIG_SPL_BUILD
ifdef CONFIG_ARMV7_PSCI
obj-y += psci.o

93
arch/arm/cpu/armv7/sunxi/pmic_bus.c
Unescape View File

@ -0,0 +1,93 @@
/*
* (C) Copyright 2015 Hans de Goede <hdegoede@redhat.com>
*
* Sunxi PMIC bus access helpers
*
* The axp152 & axp209 use an i2c bus, the axp221 uses the p2wi bus and the
* axp223 uses the rsb bus, these functions abstract this.
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <asm/arch/p2wi.h>
#include <asm/arch/rsb.h>
#include <asm/arch/pmic_bus.h>
#define AXP221_CHIP_ADDR 0x68
#define AXP221_CTRL_ADDR 0x3e
#define AXP221_INIT_DATA 0x3e
#define AXP223_DEVICE_ADDR 0x3a3
#define AXP223_RUNTIME_ADDR 0x2d
int pmic_bus_init(void)
{
/* This cannot be 0 because it is used in SPL before BSS is ready */
static int needs_init = 1;
int ret;
if (!needs_init)
return 0;
#ifdef CONFIG_MACH_SUN6I
p2wi_init();
ret = p2wi_change_to_p2wi_mode(AXP221_CHIP_ADDR, AXP221_CTRL_ADDR,
AXP221_INIT_DATA);
#else
ret = rsb_init();
if (ret)
return ret;
ret = rsb_set_device_address(AXP223_DEVICE_ADDR, AXP223_RUNTIME_ADDR);
#endif
if (ret)
return ret;
needs_init = 0;
return 0;
}
int pmic_bus_read(u8 reg, u8 *data)
{
#ifdef CONFIG_MACH_SUN6I
return p2wi_read(reg, data);
#else
return rsb_read(AXP223_RUNTIME_ADDR, reg, data);
#endif
}
int pmic_bus_write(u8 reg, u8 data)
{
#ifdef CONFIG_MACH_SUN6I
return p2wi_write(reg, data);
#else
return rsb_write(AXP223_RUNTIME_ADDR, reg, data);
#endif
}
int pmic_bus_setbits(u8 reg, u8 bits)
{
int ret;
u8 val;
ret = pmic_bus_read(reg, &val);
if (ret)
return ret;
val |= bits;
return pmic_bus_write(reg, val);
}
int pmic_bus_clrbits(u8 reg, u8 bits)
{
int ret;
u8 val;
ret = pmic_bus_read(reg, &val);
if (ret)
return ret;
val &= ~bits;
return pmic_bus_write(reg, val);
}

18
arch/arm/include/asm/arch-sunxi/pmic_bus.h
Unescape View File

@ -0,0 +1,18 @@
/*
* (C) Copyright 2015 Hans de Goede <hdegoede@redhat.com>
*
* Sunxi PMIC bus access helpers header
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SUNXI_PMIC_BUS_H
#define _SUNXI_PMIS_BUS_H
int pmic_bus_init(void);
int pmic_bus_read(u8 reg, u8 *data);
int pmic_bus_write(u8 reg, u8 data);
int pmic_bus_setbits(u8 reg, u8 bits);
int pmic_bus_clrbits(u8 reg, u8 bits);
#endif

172
drivers/power/axp221.c
Unescape View File

@ -12,50 +12,10 @@
#include <common.h>
#include <errno.h>
#include <asm/arch/p2wi.h>
#include <asm/arch/rsb.h>
#include <asm/arch/gpio.h>
#include <asm/arch/pmic_bus.h>
#include <axp221.h>
/*
* The axp221 uses the p2wi bus, the axp223 is identical (for all registers
* used sofar) but uses the rsb bus. These functions abstract this.
*/
static int pmic_bus_init(void)
{
#ifdef CONFIG_MACH_SUN6I
p2wi_init();
return p2wi_change_to_p2wi_mode(AXP221_CHIP_ADDR, AXP221_CTRL_ADDR,
AXP221_INIT_DATA);
#else
int ret;
ret = rsb_init();
if (ret)
return ret;
return rsb_set_device_address(AXP223_DEVICE_ADDR, AXP223_RUNTIME_ADDR);
#endif
}
static int pmic_bus_read(const u8 addr, u8 *data)
{
#ifdef CONFIG_MACH_SUN6I
return p2wi_read(addr, data);
#else
return rsb_read(AXP223_RUNTIME_ADDR, addr, data);
#endif
}
static int pmic_bus_write(const u8 addr, u8 data)
{
#ifdef CONFIG_MACH_SUN6I
return p2wi_write(addr, data);
#else
return rsb_write(AXP223_RUNTIME_ADDR, addr, data);
#endif
}
static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
{
if (mvolt < min)
@ -66,52 +26,26 @@ static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
return (mvolt - min) / div;
}
static int axp221_setbits(u8 reg, u8 bits)
{
int ret;
u8 val;
ret = pmic_bus_read(reg, &val);
if (ret)
return ret;
val |= bits;
return pmic_bus_write(reg, val);
}
static int axp221_clrbits(u8 reg, u8 bits)
{
int ret;
u8 val;
ret = pmic_bus_read(reg, &val);
if (ret)
return ret;
val &= ~bits;
return pmic_bus_write(reg, val);
}
int axp221_set_dcdc1(unsigned int mvolt)
{
int ret;
u8 cfg = axp221_mvolt_to_cfg(mvolt, 1600, 3400, 100);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC1_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC1_EN);
ret = pmic_bus_write(AXP221_DCDC1_CTRL, cfg);
if (ret)
return ret;
ret = axp221_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DCDC1SW_EN);
ret = pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DCDC1SW_EN);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC1_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC1_EN);
}
int axp221_set_dcdc2(unsigned int mvolt)
@ -120,15 +54,15 @@ int axp221_set_dcdc2(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC2_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC2_EN);
ret = pmic_bus_write(AXP221_DCDC2_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC2_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC2_EN);
}
int axp221_set_dcdc3(unsigned int mvolt)
@ -137,15 +71,15 @@ int axp221_set_dcdc3(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1860, 20);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC3_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC3_EN);
ret = pmic_bus_write(AXP221_DCDC3_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC3_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC3_EN);
}
int axp221_set_dcdc4(unsigned int mvolt)
@ -154,15 +88,15 @@ int axp221_set_dcdc4(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC4_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC4_EN);
ret = pmic_bus_write(AXP221_DCDC4_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC4_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC4_EN);
}
int axp221_set_dcdc5(unsigned int mvolt)
@ -171,15 +105,15 @@ int axp221_set_dcdc5(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 1000, 2550, 50);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC5_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC5_EN);
ret = pmic_bus_write(AXP221_DCDC5_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC5_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_DCDC5_EN);
}
int axp221_set_dldo1(unsigned int mvolt)
@ -188,15 +122,15 @@ int axp221_set_dldo1(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO1_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO1_EN);
ret = pmic_bus_write(AXP221_DLDO1_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO1_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO1_EN);
}
int axp221_set_dldo2(unsigned int mvolt)
@ -205,15 +139,15 @@ int axp221_set_dldo2(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO2_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO2_EN);
ret = pmic_bus_write(AXP221_DLDO2_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO2_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO2_EN);
}
int axp221_set_dldo3(unsigned int mvolt)
@ -222,15 +156,15 @@ int axp221_set_dldo3(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO3_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO3_EN);
ret = pmic_bus_write(AXP221_DLDO3_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO3_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO3_EN);
}
int axp221_set_dldo4(unsigned int mvolt)
@ -239,15 +173,15 @@ int axp221_set_dldo4(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO4_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO4_EN);
ret = pmic_bus_write(AXP221_DLDO4_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO4_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
AXP221_OUTPUT_CTRL2_DLDO4_EN);
}
int axp221_set_aldo1(unsigned int mvolt)
@ -256,15 +190,15 @@ int axp221_set_aldo1(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_ALDO1_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_ALDO1_EN);
ret = pmic_bus_write(AXP221_ALDO1_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_ALDO1_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_ALDO1_EN);
}
int axp221_set_aldo2(unsigned int mvolt)
@ -273,15 +207,15 @@ int axp221_set_aldo2(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_ALDO2_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_ALDO2_EN);
ret = pmic_bus_write(AXP221_ALDO2_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_ALDO2_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
AXP221_OUTPUT_CTRL1_ALDO2_EN);
}
int axp221_set_aldo3(unsigned int mvolt)
@ -290,15 +224,15 @@ int axp221_set_aldo3(unsigned int mvolt)
u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL3,
AXP221_OUTPUT_CTRL3_ALDO3_EN);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL3,
AXP221_OUTPUT_CTRL3_ALDO3_EN);
ret = pmic_bus_write(AXP221_ALDO3_CTRL, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL3,
AXP221_OUTPUT_CTRL3_ALDO3_EN);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL3,
AXP221_OUTPUT_CTRL3_ALDO3_EN);
}
int axp221_set_eldo(int eldo_num, unsigned int mvolt)
@ -325,13 +259,13 @@ int axp221_set_eldo(int eldo_num, unsigned int mvolt)
}
if (mvolt == 0)
return axp221_clrbits(AXP221_OUTPUT_CTRL2, bits);
return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2, bits);
ret = pmic_bus_write(addr, cfg);
if (ret)
return ret;
return axp221_setbits(AXP221_OUTPUT_CTRL2, bits);
return pmic_bus_setbits(AXP221_OUTPUT_CTRL2, bits);
}
int axp221_init(void)

7
include/axp221.h
Unescape View File

@ -8,13 +8,6 @@
struct udevice;
#define AXP221_CHIP_ADDR 0x68
#define AXP221_CTRL_ADDR 0x3e
#define AXP221_INIT_DATA 0x3e
#define AXP223_DEVICE_ADDR 0x3a3
#define AXP223_RUNTIME_ADDR 0x2d
/* Page 0 addresses */
#define AXP221_POWER_STATUS 0x00
#define AXP221_POWER_STATUS_VBUS_AVAIL (1 << 5)

Write Preview
Loading…
Cancel
Save