GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

power: as3722: fix ldo_get/set_enable for ldo index bigger than 7

Browse source 
Fix ldo_get_enable() and ldo_set_enable() functions for LDOs with an
index > 7. Turns out there are actually two separate AS3722_LDO_CONTROL
registers AS3722_LDO_CONTROL0 and AS3722_LDO_CONTROL1. Actually make use
of both. While at it also actually use the enable parameter of the
ldo_set_enable() function which now truly allows disabling as opposed to
only enabling LDOs.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Marcel Ziswiler 2018-05-08 17:34:08 +02:00 • committed by Tom Warren
parent c0cb8c8e86
commit 4616e33b6a
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/power/regulator/as3722_regulator.c
View file

@ -13,6 +13,8 @@
#include <power/pmic.h> #include <power/pmic.h>
#include <power/regulator.h> #include <power/regulator.h>
#define AS3722_LDO_CONTROL0_MAX_INDEX 7
static int stepdown_get_value(struct udevice *dev) static int stepdown_get_value(struct udevice *dev)
{ {
return -ENOSYS; return -ENOSYS;
@ -68,10 +70,16 @@ static int ldo_set_value(struct udevice *dev, int uvolt)
static int ldo_set_enable(struct udevice *dev, bool enable) static int ldo_set_enable(struct udevice *dev, bool enable)
{ {
struct udevice *pmic = dev_get_parent(dev); struct udevice *pmic = dev_get_parent(dev);
u8 ctrl_reg = AS3722_LDO_CONTROL0;
int ldo = dev->driver_data; int ldo = dev->driver_data;
int ret; int ret;
ret = pmic_clrsetbits(pmic, AS3722_LDO_CONTROL, 0, 1 << ldo); if (ldo > AS3722_LDO_CONTROL0_MAX_INDEX) {
ctrl_reg = AS3722_LDO_CONTROL1;
ldo -= 8;
}
ret = pmic_clrsetbits(pmic, ctrl_reg, !enable << ldo, enable << ldo);
if (ret < 0) { if (ret < 0) {
debug("%s: failed to write LDO control register: %d", __func__, debug("%s: failed to write LDO control register: %d", __func__,
ret); ret);
@ -84,10 +92,16 @@ static int ldo_set_enable(struct udevice *dev, bool enable)
static int ldo_get_enable(struct udevice *dev) static int ldo_get_enable(struct udevice *dev)
{ {
struct udevice *pmic = dev_get_parent(dev); struct udevice *pmic = dev_get_parent(dev);
u8 ctrl_reg = AS3722_LDO_CONTROL0;
int ldo = dev->driver_data; int ldo = dev->driver_data;
int ret; int ret;
ret = pmic_reg_read(pmic, AS3722_LDO_CONTROL); if (ldo > AS3722_LDO_CONTROL0_MAX_INDEX) {
ctrl_reg = AS3722_LDO_CONTROL1;
ldo -= 8;
}
ret = pmic_reg_read(pmic, ctrl_reg);
if (ret < 0) { if (ret < 0) {
debug("%s: failed to read SD control register: %d", __func__, debug("%s: failed to read SD control register: %d", __func__,
ret); ret);

3
include/power/as3722.h
View file

@ -13,7 +13,8 @@
#define AS3722_SD_VOLTAGE(n) (0x00 + (n)) #define AS3722_SD_VOLTAGE(n) (0x00 + (n))
#define AS3722_LDO_VOLTAGE(n) (0x10 + (n)) #define AS3722_LDO_VOLTAGE(n) (0x10 + (n))
#define AS3722_SD_CONTROL 0x4d #define AS3722_SD_CONTROL 0x4d
#define AS3722_LDO_CONTROL 0x4e #define AS3722_LDO_CONTROL0 0x4e
#define AS3722_LDO_CONTROL1 0x4f
#define AS3722_ASIC_ID1 0x90 #define AS3722_ASIC_ID1 0x90
#define AS3722_ASIC_ID2 0x91 #define AS3722_ASIC_ID2 0x91