pmic: Redesign PMIC framework to support multiple instances of devices
Subsystems (3)
v2 cover pmic: Redesign PMIC framework to support multiple instances of devices
PMIC framework has been redesigned to support multiple instances of power related devices (e.g. fuel gauge, PMICs, chargers, micro USB IC, battery).
Due to that, code at other architectures and boards have been adjusted properly.
New power_board_init() method at ./lib/board.c file has been introduced. It is meant to be an architecture dependent function to support advanced power management. Since PMIC framework uses lists internally to link different devices, its initialization must be done just after malloc initialization.
Please consider commits from this patch set as the example of advanced power management for a particular HW (Trats board in this case).
In the new approach PMICs are selected with their names (e.g. 'pmic dump MAX8997_PMIC') Presented patch set is a first step to change 'pmic' command to more generic (i.e. power) to provide control for multiple devices.
Moreover device's battery is treated as an oridinary "power" device (like PMIC). Due to that, framework unification is possible.
Dependencies:
1. gpio:fix: Proper handling of GPIO subsystem parts at Samsung devices
http://patchwork.ozlabs.org/patch/181768/
Test HW:
- Exynos4210 Trats development board
Lukasz Majewski (21):
pmic:i2c: Handle PMIC I2C transmission comprising of two bytes pmic:i2c: Add I2C byte order to PMIC framework pmic:max8997: Switch the MAX8997 PMIC to be used with multibus I2C
pmic: Extend PMIC framework to support multiple instances of PMIC
devices
pmic: Introduce power_board_init() method at ./lib/board.c file
pmic: Enable power_board_init() support at TRATS pmic:chrg: Common information about charger and battery
(power_chrg.h)
pmic: Move pmic related code to ./drivers/power directory
pmic: Extend struct pmic to support battery and charger related
operations
pmic:battery: Support for Trats Battery at PMIC framework pmic:muic: Support for MUIC built into MAX8997 device pmic:fuel-gauge: Support for MAX17042 fuel-gauge pmic:max8997: Function for calculating LDO internal register value arm:trats:pmic: Default PMIC(MAX8997) initialization for Samsung's
TRATS board
arm:trats:pmic: Enable MUIC (MAX8997) at Samsung's TRATS board arm:trats:pmic: Enable fuel-gauge (MAX17042) at Samsung's TRATS board arm:trats:pmic: Enable battery support at Samsung's TRATS board pmic:max8997: Support for MAX8997 internal charger control arm:trats:pmic: Power consumption reduction state for Samsung's TRATS
board
arm:trats:pmic: Support for charging battery at Samsung's TRATS board
pmic: Extend PMIC framework to support battery related commands
arch/arm/lib/board.c | 4 +
board/davedenx/qong/qong.c | 6 +-
board/freescale/mx31pdk/mx31pdk.c | 6 +-
board/freescale/mx35pdk/mx35pdk.c | 8 +-
board/freescale/mx51evk/mx51evk.c | 6 +-
board/freescale/mx53evk/mx53evk.c | 6 +-
board/freescale/mx53loco/mx53loco.c | 10 +-
board/hale/tt01/tt01.c | 6 +-
board/samsung/goni/goni.c | 9 +-
board/samsung/trats/trats.c | 249 +++++++++++++++++++-
board/samsung/universal_c210/universal.c | 10 +-
board/ttcontrol/vision2/vision2.c | 6 +-
drivers/misc/Makefile | 7 -
drivers/misc/pmic_core.c | 147 ------------
drivers/power/Makefile | 11 +
drivers/power/battery/bat_trats.c | 79 ++++++
drivers/power/max17042/fg_max17042.c | 251 ++++++++++++++++++++
drivers/power/max8997/muic_max8997.c | 91 +++++++
drivers/power/max8997/pmic_max8997.c | 124 ++++++++++
drivers/{misc => power/max8998}/pmic_max8998.c | 10 +-
drivers/power/pmic_core.c | 230 ++++++++++++++++++
drivers/{misc => power}/pmic_dialog.c | 8 +-
drivers/{misc => power}/pmic_fsl.c | 8 +-
drivers/{misc => power}/pmic_i2c.c | 40 +++-
drivers/{misc => power}/pmic_spi.c | 4 +-
drivers/rtc/mc13xxx-rtc.c | 6 +-
include/common.h | 3 +
include/configs/trats.h | 7 +
include/pmic.h | 72 ------
.../misc/pmic_max8997.c => include/power/battery.h | 29 +--
include/power/fg_battery_cell_params.h | 90 +++++++
include/power/max17042_fg.h | 74 ++++++
include/power/max8997_muic.h | 61 +++++
include/{ => power}/max8997_pmic.h | 26 ++-
include/{ => power}/max8998_pmic.h | 0
include/power/pmic.h | 102 ++++++++
.../pmic_max8997.c => include/power/power_chrg.h | 34 ++--
37 files changed, 1508 insertions(+), 332 deletions(-)
delete mode 100644 drivers/misc/pmic_core.c
create mode 100644 drivers/power/battery/bat_trats.c
create mode 100644 drivers/power/max17042/fg_max17042.c
create mode 100644 drivers/power/max8997/muic_max8997.c
create mode 100644 drivers/power/max8997/pmic_max8997.c
rename drivers/{misc => power/max8998}/pmic_max8998.c (89%)
create mode 100644 drivers/power/pmic_core.c
rename drivers/{misc => power}/pmic_dialog.c (89%)
rename drivers/{misc => power}/pmic_fsl.c (94%)
rename drivers/{misc => power}/pmic_i2c.c (70%)
rename drivers/{misc => power}/pmic_spi.c (97%)
delete mode 100644 include/pmic.h
copy drivers/misc/pmic_max8997.c => include/power/battery.h (71%)
create mode 100644 include/power/fg_battery_cell_params.h
create mode 100644 include/power/max17042_fg.h
create mode 100644 include/power/max8997_muic.h
rename include/{ => power}/max8997_pmic.h (88%)
rename include/{ => power}/max8998_pmic.h (100%)
create mode 100644 include/power/pmic.h
rename drivers/misc/pmic_max8997.c => include/power/power_chrg.h (71%)Signature · 1 line
1.7.2.3
PATCH v2 1/21 pmic:i2c: Handle PMIC I2C transmission comprising of two bytes
This patch adds support for proper handling of a PMIC I2C transmission comprising of two bytes.
---
Changes for v2:
- None
--- drivers/misc/pmic_i2c.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
drivers/misc/pmic_i2c.c +8 -1
@@ -44,6 +44,10 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val) buf[1 ] = (val >>8 ) &0xff ; buf[2 ] = val &0xff ;break ; +case 2 : + buf[0 ] = (val >>8 ) &0xff ; + buf[1 ] = val &0xff ; +break ;case 1 : buf[0 ] = val &0xff ;break ;
@@ -73,6 +77,9 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)case 3 : ret_val = buf[0 ] <<16 | buf[1 ] <<8 | buf[2 ];break ; +case 2 : + ret_val = buf[0 ] <<8 | buf[1 ]; +break ;case 1 : ret_val = buf[0 ];break ;
@@ -88,7 +95,7 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)int pmic_probe (struct pmic *p) {I2C_SET_BUS (p->bus); -debug ("PMIC:%s probed!\n" , p->name); +debug ("Bus: %d PMIC:%s probed!\n" , p->bus, p->name);if (i2c_probe (pmic_i2c_addr)) {printf ("Can't find PMIC:%s\n" , p->name);return -1 ;
Signature · 1 line
1.7.2.3
PATCH v2 2/21 pmic:i2c: Add I2C byte order to PMIC framework
In reply to Lukasz MajewskiSince the pmic_reg_read is the u32 value, the order in which bytes are placed to form u32 value is important.
This commit adds the reverse (which is default) and normal byte order.
---
Changes for v2:
- Move byte_order variable to struct pmic
--- drivers/misc/pmic_i2c.c | 31 ++++++++++++++++++++++++------- include/pmic.h | 2 ++ 2 files changed, 26 insertions(+), 7 deletions(-)
drivers/misc/pmic_i2c.c +24 -7
@@ -40,13 +40,24 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val)switch (pmic_i2c_tx_num) {case 3 : - buf[0 ] = (val >>16 ) &0xff ; - buf[1 ] = (val >>8 ) &0xff ; - buf[2 ] = val &0xff ; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) { + buf[2 ] = (val >>16 ) &0xff ; + buf[1 ] = (val >>8 ) &0xff ; + buf[0 ] = val &0xff ; + }else { + buf[0 ] = (val >>16 ) &0xff ; + buf[1 ] = (val >>8 ) &0xff ; + buf[2 ] = val &0xff ; + }break ;case 2 : - buf[0 ] = (val >>8 ) &0xff ; - buf[1 ] = val &0xff ; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) { + buf[1 ] = (val >>8 ) &0xff ; + buf[0 ] = val &0xff ; + }else { + buf[0 ] = (val >>8 ) &0xff ; + buf[1 ] = val &0xff ; + }break ;case 1 : buf[0 ] = val &0xff ;
@@ -75,10 +86,16 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)switch (pmic_i2c_tx_num) {case 3 : - ret_val = buf[0 ] <<16 | buf[1 ] <<8 | buf[2 ]; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) + ret_val = buf[2 ] <<16 | buf[1 ] <<8 | buf[0 ]; +else + ret_val = buf[0 ] <<16 | buf[1 ] <<8 | buf[2 ];break ;case 2 : - ret_val = buf[0 ] <<8 | buf[1 ]; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) + ret_val = buf[1 ] <<8 | buf[0 ]; +else + ret_val = buf[0 ] <<8 | buf[1 ];break ;case 1 : ret_val = buf[0 ];
include/pmic.h +2 -0
@@ -27,6 +27,7 @@enum {PMIC_I2C ,PMIC_SPI , };enum {I2C_PMIC ,I2C_NUM , };enum {PMIC_READ ,PMIC_WRITE , }; +enum {PMIC_BYTE_ORDER_REVERSED ,PMIC_BYTE_ORDER_NORMAL , };struct p_i2c {unsigned char addr;
@@ -47,6 +48,7 @@ struct pmic {const char *name;unsigned char bus;unsigned char interface; +unsigned char byte_order;unsigned char number_of_regs;union hw {struct p_i2c i2c;
Signature · 1 line
1.7.2.3
PATCH v2 2/21 pmic:i2c: Add I2C byte order to PMIC framework
Quoted 9 lines · Lukasz Majewski
Since the
pmic_reg_readis the u32 value, the order in which bytes are placed to form u32 value is important.This commit adds the reverse (which is default) and normal byte order.
Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Hi Lucasz,
Quoted 2 lines
Changes for v2:
- Movebyte_ordervariable to struct pmic
Is the byte reversal you introduce here only another way for the endianess ?
It seems to me you have a PMIC whose endianess is different as the SOC's endianess, and that must be changed.
I can suppose that "normal byte" and "reverse byte" works only with ARM SOC, as they are (normally, but not always) little endian, but not for example on PowerPC (big endian).
If this is correct, then I think we need a parameter in the structure to indicate the endianess, and instead using custom way you could use the cpu_to_le or cpu_to_be functions.
Quoted 72 lines
--- drivers/misc/pmic_i2c.c | 31 ++++++++++++++++++++++++------- include/pmic.h | 2 ++ 2 files changed, 26 insertions(+), 7 deletions(-)drivers/misc/pmic_i2c.c +24
-7@@ -40,13 +40,24 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val)switch (pmic_i2c_tx_num) {case 3 : - buf[0 ] = (val >>16 ) &0xff ; - buf[1 ] = (val >>8 ) &0xff ; - buf[2 ] = val &0xff ; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) { + buf[2 ] = (val >>16 ) &0xff ; + buf[1 ] = (val >>8 ) &0xff ; + buf[0 ] = val &0xff ; + }else { + buf[0 ] = (val >>16 ) &0xff ; + buf[1 ] = (val >>8 ) &0xff ; + buf[2 ] = val &0xff ; + }break ;case 2 : - buf[0 ] = (val >>8 ) &0xff ; - buf[1 ] = val &0xff ; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) { + buf[1 ] = (val >>8 ) &0xff ; + buf[0 ] = val &0xff ; + }else { + buf[0 ] = (val >>8 ) &0xff ; + buf[1 ] = val &0xff ; + }break ;case 1 : buf[0 ] = val &0xff ;@@ -75,10 +86,16 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)switch (pmic_i2c_tx_num) {case 3 : - ret_val = buf[0 ] <<16 | buf[1 ] <<8 | buf[2 ]; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) + ret_val = buf[2 ] <<16 | buf[1 ] <<8 | buf[0 ]; +else + ret_val = buf[0 ] <<16 | buf[1 ] <<8 | buf[2 ];break ;case 2 : - ret_val = buf[0 ] <<8 | buf[1 ]; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) + ret_val = buf[1 ] <<8 | buf[0 ]; +else + ret_val = buf[0 ] <<8 | buf[1 ];break ;case 1 : ret_val = buf[0 ];include/pmic.h +1
-0@@ -27,6 +27,7 @@enum {PMIC_I2C ,PMIC_SPI , };enum {I2C_PMIC ,I2C_NUM , };enum {PMIC_READ ,PMIC_WRITE , }; +enum {PMIC_BYTE_ORDER_REVERSED ,PMIC_BYTE_ORDER_NORMAL , };struct p_i2c {unsigned char addr;
include/pmic.h struct pmic { · line 54
Quoted 7 lines
include/pmic.h +1
-0@@ -47,6 +48,7 @@ struct pmic {const char *name;unsigned char bus;unsigned char interface; +unsigned char byte_order;unsigned char number_of_regs;union hw {struct p_i2c i2c;
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 2/21 pmic:i2c: Add I2C byte order to PMIC framework
Hi Stefano,
Quoted 20 lines · Lukasz Majewski
Quoted 10 lines
Since the
pmic_reg_readis the u32 value, the order in which bytes are placed to form u32 value is important.This commit adds the reverse (which is default) and normal byte order.
Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Hi Lucasz,
Quoted 2 lines
Changes for v2:
- Movebyte_ordervariable to struct pmicIs the byte reversal you introduce here only another way for the endianess ?
Quoted 6 lines
It seems to me you have a PMIC whose endianess is different as the SOC's endianess, and that must be changed.
I can suppose that "normal byte" and "reverse byte" works only with ARM SOC, as they are (normally, but not always) little endian, but not for example on PowerPC (big endian).
This procedure was necessary since, some sensor produces output of 2B and those bytes are in a big endian.
For simplicity reason I decided to make the switch on received bytes.
I suppose that witch some luck :-), proper cpu_to_le16|be16 (le32|be32) functions can be used to avoid repetition.
To make the code working at both ARM and PPC we shall use the __BYTE_ORDER == __LITTLE_ENDIAN check, which is CPU dependent. Hence, the interpretation of stored data would be consistent from CPU point of view.
To sum up - two options possible:
1. Use cpu_to_le|be functions (hack cpu_to_le32 to handle 3B input)
2. Perform switch (as it was done in this patch) with explicit check of __BYTE_ORDER == __LITTLE_ENDIAN.
I would opt for 1 here.
Quoted 3 lines
If this is correct, then I think we need a parameter in the structure to indicate the endianess,
We need also the endiness of data coming out from sensor as it is defined in this patch:
enum { PMIC_BYTE_ORDER_REVERSED, PMIC_BYTE_ORDER_NORMAL, }; I admit, that name could be more appropriate here (like SENSOR_BYTE_ORDER).
In this patch I've added a "byte_order" variable to struct pmic to indicate the endiantess of device (I2C connected) to which we are talking to. It is per sensor defined (as the struct pmic is)
Please feel free to comment other patches, so I could prepare v3 of this series :-).
Quoted 89 lines
and instead using custom way you could use
thecpu_to_leorcpu_to_befunctions.Quoted 73 lines
--- drivers/misc/pmic_i2c.c | 31 ++++++++++++++++++++++++------- include/pmic.h | 2 ++ 2 files changed, 26 insertions(+), 7 deletions(-)drivers/misc/pmic_i2c.c +24
-7@@ -40,13 +40,24 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val)switch (pmic_i2c_tx_num) {case 3 : - buf[0 ] = (val >>16 ) &0xff ; - buf[1 ] = (val >>8 ) &0xff ; - buf[2 ] = val &0xff ; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) { + buf[2 ] = (val >>16 ) &0xff ; + buf[1 ] = (val >>8 ) &0xff ; + buf[0 ] = val &0xff ; + }else { + buf[0 ] = (val >>16 ) &0xff ; + buf[1 ] = (val >>8 ) &0xff ; + buf[2 ] = val &0xff ; + }break ;case 2 : - buf[0 ] = (val >>8 ) &0xff ; - buf[1 ] = val &0xff ; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) { + buf[1 ] = (val >>8 ) &0xff ; + buf[0 ] = val &0xff ; + }else { + buf[0 ] = (val >>8 ) &0xff ; + buf[1 ] = val &0xff ; + }break ;case 1 : buf[0 ] = val &0xff ;@@ -75,10 +86,16 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)switch (pmic_i2c_tx_num) {case 3 : - ret_val = buf[0 ] <<16 | buf[1 ] <<8 | buf[2 ]; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) + ret_val = buf[2 ] <<16 | buf[1 ] <<8 | buf[0 ]; +else + ret_val = buf[0 ] <<16 | buf[1 ] <<8 | buf[2 ];break ;case 2 : - ret_val = buf[0 ] <<8 | buf[1 ]; +if (p->byte_order ==PMIC_BYTE_ORDER_NORMAL ) + ret_val = buf[1 ] <<8 | buf[0 ]; +else + ret_val = buf[0 ] <<8 | buf[1 ];break ;case 1 :drivers/misc/pmic_i2c.c +0
-0ret_val = buf[0 ];include/pmic.h +1
-0@@ -27,6 +27,7 @@enum {PMIC_I2C ,PMIC_SPI , };enum {I2C_PMIC ,I2C_NUM , };enum {PMIC_READ ,PMIC_WRITE , }; +enum {PMIC_BYTE_ORDER_REVERSED ,PMIC_BYTE_ORDER_NORMAL , };struct p_i2c {unsigned char addr;include/pmic.h struct pmic { · line 54
Quoted 7 lines
include/pmic.h +1
-0@@ -47,6 +48,7 @@ struct pmic {const char *name;unsigned char bus;unsigned char interface; +unsigned char byte_order;unsigned char number_of_regs;union hw {struct p_i2c i2c;Best regards,
Stefano Babic
Signature · 5 lines
Best regards, Lukasz Majewski Samsung Poland R&D Center | Linux Platform Group
PATCH v2 2/21 pmic:i2c: Add I2C byte order to PMIC framework
Quoted 25 lines · Lukasz Majewski
Hi Stefano,
Quoted 23 lines · Lukasz Majewski
Quoted 10 lines
Since the
pmic_reg_readis the u32 value, the order in which bytes are placed to form u32 value is important.This commit adds the reverse (which is default) and normal byte order.
Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Hi Lucasz,
Quoted 2 lines
Changes for v2:
- Movebyte_ordervariable to struct pmicIs the byte reversal you introduce here only another way for the endianess ?
It seems to me you have a PMIC whose endianess is different as the SOC's endianess, and that must be changed.
Quoted 6 lines
Quoted 3 lines
I can suppose that "normal byte" and "reverse byte" works only with ARM SOC, as they are (normally, but not always) little endian, but not for example on PowerPC (big endian).
This procedure was necessary since, some sensor produces output of 2B and those bytes are in a big endian.
Right. So we have the endianess of the SOC and the endianess of the PMIC, and they can differ.
Quoted 4 lines
For simplicity reason I decided to make the switch on received bytes.
I suppose that witch some luck :-), proper cpu_to_le16|be16 (le32|be32) functions can be used to avoid repetition.
I hope so.
Quoted 6 lines
To make the code working at both ARM and PPC we shall use the
__BYTE_ORDER==__LITTLE_ENDIANcheck, which is CPU dependent. Hence, the interpretation of stored data would be consistent from CPU point of view.
Quoted 6 lines
To sum up - two options possible:
1. Use cpu_to_le|be functions (hackcpu_to_le32to handle 3B input)
2. Perform switch (as it was done in this patch) with explicit check of__BYTE_ORDER==__LITTLE_ENDIAN.I would opt for 1 here.
I vote for 1, too. I think generally in u-boot and kernel there is no use of the explicit check, but I have not grepped in code.
Quoted 10 lines
Quoted 4 lines
If this is correct, then I think we need a parameter in the structure to indicate the endianess,
We need also the endiness of data coming out from sensor as it is defined in this patch:
enum {PMIC_BYTE_ORDER_REVERSED,PMIC_BYTE_ORDER_NORMAL, }; I admit, that name could be more appropriate here (likeSENSOR_BYTE_ORDER).
Yes. The name is misleading. Which is "normal" nowadays ?
Quoted 4 lines
In this patch I've added a "
byte_order" variable to struct pmic to indicate the endiantess of device (I2C connected) to which we are talking to. It is per sensor defined (as the struct pmic is)
I think the procedure is correct. The endianess is stored in the pmic structure, and then calling appropriate cpu_to_le/be function we should have the bytes in the right order.
Quoted 3 lines
Please feel free to comment other patches, so I could prepare v3 of this series :-).
I will do..
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 3/21 pmic:max8997: Switch the MAX8997 PMIC to be used with multibus I2C
In reply to Lukasz MajewskiPMIC MAX8997 is now ready to work with single and multibus soft I2C implementation.
---
Changes for v2:
- None
--- drivers/misc/pmic_max8997.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/misc/pmic_max8997.c +2 -1
@@ -24,6 +24,7 @@#include <common.h> #include <pmic.h> #include <max8997_pmic.h> +#include <i2c.h> int pmic_init (void ) {
@@ -37,7 +38,7 @@ int pmic_init(void) p->number_of_regs =PMIC_NUM_OF_REGS ; p->hw.i2c.addr =MAX8997_I2C_ADDR ; p->hw.i2c.tx_num =1 ; - p->bus =I2C_PMIC ; + p->bus =I2C_0 ;return 0 ; }
Signature · 1 line
1.7.2.3
PATCH v2 4/21 pmic: Extend PMIC framework to support multiple instances of PMIC devices
In reply to Lukasz MajewskiThe PMIC framework has been extended to support multiple instances of the variety of devices responsible for power management.
This change allows supporting of e.g. fuel gauge, charger, MUIC (Micro USB Interface Circuit).
Power related includes have been moved to ./include/power directory. This is a first of a series of patches - in the future "pmic" will be replaced with "power".
Two important issues:
1. The PMIC needs to be initialized just after malloc is configured
2. It uses list to hold information about available PMIC devices
---
Changes for v2:
- None
---
board/davedenx/qong/qong.c | 6 +-
board/freescale/mx31pdk/mx31pdk.c | 6 +-
board/freescale/mx35pdk/mx35pdk.c | 8 +-
board/freescale/mx51evk/mx51evk.c | 6 +-
board/freescale/mx53evk/mx53evk.c | 6 +-
board/freescale/mx53loco/mx53loco.c | 10 ++--
board/hale/tt01/tt01.c | 6 +-
board/samsung/goni/goni.c | 9 ++-
board/samsung/trats/trats.c | 12 ++--
board/samsung/universal_c210/universal.c | 10 ++--
board/ttcontrol/vision2/vision2.c | 6 +-
drivers/misc/pmic_core.c | 108 ++++++++++++++++++++++--------
drivers/misc/pmic_dialog.c | 8 +-
drivers/misc/pmic_fsl.c | 8 +-
drivers/misc/pmic_i2c.c | 6 +-
drivers/misc/pmic_max8997.c | 10 ++--
drivers/misc/pmic_max8998.c | 10 ++--
drivers/misc/pmic_spi.c | 4 +-
drivers/rtc/mc13xxx-rtc.c | 6 +-
include/{ => power}/max8997_pmic.h | 15 ++++-
include/{ => power}/max8998_pmic.h | 0
include/{ => power}/pmic.h | 17 +++--
22 files changed, 175 insertions(+), 102 deletions(-)
rename include/{ => power}/max8997_pmic.h (92%)
rename include/{ => power}/max8998_pmic.h (100%)
rename include/{ => power}/pmic.h (86%)board/davedenx/qong/qong.c +3 -3
@@ -28,7 +28,7 @@#include <asm/arch/sys_proto.h> #include <asm/io.h> #include <nand.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> #include <asm/gpio.h> #include "qong_fpga.h"
@@ -173,8 +173,8 @@ int board_late_init(void)u32 val;struct pmic *p; -pmic_init (); - p =get_pmic (); +pmic_init (I2C_PMIC ); + p =pmic_get ("FSL_PMIC" );/* Enable RTC battery */ pmic_reg_read (p,REG_POWER_CTL0 , &val);
board/freescale/mx31pdk/mx31pdk.c +3 -3
@@ -30,7 +30,7 @@#include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h> #include <watchdog.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -84,8 +84,8 @@ int board_late_init(void)u32 val;struct pmic *p; -pmic_init (); - p =get_pmic (); +pmic_init (I2C_PMIC ); + p =pmic_get ("FSL_PMIC" );/* Enable RTC battery */ pmic_reg_read (p,REG_POWER_CTL0 , &val);
board/freescale/mx35pdk/mx35pdk.c +4 -4
@@ -30,7 +30,7 @@#include <asm/arch/mx35_pins.h> #include <asm/arch/iomux.h> #include <i2c.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> #include <mmc.h> #include <fsl_esdhc.h>
@@ -206,7 +206,7 @@ int board_init(void)static inline int pmic_detect (void ) {unsigned int id; -struct pmic *p =get_pmic (); +struct pmic *p =pmic_get ("FSL_PMIC" );pmic_reg_read (p,REG_IDENTIFICATION , &id);
@@ -231,9 +231,9 @@ int board_late_init(void)u32 pmic_val;struct pmic *p; -pmic_init (); +pmic_init (I2C_PMIC );if (pmic_detect ()) { - p =get_pmic (); + p =pmic_get ("FSL_PMIC" );mxc_request_iomux (MX35_PIN_WATCHDOG_RST ,MUX_CONFIG_SION |MUX_CONFIG_ALT1 );
board/freescale/mx51evk/mx51evk.c +3 -3
@@ -32,7 +32,7 @@#include <i2c.h> #include <mmc.h> #include <fsl_esdhc.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> #include <mc13892.h> #include <usb/ehci-fsl.h>
@@ -244,8 +244,8 @@ static void power_init(void)struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE ;struct pmic *p; -pmic_init (); - p =get_pmic (); +pmic_init (I2C_PMIC ); + p =pmic_get ("FSL_PMIC" );/* Write needed to Power Gate 2 register */ pmic_reg_read (p,REG_POWER_MISC , &val);
board/freescale/mx53evk/mx53evk.c +3 -3
@@ -33,7 +33,7 @@#include <i2c.h> #include <mmc.h> #include <fsl_esdhc.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> #include <asm/gpio.h> #include <mc13892.h>
@@ -123,8 +123,8 @@ void power_init(void)unsigned int val;struct pmic *p; -pmic_init (); - p =get_pmic (); +pmic_init (I2C_PMIC ); + p =pmic_get ("FSL_PMIC" );/* Set VDDA to 1.25V */ pmic_reg_read (p,REG_SW_2 , &val);
board/freescale/mx53loco/mx53loco.c +5 -5
@@ -36,7 +36,7 @@#include <mmc.h> #include <fsl_esdhc.h> #include <asm/gpio.h> -#include <pmic.h> +#include <power/pmic.h> #include <dialog_pmic.h> #include <fsl_pmic.h> #include <linux/fb.h>
@@ -343,8 +343,8 @@ static int power_init(void)struct pmic *p;if (!i2c_probe (CONFIG_SYS_DIALOG_PMIC_I2C_ADDR )) { -pmic_dialog_init (); - p =get_pmic (); +pmic_dialog_init (I2C_PMIC ); + p =pmic_get ("DIALOG_PMIC" );/* Set VDDA to 1.25V */ val =DA9052_BUCKCORE_BCOREEN |DA_BUCKCORE_VBCORE_1_250V ;
@@ -360,8 +360,8 @@ static int power_init(void) }if (!i2c_probe (CONFIG_SYS_FSL_PMIC_I2C_ADDR )) { -pmic_init (); - p =get_pmic (); +pmic_init (I2C_PMIC ); + p =pmic_get ("DIALOG_PMIC" );/* Set VDDGP to 1.25V for 1GHz on SW1 */ pmic_reg_read (p,REG_SW_0 , &val);
board/hale/tt01/tt01.c +3 -3
@@ -25,7 +25,7 @@#include <common.h> #include <netdev.h> #include <command.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> #include <mc13783.h> #include <asm/arch/clock.h>
@@ -201,8 +201,8 @@ int board_mmc_init(bd_t *bis)* pmic_init() here. board_late_init() is too late for * the MMC driver. */ -pmic_init (); - p =get_pmic (); +pmic_init (I2C_PMIC ); + p =pmic_get ("FSL_PMIC" );/* configure pins for SDHC1 only */ mx31_gpio_mux (IOMUX_MODE (MUX_CTL_SD1_CLK ,MUX_CTL_FUNC ));
board/samsung/goni/goni.c +5 -4
@@ -25,10 +25,10 @@#include <common.h> #include <asm/arch/gpio.h> #include <asm/arch/mmc.h> -#include <pmic.h> +#include <power/pmic.h> #include <usb/s3c_udc.h> #include <asm/arch/cpu.h> -#include <max8998_pmic.h> +#include <power/max8998_pmic.h> DECLARE_GLOBAL_DATA_PTR ;static struct s5pc110_gpio *s5pc110_gpio;
@@ -42,8 +42,9 @@ int board_init(void) gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ;#if defined(CONFIG_PMIC ) -pmic_init (); +pmic_init (I2C_5 );#endif +return 0 ; }
@@ -108,7 +109,7 @@ static int s5pc1xx_phy_control(int on) {int ret;static int status; -struct pmic *p =get_pmic (); +struct pmic *p =pmic_get ("MAX8998_PMIC" );if (pmic_probe (p))return -1 ;
board/samsung/trats/trats.c +6 -6
@@ -34,9 +34,9 @@#include <asm/arch/mipi_dsim.h> #include <asm/arch/watchdog.h> #include <asm/arch/power.h> -#include <pmic.h> +#include <power/pmic.h> #include <usb/s3c_udc.h> -#include <max8997_pmic.h> +#include <power/max8997_pmic.h> #include <libtizen.h> #include "setup.h"
@@ -69,7 +69,7 @@ int board_init(void)printf ("HW Revision:\t0x%x\n" , board_rev);#if defined(CONFIG_PMIC ) -pmic_init (); +pmic_init (I2C_5 );#endif return 0 ;
@@ -238,7 +238,7 @@ static int s5pc210_phy_control(int on) {int ret =0 ;u32 val =0 ; -struct pmic *p =get_pmic (); +struct pmic *p =pmic_get ("MAX8997_PMIC" );if (pmic_probe (p))return -1 ;
@@ -413,7 +413,7 @@ static void lcd_reset(void)static int lcd_power (void ) {int ret =0 ; -struct pmic *p =get_pmic (); +struct pmic *p =pmic_get ("MAX8997_PMIC" );if (pmic_probe (p))return 0 ;
@@ -473,7 +473,7 @@ static struct mipi_dsim_lcd_device mipi_lcd_device = {static int mipi_power (void ) {int ret =0 ; -struct pmic *p =get_pmic (); +struct pmic *p =pmic_get ("MAX8997_PMIC" );if (pmic_probe (p))return 0 ;
board/samsung/universal_c210/universal.c +5 -5
@@ -27,10 +27,10 @@#include <asm/arch/adc.h> #include <asm/arch/gpio.h> #include <asm/arch/mmc.h> -#include <pmic.h> +#include <power/pmic.h> #include <usb/s3c_udc.h> #include <asm/arch/cpu.h> -#include <max8998_pmic.h> +#include <power/max8998_pmic.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -59,7 +59,7 @@ int board_init(void) gd->bd->bi_boot_params =PHYS_SDRAM_1 +0x100 ;#if defined(CONFIG_PMIC ) -pmic_init (); +pmic_init (I2C_5 );#endif check_hw_revision ();
@@ -112,7 +112,7 @@ static unsigned short get_adc_value(int channel)static int adc_power_control (int on) {int ret; -struct pmic *p =get_pmic (); +struct pmic *p =pmic_get ("MAX8998_PMIC" );if (pmic_probe (p))return -1 ;
@@ -280,7 +280,7 @@ int board_mmc_init(bd_t *bis)static int s5pc210_phy_control (int on) {int ret =0 ; -struct pmic *p =get_pmic (); +struct pmic *p =pmic_get ("MAX8998_PMIC" );if (pmic_probe (p))return -1 ;
board/ttcontrol/vision2/vision2.c +3 -3
@@ -33,7 +33,7 @@#include <asm/arch/sys_proto.h> #include <i2c.h> #include <mmc.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_esdhc.h> #include <fsl_pmic.h> #include <mc13892.h>
@@ -306,8 +306,8 @@ static void power_init_mx51(void)unsigned int val;struct pmic *p; -pmic_init (); - p =get_pmic (); +pmic_init (I2C_PMIC ); + p =pmic_get ("FSL_PMIC" );/* Write needed to Power Gate 2 register */ pmic_reg_read (p,REG_POWER_MISC , &val);
drivers/misc/pmic_core.c +80 -28
174 lines not on this page · raw message
drivers/misc/pmic_dialog.c +4 -4
@@ -17,12 +17,12 @@*/ #include <common.h> -#include <pmic.h> +#include <power/pmic.h> #include <dialog_pmic.h> -int pmic_dialog_init (void ) +int pmic_dialog_init (unsigned char bus) { -struct pmic *p =get_pmic (); +struct pmic *p =pmic_alloc ();static const char name[] ="DIALOG_PMIC" ; p->name = name;
@@ -31,7 +31,7 @@ int pmic_dialog_init(void) p->interface =PMIC_I2C ; p->hw.i2c.addr =CONFIG_SYS_DIALOG_PMIC_I2C_ADDR ; p->hw.i2c.tx_num =1 ; - p->bus =I2C_PMIC ; + p->bus = bus;return 0 ; }
drivers/misc/pmic_fsl.c +4 -4
@@ -23,7 +23,7 @@#include <common.h> #include <spi.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> #if defined(CONFIG_PMIC_SPI )
@@ -33,9 +33,9 @@ static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write) }#endif -int pmic_init (void ) +int pmic_init (unsigned char bus) { -struct pmic *p =get_pmic (); +struct pmic *p =pmic_alloc ();static const char name[] ="FSL_PMIC" ; p->name = name;
@@ -54,7 +54,7 @@ int pmic_init(void) p->interface =PMIC_I2C ; p->hw.i2c.addr =CONFIG_SYS_FSL_PMIC_I2C_ADDR ; p->hw.i2c.tx_num =3 ; - p->bus =I2C_PMIC ; + p->bus = bus;#else #error "You must select CONFIG_PMIC_SPI or CONFIG_PMIC_I2C"#endif
drivers/misc/pmic_i2c.c +3 -3
@@ -28,14 +28,14 @@#include <common.h> #include <linux/types.h> -#include <pmic.h> +#include <power/pmic.h> #include <i2c.h> int pmic_reg_write (struct pmic *p,u32 reg,u32 val) {unsigned char buf[4 ] = {0 }; -if (check_reg (reg)) +if (check_reg (p, reg))return -1 ;switch (pmic_i2c_tx_num) {
@@ -78,7 +78,7 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)unsigned char buf[4 ] = {0 };u32 ret_val =0 ; -if (check_reg (reg)) +if (check_reg (p, reg))return -1 ;if (i2c_read (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num))
drivers/misc/pmic_max8997.c +5 -5
@@ -22,13 +22,13 @@*/ #include <common.h> -#include <pmic.h> -#include <max8997_pmic.h> +#include <power/pmic.h> +#include <power/max8997_pmic.h> #include <i2c.h> -int pmic_init (void ) +int pmic_init (unsigned char bus) { -struct pmic *p =get_pmic (); +struct pmic *p =pmic_alloc ();static const char name[] ="MAX8997_PMIC" ;puts ("Board PMIC init\n" );
@@ -38,7 +38,7 @@ int pmic_init(void) p->number_of_regs =PMIC_NUM_OF_REGS ; p->hw.i2c.addr =MAX8997_I2C_ADDR ; p->hw.i2c.tx_num =1 ; - p->bus =I2C_0 ; + p->bus = bus;return 0 ; }
drivers/misc/pmic_max8998.c +5 -5
@@ -22,12 +22,12 @@*/ #include <common.h> -#include <pmic.h> -#include <max8998_pmic.h> +#include <power/pmic.h> +#include <power/max8998_pmic.h> -int pmic_init (void ) +int pmic_init (unsigned char bus) { -struct pmic *p =get_pmic (); +struct pmic *p =pmic_alloc ();static const char name[] ="MAX8998_PMIC" ;puts ("Board PMIC init\n" );
@@ -37,7 +37,7 @@ int pmic_init(void) p->number_of_regs =PMIC_NUM_OF_REGS ; p->hw.i2c.addr =MAX8998_I2C_ADDR ; p->hw.i2c.tx_num =1 ; - p->bus =I2C_PMIC ; + p->bus = bus;return 0 ; }
drivers/misc/pmic_spi.c +2 -2
@@ -28,7 +28,7 @@#include <common.h> #include <linux/types.h> -#include <pmic.h> +#include <power/pmic.h> #include <spi.h> static struct spi_slave *slave;
@@ -59,7 +59,7 @@ static u32 pmic_reg(struct pmic *p, u32 reg, u32 *val, u32 write)return -1 ; } -if (check_reg (reg)) +if (check_reg (p, reg))return -1 ;if (spi_claim_bus (slave))
drivers/rtc/mc13xxx-rtc.c +3 -3
@@ -23,14 +23,14 @@#include <common.h> #include <rtc.h> #include <spi.h> -#include <pmic.h> +#include <power/pmic.h> #include <fsl_pmic.h> int rtc_get (struct rtc_time *rtc) {u32 day1, day2, time;int tim, i =0 ; -struct pmic *p =get_pmic (); +struct pmic *p =pmic_get ("FSL_PMIC" );int ret; do {
@@ -61,7 +61,7 @@ int rtc_get(struct rtc_time *rtc)int rtc_set (struct rtc_time *rtc) {u32 time, day; -struct pmic *p =get_pmic (); +struct pmic *p =pmic_get ("FSL_PMIC" ); time =mktime (rtc->tm_year, rtc->tm_mon, rtc->tm_mday, rtc->tm_hour, rtc->tm_min, rtc->tm_sec);
include/power/max8997_pmic.h renamed from include/max8997_pmic.h +14 -1
@@ -111,7 +111,7 @@ enum {MAX8997_REG_MBCCTRL6 =0x55 ,MAX8997_REG_OTPCGHCVS =0x56 , -MAX8997_REG_SAFEOUTCTRL =0x5a , +MAX8997_REG_SAFEOUTCTRL =0x5a ,MAX8997_REG_LBCNFG1 =0x5e , MAX8997_REG_LBCNFG2 = 0x5f,
@@ -171,9 +171,22 @@ enum { PMIC_NUM_OF_REGS = 0x9b, }; +#define ACTDISSAFEO1 (1 << 4) +#define ACTDISSAFEO2 (1 << 5)#define ENSAFEOUT1 (1 << 6)#define ENSAFEOUT2 (1 << 7) +/* Charger */ +enum {CHARGER_ENABLE ,CHARGER_DISABLE }; +#define DETBAT (1 << 2) +#define MBCICHFCSET (1 << 4) +#define MBCHOSTEN (1 << 6) +#define VCHGR_FC (1 << 7) + +#define CHARGER_MIN_CURRENT 200 +#define CHARGER_MAX_CURRENT 950 +#define CHARGER_CURRENT_RESOLUTION 50 +#define MAX8997_I2C_ADDR (0xCC >> 1)#define MAX8997_RTC_ADDR (0x0C >> 1)#define MAX8997_MUIC_ADDR (0x4A >> 1)
include/power/max8998_pmic.h renamed from include/max8998_pmic.h +0 -0
include/power/pmic.h renamed from include/pmic.h +12 -5
@@ -1,5 +1,5 @@/* -* Copyright (C) 2011 Samsung Electronics +* Copyright (C) 2011-2012 Samsung Electronics * Lukasz Majewski <[email protected]> * * See file CREDITS for list of people who contributed to this
@@ -24,6 +24,10 @@#ifndef __CORE_PMIC_H_#define __CORE_PMIC_H_ +#include <common.h> +#include <linux/list.h> +#include <i2c.h> +enum {PMIC_I2C ,PMIC_SPI , };enum {I2C_PMIC ,I2C_NUM , };enum {PMIC_READ ,PMIC_WRITE , };
@@ -49,17 +53,20 @@ struct pmic {unsigned char bus;unsigned char interface;unsigned char byte_order; -unsigned char number_of_regs; +unsigned int number_of_regs;union hw {struct p_i2c i2c;struct p_spi spi; } hw; + +struct list_head list; }; -int pmic_init (void ); +int pmic_init (unsigned char bus);int pmic_dialog_init (void ); -int check_reg (u32 reg); -struct pmic *get_pmic (void ); +int check_reg (struct pmic *p,u32 reg); +struct pmic *pmic_alloc (void ); +struct pmic *pmic_get (const char *s);int pmic_probe (struct pmic *p);int pmic_reg_read (struct pmic *p,u32 reg,u32 *val);int pmic_reg_write (struct pmic *p,u32 reg,u32 val);
Signature · 1 line
1.7.2.3
PATCH v2 5/21 pmic: Introduce power_board_init() method at ./lib/board.c file
In reply to Lukasz MajewskiIt is necessary to introduce a new system wide function- power_board_init()
It turns out, that power initialization must be done as early as possible. In the case of PMIC framework redesign, which aims to support multiple instances of PMIC devices the initialization shall be performed just after malloc configuration.
The arch_early_init_r() could be used instead, but it doesn't reflect that the "power" subsystem is going to be initialized.
---
Changes for v2:
- None
--- arch/arm/lib/board.c | 4 ++++ include/common.h | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-)
arch/arm/lib/board.c +4 -0
@@ -513,6 +513,10 @@ void board_init_r(gd_t *id, ulong dest_addr)arch_early_init_r ();#endif +#ifdef CONFIG_POWER_INIT +power_board_init (); +#endif +#if !defined(CONFIG_SYS_NO_FLASH )puts ("Flash: " );
include/common.h +3 -0
@@ -487,6 +487,9 @@ int board_late_init (void);int board_postclk_init (void );/* after clocks/timebase, before env/serial */ int board_early_init_r (void );void board_poweroff (void ); +#ifdef CONFIG_POWER_INIT +int power_board_init (void ); +#endif #if defined(CONFIG_SYS_DRAM_TEST )int testdram (void );
Signature · 1 line
1.7.2.3
PATCH v2 5/21 pmic: Introduce power_board_init() method at ./lib/board.c file
Quoted 7 lines · Lukasz Majewski
It is necessary to introduce a new system wide function-
power_board_init()It turns out, that power initialization must be done as early as possible. In the case of PMIC framework redesign, which aims to support multiple instances of PMIC devices the initialization shall be performed just after malloc configuration.
Quoted 8 lines
The
arch_early_init_r()could be used instead, but it doesn't reflect that the "power" subsystem is going to be initialized.Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Changes for v2:
- None
Hi Lucasz,
only to make some order. We have already several entries that calls board specific functions.
There is at least board_init() and board_late_init(). The last one was use mostly for the pmic initialization up nowm because it is called after malloc_init().
Now you want to add a new one. This means we have cases where the PMIC must be initialized before flash, right ?
We use often the "weak" mechanism to avoid that a board maintainer is constrained to implement an empty function only to make happy the linker. It is better to declare the function as weak and call it with the same schema, such as board_power_init() (several board_* are weak)
Quoted 10 lines
--- arch/arm/lib/board.c | 4 ++++ include/common.h | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-)arch/arm/lib/board.c +0
-0
arch/arm/lib/board.c void board_init_r(gd_t *id, ulong dest_addr) · line 517
Quoted 5 lines
arch/arm/lib/board.c +2
-0@@ -513,6 +513,10 @@ void board_init_r(gd_t *id, ulong dest_addr)arch_early_init_r ();#endif +#ifdef CONFIG_POWER_INIT +power_board_init ();
Do we need a config option only for calling this ? I think that the decision can be taken with CONFIG_PMIC, declaring the function as weak.
Quoted 11 lines
arch/arm/lib/board.c +2
-0+#endif +#if !defined(CONFIG_SYS_NO_FLASH )puts ("Flash: " );include/common.h +0
-0
include/common.h int board_late_init (void); · line 495
Quoted 9 lines
include/common.h +3
-0@@ -487,6 +487,9 @@ int board_late_init (void);int board_postclk_init (void );/* after clocks/timebase, before env/serial */ int board_early_init_r (void );void board_poweroff (void ); +#ifdef CONFIG_POWER_INIT +int power_board_init (void ); +#endif #if defined(CONFIG_SYS_DRAM_TEST )int testdram (void );
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 5/21 pmic: Introduce power_board_init() method at ./lib/board.c file
Hi Stefano,
Quoted 23 lines · Lukasz Majewski
Quoted 8 lines
It is necessary to introduce a new system wide function-
power_board_init()It turns out, that power initialization must be done as early as possible. In the case of PMIC framework redesign, which aims to support multiple instances of PMIC devices the initialization shall be performed just after malloc configuration.
Quoted 8 lines
The
arch_early_init_r()could be used instead, but it doesn't reflect that the "power" subsystem is going to be initialized.Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Changes for v2:
- NoneHi Lucasz,
only to make some order. We have already several entries that calls board specific functions.
Quoted 6 lines
There is at least
board_init()andboard_late_init(). The last one was use mostly for the pmic initialization up nowm because it is called aftermalloc_init().Now you want to add a new one. This means we have cases where the PMIC must be initialized before flash, right ?
The case is that PMIC (and other devices) needs to be setup after malloc init and before MMC (in our case).
The board_init() is before malloc init and board_late_init() is after MMC initialization for which working PMIC is necessary. PMIC_v1 works since there is a single, static instance of PMIC device (no lists needed).
Filling the above gap was my motivation to define special callback for power.
In the ./arch/arm/lib/board.c there is
#ifdef CONFIG_ARCH_EARLY_INIT_R arch_early_init_r();
#endif
Which could be used and defined at e.g. ./boards/samsung/trats.c However it is only ARM specific (not available at PPC) and the name is a bit misleading. (frankly speaking it is a dead code).
Quoted 5 lines
We use often the "weak" mechanism to avoid that a board maintainer is constrained to implement an empty function only to make happy the linker. It is better to declare the function as weak and call it with the same schema, such as
board_power_init()(several board_* are weak)
Correct me if I'm wrong, but weren't we recently trying to remove functions defined as weak? One of arguments was that weak function will allow to build a u-boot.bin, which then crash at null pointer dereference when proper CONFIG not selected.
Quoted 14 lines
Quoted 14 lines
--- arch/arm/lib/board.c | 4 ++++ include/common.h | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-)arch/arm/lib/board.c +0
-0@@ -513,6 +513,10 @@ void board_init_r(gd_t *id, ulong dest_addr)arch_early_init_r ();#endif
Quoted 6 lines
arch/arm/lib/board.c void board_init_r(gd_t *id, ulong dest_addr) · line 517
Quoted 2 lines
arch/arm/lib/board.c +2
-0+#ifdef CONFIG_POWER_INIT +power_board_init ();Do we need a config option only for calling this ? I think that the decision can be taken with
CONFIG_PMIC, declaring the function as weak.
This is one of options -> __weak power_board_init() would be defined when no CONFIG_PMIC defined.
Good idea, since one CONFIG_POWER_* option would be removed.
Quoted 25 lines
Quoted 12 lines
arch/arm/lib/board.c +2
-0+#endif +#if !defined(CONFIG_SYS_NO_FLASH )puts ("Flash: " );include/common.h +0
-0include/common.h int board_late_init (void); · line 495
Quoted 9 lines
include/common.h +3
-0@@ -487,6 +487,9 @@ int board_late_init (void);int board_postclk_init (void );/* after clocks/timebase, before env/serial */ int board_early_init_r (void );void board_poweroff (void ); +#ifdef CONFIG_POWER_INIT +int power_board_init (void ); +#endif #if defined(CONFIG_SYS_DRAM_TEST )int testdram (void );Best regards,
Stefano Babic
Signature · 5 lines
Best regards, Lukasz Majewski Samsung Poland R&D Center | Linux Platform Group
PATCH v2 5/21 pmic: Introduce power_board_init() method at ./lib/board.c file
Quoted 9 lines · Lukasz Majewski
Quoted 2 lines
Now you want to add a new one. This means we have cases where the PMIC must be initialized before flash, right ?
The case is that PMIC (and other devices) needs to be setup after malloc init and before MMC (in our case).
Theboard_init()is before malloc init andboard_late_init()is after MMC initialization for which working PMIC is necessary.PMIC_v1works since there is a single, static instance of PMIC device (no lists needed).
Ok
Quoted 9 lines
Filling the above gap was my motivation to define special callback for power.
In the
./arch/arm/lib/board.cthere is#ifdef CONFIG_ARCH_EARLY_INIT_R arch_early_init_r();#endif
arch_early_init_r has nothing to do with power management
Quoted 4 lines
Which could be used and defined at e.g.
./boards/samsung/trats.cHowever it is only ARM specific (not available at PPC) and the name is a bit misleading. (frankly speaking it is a dead code).
Agree
Quoted 8 lines
Quoted 5 lines
We use often the "weak" mechanism to avoid that a board maintainer is constrained to implement an empty function only to make happy the linker. It is better to declare the function as weak and call it with the same schema, such as
board_power_init()(several board_* are weak)Correct me if I'm wrong, but weren't we recently trying to remove functions defined as weak?
I am not aware of it. I see several patches in last days adding weak function. Several weak function are present in the recent added SPL framework.
Quoted 3 lines
One of arguments was that weak function will
allow to build a u-boot.bin, which then crash at null pointer dereference when proper CONFIG not selected.
I think that if there is a general agreement to drop the weak functions, this must be done coherent for the whole code. However, I have not seen that weak functions are rejected, and they are currently used in many parts.
Quoted 7 lines
Quoted 3 lines
Do we need a config option only for calling this ? I think that the decision can be taken with
CONFIG_PMIC, declaring the function as weak.This is one of options ->
__weakpower_board_init()would be defined when noCONFIG_PMICdefined.
Good idea, since one CONFIG_POWER_* option would be removed.
Right
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 5/21 pmic: Introduce power_board_init() method at ./lib/board.c file
Quoted 1 line · Stefano Babic
On 09/10/2012 12:25, Lukasz Majewski wrote:
[snip]
Quoted 11 lines
Quoted 7 lines
Quoted 4 lines
We use often the "weak" mechanism to avoid that a board maintainer is constrained to implement an empty function only to make happy the linker. It is better to declare the function as weak and call it with the same schema, such as
board_power_init()(several board_* are weak)Correct me if I'm wrong, but weren't we recently trying to remove functions defined as weak?
I am not aware of it. I see several patches in last days adding weak function. Several weak function are present in the recent added SPL framework.
We should use weak functions when we can provide a functioning in many cases default but need to allow for overrides in some cases. We shouldn't use them when everyone needs to define the function and it has to do something.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20121009/1401dfdb/attachment.pgp>
PATCH v2 5/21 pmic: Introduce power_board_init() method at ./lib/board.c file
Hi Tom,
Quoted 12 lines · Stefano Babic
Quoted 1 line · Lukasz Majewski
[snip]
Quoted 9 lines
Quoted 8 lines
Quoted 5 lines
We use often the "weak" mechanism to avoid that a board maintainer is constrained to implement an empty function only to make happy the linker. It is better to declare the function as weak and call it with the same schema, such as
board_power_init()(several board_* are weak)Correct me if I'm wrong, but weren't we recently trying to remove functions defined as weak?
Quoted 9 lines
Quoted 3 lines
I am not aware of it. I see several patches in last days adding weak function. Several weak function are present in the recent added SPL framework.
We should use weak functions when we can provide a functioning in many cases default but need to allow for overrides in some cases. We shouldn't use them when everyone needs to define the function and it has to do something.
Ok, thanks for clarification :-).
I will define and use board_power_init() as a __weak function.
Signature · 5 lines
Best regards, Lukasz Majewski Samsung Poland R&D Center | Linux Platform Group
PATCH v2 6/21 pmic: Enable power_board_init() support at TRATS
In reply to Lukasz MajewskiEnable support for power_board_init() method at TRATS board.
---
Changes for v2:
- None
--- board/samsung/trats/trats.c | 15 +++++++++++---- include/configs/trats.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-)
board/samsung/trats/trats.c +11 -4
@@ -68,10 +68,6 @@ int board_init(void)check_hw_revision ();printf ("HW Revision:\t0x%x\n" , board_rev); -#if defined(CONFIG_PMIC ) -pmic_init (I2C_5 ); -#endif -return 0 ; }
@@ -90,6 +86,17 @@ void i2c_init_board(void)s5p_gpio_direction_output (&gpio2->y4,1 ,1 ); } +#ifdef CONFIG_POWER_INIT +int power_board_init (void ) +{ + +#ifdef CONFIG_PMIC +pmic_init (I2C_5 ); +#endif +return 0 ; +} +#endif +int dram_init (void ) { gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE) +
include/configs/trats.h +1 -0
@@ -235,6 +235,7 @@#define CONFIG_SOFT_I2C_GPIO_SDA get_multi_sda_pin()#define I2C_INIT multi_i2c_init() +#define CONFIG_POWER_INIT #define CONFIG_PMIC #define CONFIG_PMIC_I2C #define CONFIG_PMIC_MAX8997
Signature · 1 line
1.7.2.3
PATCH v2 6/21 pmic: Enable power_board_init() support at TRATS
Quoted 34 lines · Lukasz Majewski
Enable support for
power_board_init()method at TRATS board.Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Changes for v2:
- None--- board/samsung/trats/trats.c | 15 +++++++++++---- include/configs/trats.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-)board/samsung/trats/trats.c +1
-4@@ -68,10 +68,6 @@ int board_init(void)check_hw_revision ();printf ("HW Revision:\t0x%x\n" , board_rev); -#if defined(CONFIG_PMIC ) -pmic_init (I2C_5 ); -#endif -return 0 ; }@@ -90,6 +86,17 @@ void i2c_init_board(void)s5p_gpio_direction_output (&gpio2->y4,1 ,1 ); } +#ifdef CONFIG_POWER_INIT
board/samsung/trats/trats.c void i2c_init_board(void) · line 99
Quoted 10 lines
board/samsung/trats/trats.c +10
-0+int power_board_init (void ) +{ + +#ifdef CONFIG_PMIC +pmic_init (I2C_5 ); +#endif +return 0 ; +} +#endif +
This enforces my comment in previous patch. We have two CONFIG_ options, both must be turned on. So at least one is redundant.IMHO you can drop both of them if power_board_init() is declared weak.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 6/21 pmic: Enable power_board_init() support at TRATS
Hi Stefano,
Quoted 34 lines · Lukasz Majewski
Quoted 33 lines
Enable support for
power_board_init()method at TRATS board.Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Changes for v2:
- None--- board/samsung/trats/trats.c | 15 +++++++++++---- include/configs/trats.h | 1 + 2 files changed, 12 insertions(+), 4 deletions(-)(quoted diff) +0
-0
b/board/samsung/trats/trats.cindex 80ec4ad..0285668 100644board/samsung/trats/trats.c +0
-4@@ -68,10 +68,6 @@ int board_init(void)check_hw_revision ();printf ("HW Revision:\t0x%x\n" , board_rev); -#if defined(CONFIG_PMIC ) -pmic_init (I2C_5 ); -#endif -return 0 ; }@@ -90,6 +86,17 @@ void i2c_init_board(void)s5p_gpio_direction_output (&gpio2->y4,1 ,1 ); }
Quoted 15 lines
board/samsung/trats/trats.c void i2c_init_board(void) · line 99
Quoted 11 lines
board/samsung/trats/trats.c +11
-0+#ifdef CONFIG_POWER_INIT +int power_board_init (void ) +{ + +#ifdef CONFIG_PMIC +pmic_init (I2C_5 ); +#endif +return 0 ; +} +#endif +This enforces my comment in previous patch. We have two
CONFIG_options, both must be turned on. So at least one is redundant.IMHO you can drop both of them ifpower_board_init()is declared weak.
I can define power_board_init() as __weak if you are OK with this :-). In this case for sure CONFIG_POWER_INIT could be removed.
I agree that CONFIG_PMIC can be removed from this piece of code.
Quoted 4 lines
Best regards,
Stefano Babic
Signature · 5 lines
Best regards, Lukasz Majewski Samsung Poland R&D Center | Linux Platform Group
PATCH v2 6/21 pmic: Enable power_board_init() support at TRATS
Quoted 5 lines · Lukasz Majewski
Quoted 3 lines
This enforces my comment in previous patch. We have two
CONFIG_options, both must be turned on. So at least one is redundant.IMHO you can drop both of them ifpower_board_init()is declared weak.I can define
power_board_init()as__weakif you are OK with this :-).
IMHO yes, and call it board_power_init(). We know directly from the name that board_* function are often declared weak.
Quoted 5 lines
In this case for sure
CONFIG_POWER_INITcould be removed.I agree that
CONFIG_PMICcan be removed from this piece of code.Quoted 1 line
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 6/21 pmic: Enable power_board_init() support at TRATS
Hi Stefano,
Quoted 11 lines · Lukasz Majewski
Quoted 7 lines
Quoted 4 lines
This enforces my comment in previous patch. We have two
CONFIG_options, both must be turned on. So at least one is redundant.IMHO you can drop both of them ifpower_board_init()is declared weak.I can define
power_board_init()as__weakif you are OK with this :-).IMHO yes, and call it
board_power_init(). We know directly from the name that board_* function are often declared weak.
Ok, I will prepare v3 of this patch set.
Quoted 12 lines
Quoted 7 lines
In this case for sure
CONFIG_POWER_INITcould be removed.I agree that
CONFIG_PMICcan be removed from this piece of code.Quoted 1 line
Best regards,
Stefano Babic
Signature · 5 lines
Best regards, Lukasz Majewski Samsung Poland R&D Center | Linux Platform Group
PATCH v2 7/21 pmic:chrg: Common information about charger and battery (power_chrg.h)
In reply to Lukasz MajewskiNew power_chrg.h file has been added to "bind" together common information about charging battery available in the system.
---
Changes for v2:
- Move struct battery elements to a separate file
--- include/power/power_chrg.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) create mode 100644 include/power/power_chrg.h
include/power/power_chrg.h new file +43 -0
@@ -0,0 +1,43 @@ +/* +* Copyright (C) 2012 Samsung Electronics +* Lukasz Majewski <[email protected]> +* +* 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 +*/ + +#ifndef __POWER_CHARGER_H_ +#define __POWER_CHARGER_H_ + +/* Type of available chargers */ +enum { +CHARGER_NO =0 , +CHARGER_TA , +CHARGER_USB , +CHARGER_TA_500 , +CHARGER_UNKNOWN , +}; + +enum { +UNKNOWN , +EXT_SOURCE , +CHARGE , +NORMAL , +}; + +#endif /* __POWER_CHARGER_H_ */
Signature · 1 line
1.7.2.3
PATCH v2 8/21 pmic: Move pmic related code to ./drivers/power directory
In reply to Lukasz MajewskiThe PMIC framework has been moved to its more natural place ./drivers/power from ./drivers/misc directory.
---
Changes for v2:
- New patch for v2
---
drivers/misc/Makefile | 7 -------
drivers/power/Makefile | 8 ++++++++
drivers/{misc => power/max8997}/pmic_max8997.c | 0
drivers/{misc => power/max8998}/pmic_max8998.c | 0
drivers/{misc => power}/pmic_core.c | 0
drivers/{misc => power}/pmic_dialog.c | 0
drivers/{misc => power}/pmic_fsl.c | 0
drivers/{misc => power}/pmic_i2c.c | 0
drivers/{misc => power}/pmic_spi.c | 0
9 files changed, 8 insertions(+), 7 deletions(-)
rename drivers/{misc => power/max8997}/pmic_max8997.c (100%)
rename drivers/{misc => power/max8998}/pmic_max8998.c (100%)
rename drivers/{misc => power}/pmic_core.c (100%)
rename drivers/{misc => power}/pmic_dialog.c (100%)
rename drivers/{misc => power}/pmic_fsl.c (100%)
rename drivers/{misc => power}/pmic_i2c.c (100%)
rename drivers/{misc => power}/pmic_spi.c (100%)drivers/misc/Makefile +0 -7
@@ -34,13 +34,6 @@ COBJS-$(CONFIG_NS87308) += ns87308.o COBJS-$(CONFIG_PDSP188x) += pdsp188x.o COBJS-$(CONFIG_STATUS_LED) += status_led.o COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o -COBJS-$(CONFIG_PMIC) += pmic_core.o -COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o -COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o -COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o -COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o -COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o -COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/power/Makefile +8 -0
@@ -31,6 +31,14 @@ COBJS-$(CONFIG_TWL4030_POWER) += twl4030.o COBJS-$(CONFIG_TWL6030_POWER) += twl6030.o COBJS-$(CONFIG_TWL6035_POWER) += twl6035.o +COBJS-$(CONFIG_PMIC) += pmic_core.o +COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o +COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o +COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o +COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o +COBJS-$(CONFIG_PMIC_MAX8998) += max8998/pmic_max8998.o +COBJS-$(CONFIG_PMIC_MAX8997) += max8997/pmic_max8997.o + COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
drivers/power/max8997/pmic_max8997.c renamed from drivers/misc/pmic_max8997.c +0 -0
drivers/power/max8998/pmic_max8998.c renamed from drivers/misc/pmic_max8998.c +0 -0
drivers/power/pmic_core.c renamed from drivers/misc/pmic_core.c +0 -0
drivers/power/pmic_dialog.c renamed from drivers/misc/pmic_dialog.c +0 -0
drivers/power/pmic_fsl.c renamed from drivers/misc/pmic_fsl.c +0 -0
drivers/power/pmic_i2c.c renamed from drivers/misc/pmic_i2c.c +0 -0
drivers/power/pmic_spi.c renamed from drivers/misc/pmic_spi.c +0 -0
Signature · 1 line
1.7.2.3
PATCH v2 8/21 pmic: Move pmic related code to ./drivers/power directory
drivers/power/pmic_spi.c
Quoted 93 lines · Lukasz Majewski
The PMIC framework has been moved to its more natural place
./drivers/powerfrom./drivers/miscdirectory.Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Changes for v2:
- New patch for v2--- drivers/misc/Makefile | 7 ------- drivers/power/Makefile | 8 ++++++++ drivers/{misc => power/max8997}/pmic_max8997.c | 0 drivers/{misc => power/max8998}/pmic_max8998.c | 0 drivers/{misc => power}/pmic_core.c | 0 drivers/{misc => power}/pmic_dialog.c | 0 drivers/{misc => power}/pmic_fsl.c | 0 drivers/{misc => power}/pmic_i2c.c | 0 drivers/{misc => power}/pmic_spi.c | 0 9 files changed, 8 insertions(+), 7 deletions(-) rename drivers/{misc => power/max8997}/pmic_max8997.c (100%) rename drivers/{misc => power/max8998}/pmic_max8998.c (100%) rename drivers/{misc => power}/pmic_core.c (100%) rename drivers/{misc => power}/pmic_dialog.c (100%) rename drivers/{misc => power}/pmic_fsl.c (100%) rename drivers/{misc => power}/pmic_i2c.c (100%) rename drivers/{misc => power}/pmic_spi.c (100%)drivers/misc/Makefile +0
-7@@ -34,13 +34,6 @@ COBJS-$(CONFIG_NS87308) += ns87308.o COBJS-$(CONFIG_PDSP188x) += pdsp188x.o COBJS-$(CONFIG_STATUS_LED) += status_led.o COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o -COBJS-$(CONFIG_PMIC) += pmic_core.o -COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o -COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o -COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o -COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o -COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o -COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)drivers/power/Makefile +8
-0@@ -31,6 +31,14 @@ COBJS-$(CONFIG_TWL4030_POWER) += twl4030.o COBJS-$(CONFIG_TWL6030_POWER) += twl6030.o COBJS-$(CONFIG_TWL6035_POWER) += twl6035.o +COBJS-$(CONFIG_PMIC) += pmic_core.o +COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o +COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o +COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o +COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o +COBJS-$(CONFIG_PMIC_MAX8998) += max8998/pmic_max8998.o +COBJS-$(CONFIG_PMIC_MAX8997) += max8997/pmic_max8997.o + COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))drivers/power/max8997/pmic_max8997.c renamed from drivers/misc/pmic_max8997.c +0
-0drivers/power/max8998/pmic_max8998.c renamed from drivers/misc/pmic_max8998.c +0
-0drivers/power/pmic_core.c renamed from drivers/misc/pmic_core.c +0
-0drivers/power/pmic_dialog.c renamed from drivers/misc/pmic_dialog.c +0
-0drivers/power/pmic_fsl.c renamed from drivers/misc/pmic_fsl.c +0
-0drivers/power/pmic_i2c.c renamed from drivers/misc/pmic_i2c.c +0
-0drivers/power/pmic_spi.c renamed from drivers/misc/pmic_spi.c +0
-0
Fully agree.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 8/21 pmic: Move pmic related code to ./drivers/power directory
Hi Stefano,
Quoted 97 lines · Lukasz Majewski
drivers/power/pmic_spi.c
Quoted 93 lines
The PMIC framework has been moved to its more natural place
./drivers/powerfrom./drivers/miscdirectory.Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Changes for v2:
- New patch for v2--- drivers/misc/Makefile | 7 ------- drivers/power/Makefile | 8 ++++++++ drivers/{misc => power/max8997}/pmic_max8997.c | 0 drivers/{misc => power/max8998}/pmic_max8998.c | 0 drivers/{misc => power}/pmic_core.c | 0 drivers/{misc => power}/pmic_dialog.c | 0 drivers/{misc => power}/pmic_fsl.c | 0 drivers/{misc => power}/pmic_i2c.c | 0 drivers/{misc => power}/pmic_spi.c | 0 9 files changed, 8 insertions(+), 7 deletions(-) rename drivers/{misc => power/max8997}/pmic_max8997.c (100%) rename drivers/{misc => power/max8998}/pmic_max8998.c (100%) rename drivers/{misc => power}/pmic_core.c (100%) rename drivers/{misc => power}/pmic_dialog.c (100%) rename drivers/{misc => power}/pmic_fsl.c (100%) rename drivers/{misc => power}/pmic_i2c.c (100%) rename drivers/{misc => power}/pmic_spi.c (100%)drivers/misc/Makefile +0
-7@@ -34,13 +34,6 @@ COBJS-$(CONFIG_NS87308) += ns87308.o COBJS-$(CONFIG_PDSP188x) += pdsp188x.o COBJS-$(CONFIG_STATUS_LED) += status_led.o COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o -COBJS-$(CONFIG_PMIC) += pmic_core.o -COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o -COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o -COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o -COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o -COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o -COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)drivers/power/Makefile +8
-0@@ -31,6 +31,14 @@ COBJS-$(CONFIG_TWL4030_POWER) += twl4030.o COBJS-$(CONFIG_TWL6030_POWER) += twl6030.o COBJS-$(CONFIG_TWL6035_POWER) += twl6035.o +COBJS-$(CONFIG_PMIC) += pmic_core.o +COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o +COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o +COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o +COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o +COBJS-$(CONFIG_PMIC_MAX8998) += max8998/pmic_max8998.o +COBJS-$(CONFIG_PMIC_MAX8997) += max8997/pmic_max8997.o + COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))(quoted diff) +0
-0
b/drivers/power/max8997/pmic_max8997.csimilarity index 100% rename fromdrivers/misc/pmic_max8997.c
rename todrivers/power/max8997/pmic_max8997.c(quoted diff) +0
-0
b/drivers/power/max8998/pmic_max8998.csimilarity index 100% rename fromdrivers/misc/pmic_max8998.c
rename todrivers/power/max8998/pmic_max8998.cdrivers/power/pmic_core.c renamed from drivers/misc/pmic_core.c +0
-0(quoted diff) +0
-0
b/drivers/power/pmic_dialog.csimilarity index 100% rename fromdrivers/misc/pmic_dialog.crename todrivers/power/pmic_dialog.cdrivers/power/pmic_fsl.c renamed from drivers/misc/pmic_fsl.c +0
-0drivers/power/pmic_i2c.c renamed from drivers/misc/pmic_i2c.c +0
-0drivers/power/pmic_spi.c renamed from drivers/misc/pmic_spi.c +0
-0Fully agree.
Quoted 1 line
Acked-by Stefano Babic <[email protected]>
Some names haven't been changed (e.g. pmic_core.c -> power_core.c). This is to reduce number of changes in the patch series and keep the PMIC subsystem working.
Further rename (PMIC->POWER) will be performed when the initial PMIC_v2.0 would be merged to mainline.
I simply want to avoid changing too many things at a time (now the patch series counts of 21 patches).
Signature · 5 lines
Best regards, Lukasz Majewski Samsung Poland R&D Center | Linux Platform Group
PATCH v2 9/21 pmic: Extend struct pmic to support battery and charger related operations
In reply to Lukasz MajewskiNow it is possible to provide specific function per PMIC/power device instance.
---
Changes for v2:
- New at patch v2
--- include/power/battery.h | 38 ++++++++++++++++++++++++++++++++++++++ include/power/pmic.h | 23 ++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletions(-) create mode 100644 include/power/battery.h
include/power/battery.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Copyright (C) 2012 Samsung Electronics +* Lukasz Majewski <[email protected]> +* +* 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 +*/ + +#ifndef __POWER_BATTERY_H_ +#define __POWER_BATTERY_H_ + +struct battery { +unsigned int version; +unsigned int state_of_chrg; +unsigned int time_to_empty; +unsigned int capacity; +unsigned int voltage_uV; + +unsigned int state; +}; + +int power_bat_init (unsigned char bus); +#endif /* __POWER_BATTERY_H_ */
include/power/pmic.h +22 -1
@@ -27,8 +27,9 @@#include <common.h> #include <linux/list.h> #include <i2c.h> +#include <power/power_chrg.h> -enum {PMIC_I2C ,PMIC_SPI , }; +enum {PMIC_I2C ,PMIC_SPI ,PMIC_NONE };enum {I2C_PMIC ,I2C_NUM , };enum {PMIC_READ ,PMIC_WRITE , };enum {PMIC_BYTE_ORDER_REVERSED ,PMIC_BYTE_ORDER_NORMAL , };
@@ -48,6 +49,21 @@ struct p_spi {u32 (*prepare_tx)(u32 reg,u32 *val,u32 write); }; +struct pmic ; +struct power_battery { +struct battery *bat; + +int (*fg_battery_check) (struct pmic *p,struct pmic *bat); +int (*fg_battery_update) (struct pmic *p,struct pmic *bat); + +int (*chrg_type) (struct pmic *p); +int (*chrg_bat_present) (struct pmic *p); +int (*chrg_state) (struct pmic *p,int state,int current); + +/* Keep info about power devices involved with battery operation */ +struct pmic *chrg, *fg, *muic; +}; +struct pmic {const char *name;unsigned char bus;
@@ -59,6 +75,11 @@ struct pmic {struct p_spi spi; } hw; +struct power_battery *pwr_bat; +int (*battery_init) (struct pmic *p,struct pmic *bat); +int (*battery_charge) (struct pmic *bat); +void (*low_power_mode) (void ); +struct list_head list; };
Signature · 1 line
1.7.2.3
PATCH v2 9/21 pmic: Extend struct pmic to support battery and charger related operations
Am 05/10/2012 10:16, schrieb Lukasz Majewski:
Quoted 9 lines
Now it is possible to provide specific function per PMIC/power device instance.
Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Changes for v2:
- New at patch v2
---
Hi Lucasz,
Quoted 87 lines
include/power/battery.h | 38 ++++++++++++++++++++++++++++++++++++++ include/power/pmic.h | 23 ++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletions(-) create mode 100644 include/power/battery.hinclude/power/battery.h new file +38
-0@@ -0,0 +1,38 @@ +/* +* Copyright (C) 2012 Samsung Electronics +* Lukasz Majewski <[email protected]> +* +* 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 +*/ + +#ifndef __POWER_BATTERY_H_ +#define __POWER_BATTERY_H_ + +struct battery { +unsigned int version; +unsigned int state_of_chrg; +unsigned int time_to_empty; +unsigned int capacity; +unsigned int voltage_uV; + +unsigned int state; +}; + +int power_bat_init (unsigned char bus); +#endif /* __POWER_BATTERY_H_ */ include/power/pmic.h +17
-1@@ -27,8 +27,9 @@#include <common.h> #include <linux/list.h> #include <i2c.h> +#include <power/power_chrg.h> -enum {PMIC_I2C ,PMIC_SPI , }; +enum {PMIC_I2C ,PMIC_SPI ,PMIC_NONE };enum {I2C_PMIC ,I2C_NUM , };enum {PMIC_READ ,PMIC_WRITE , };enum {PMIC_BYTE_ORDER_REVERSED ,PMIC_BYTE_ORDER_NORMAL , };@@ -48,6 +49,21 @@ struct p_spi {u32 (*prepare_tx)(u32 reg,u32 *val,u32 write); }; +struct pmic ; +struct power_battery { +struct battery *bat; + +int (*fg_battery_check) (struct pmic *p,struct pmic *bat); +int (*fg_battery_update) (struct pmic *p,struct pmic *bat); + +int (*chrg_type) (struct pmic *p); +int (*chrg_bat_present) (struct pmic *p); +int (*chrg_state) (struct pmic *p,int state,int current); + +/* Keep info about power devices involved with battery operation */ +struct pmic *chrg, *fg, *muic; +}; +struct pmic {const char *name;unsigned char bus;
include/power/pmic.h struct pmic { · line 79
Quoted 5 lines
include/power/pmic.h +2
-0@@ -59,6 +75,11 @@ struct pmic {struct p_spi spi; } hw; +struct power_battery *pwr_bat; +int (*battery_init) (struct pmic *p,struct pmic *bat);
If we add entry points to the pmic structure, I do not expect to pass the pointer of the structure itself, or I could call the function with another pointer:
p->battery_init(p1, bat);
So p should be hide, stored during the initialization of PMIC itself.
include/power/pmic.h struct pmic { · line 85
Quoted 6 lines
include/power/pmic.h +3
-0+int (*battery_charge) (struct pmic *bat); +void (*low_power_mode) (void ); +struct list_head list; };
I have some concerns regarding this structure. It seems to me very coupled to the PMIC you are using.
Reading this and the next patches it seems to me that is due because your PMIC includes other three PMICs. However, IMHO the interface presented before this patch is very clear.
I have expected something as:
P = get_pmic("CHRG");
p->chrg_state(current);And if the problem is that this PMIC really descend from another one, we could add a "struct pmic *parent" in the pmic itself. You already introduced lists, and we can work with pointer instead of hard-code the subpmics as in :
struct pmic *chrg, *fg, *muic;
In this case, if we have a pmic that logically can be seen with a different number of pmics, we can still support.
You introduce PMIC_NONE to tell that this pmic does not have an own data transfer and rely on another one. But again, this could be solved using
if (p->parent) p->i2c....
or something like this to use the transfer method of the "main" PMIC.
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH v2 9/21 pmic: Extend struct pmic to support battery and charger related operations
Hi Stefano,
Quoted 126 lines
Am 05/10/2012 10:16, schrieb Lukasz Majewski:
Quoted 9 lines
Now it is possible to provide specific function per PMIC/power device instance.
Signed-off-by Lukasz Majewski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
Changes for v2:
- New at patch v2
---Hi Lucasz,
Quoted 89 lines
include/power/battery.h | 38++++++++++++++++++++++++++++++++++++++
include/power/pmic.h|
23 ++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletions(-) create mode 100644include/power/battery.hinclude/power/battery.h new file +18
-0@@ -0,0 +1,38 @@ +/* +* Copyright (C) 2012 Samsung Electronics +* Lukasz Majewski <[email protected]> +* +* 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/power/battery.h new file +16
-0+ +#ifndef __POWER_BATTERY_H_ +#define __POWER_BATTERY_H_ + +struct battery { +unsigned int version; +unsigned int state_of_chrg; +unsigned int time_to_empty; +unsigned int capacity; +unsigned int voltage_uV; + +unsigned int state; +}; + +int power_bat_init (unsigned char bus); +#endif /* __POWER_BATTERY_H_ */ include/power/pmic.h +13
-1@@ -27,8 +27,9 @@#include <common.h> #include <linux/list.h> #include <i2c.h> +#include <power/power_chrg.h> -enum {PMIC_I2C ,PMIC_SPI , }; +enum {PMIC_I2C ,PMIC_SPI ,PMIC_NONE };enum {I2C_PMIC ,I2C_NUM , };enum {PMIC_READ ,PMIC_WRITE , };enum {PMIC_BYTE_ORDER_REVERSED ,PMIC_BYTE_ORDER_NORMAL , };@@ -48,6 +49,21 @@ struct p_spi {u32 (*prepare_tx)(u32 reg,u32 *val,u32 write); }; +struct pmic ; +struct power_battery { +struct battery *bat; + +int (*fg_battery_check) (struct pmic *p,struct pmic *bat); +int (*fg_battery_update) (struct pmic *p,struct pmic *bat); + +int (*chrg_type) (struct pmic *p); +int (*chrg_bat_present) (struct pmic *p); +int (*chrg_state) (struct pmic *p,int state,int current); + +/* Keep info about power devices involved with battery operation */
include/power/pmic.h +3
-0+struct pmic *chrg, *fg, *muic; +}; +struct pmic {const char *name;unsigned char bus;include/power/pmic.h struct pmic { · line 79
Quoted 5 lines
include/power/pmic.h +2
-0@@ -59,6 +75,11 @@ struct pmic {struct p_spi spi; } hw; +struct power_battery *pwr_bat; +int (*battery_init) (struct pmic *p,struct pmic *bat);If we add entry points to the pmic structure, I do not expect to pass the pointer of the structure itself, or I could call the function with another pointer:
p->battery_init(p1, bat);So p should be hide, stored during the initialization of PMIC itself
include/power/pmic.h struct pmic { · line 85
Quoted 6 lines
include/power/pmic.h +3
-0+int (*battery_charge) (struct pmic *bat); +void (*low_power_mode) (void ); +struct list_head list; };I have some concerns regarding this structure. It seems to me very coupled to the PMIC you are using.
Quoted 8 lines
Reading this and the next patches it seems to me that is due because your PMIC includes other three PMICs. However, IMHO the interface presented before this patch is very clear.
I have expected something as:
P = get_pmic("CHRG"); p->chrg_state(current);
I use explicit name to get access to e.g. charger (instead of "CHRG" I use "MAX8997_PMIC"). We can define the "CHRG"
at ./include/configs/{board.h} file as #define CHRG MAX8997_PMIC. This is not a problem.
Quoted 6 lines
And if the problem is that this PMIC really descend from another one, we could add a "struct pmic *parent" in the pmic itself. You already introduced lists, and we can work with pointer instead of hard-code the subpmics as in :
struct pmic *chrg, *fg, *muic;
I've considered using of "parents" there. But for the sake of simpler code (or rather simpler logical view), I wanted to use the "flat" structure.
The "flat" structure is OK with PMIC, MUIC, Fuel gauge (since those are in the same "level".
The problem is with battery, since it hasn't got an physical interface (I2C) and uses other PMIC devices to retain its state (charging state)
Quoted 11 lines
In this case, if we have a pmic that logically can be seen with a different number of pmics, we can still support.
You introducePMIC_NONEto tell that this pmic does not have an own data transfer and rely on another one. But again, this could be solved usingif (p->parent) p->i2c....or something like this to use the transfer method of the "main" PMIC.
I will think how redesign the proposed code to use "parent" child structure.
(I hope that the patch series won't grow much more then :-) )
Signature · 5 lines
Best regards, Lukasz Majewski Samsung Poland R&D Center | Linux Platform Group
PATCH v2 9/21 pmic: Extend struct pmic to support battery and charger related operations [explanation]
In reply to Stefano BabicHi Stefano,
I'd like to present an overview of my idea (pseudo code):
struct battery {
int (* battery_charge) ()
struct pmic *fg, *muic, *chrg
}
struct chrg {
int (*chrg_type) ()
int (*chrg_bat_present) ()
int (*chrg_state) ()
}struct fg {
int (*fg_bat_check) ()
int (*fg_bat_update) ()
}struct muic {
}
Then extend struct pmic:
struct pmic {
struct battery *bat_p;
struct chrg *chrg_p;
struct fg *fg_p;
struct muic *muic_p;
struct pmic *parent;
void (*low_power_mode) ();
}
The struct [battery|chrg|fg|muic] is provided during pmic device initialization (it is defined as a static in a device's translation unit
- e.g. fg_max17042.c)
To solve the problem with multi instances of the same devices (e.g. two identical HW devices - MAX17042 are connected to SOC), methods defined for pmic/power devices accept struct pmic *p of the device instance.
You have suggested, that pmic device shall be a parent. However, I see it differently (at least from my HW):
struct pmic *fg, *muic, *chrg ----------------- --------| BAT |------------ | | | | | ----------------- | | | | \|/ \|/ \|/ ----------- ----------------- --------- |FG | |MUIC | |CHRG | | | | | | | ----------- ----------------- ---------
struct pmic *parent = &bat (for FG, MUIC, CHRG)
(PMIC is also connected to the rest via list)
I think that BAT is parent here, since when we want to e.g. charge the battery we would look for it with:p_bat = pmic_get("BAT_TRATS");
In my opinion it is natural to call p_bat->battery_charge(p_bat) to enable charging and in the same time don't be concerned with "helper" devices (like FG, MUIC, CHRG) - which provide methods to check if battery is charged properly.
Moreover BAT shall be treated as a PMIC device and thereof has its own instance of struct pmic. It is desirable to have all power related devices connected in the list.
The __real__ problem here is how to "connect" functionality provided by FG, CHRG, MUIC with battery, to have easy access:p_bat->battery_charge(p_bat).
One option would be to fill:
struct battery *bat_p;
struct chrg *chrg_p;
struct fg *fg_p;
struct muic *muic_p;
for struct pmic bat.
Then we could access relevant functions just from p_bat.
Signature · 5 lines
Best regards, Lukasz Majewski Samsung Poland R&D Center | Linux Platform Group
PATCH v2 10/21 pmic:battery: Support for Trats Battery at PMIC framework
In reply to Lukasz MajewskiTrats battery is now treated in the same way as other power related devices. This approach allows for more unified handling of all devices responsible for power management.
---
Changes for v2:
- New patch at v2.
--- drivers/power/Makefile | 1 + drivers/power/battery/bat_trats.c | 79 +++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) create mode 100644 drivers/power/battery/bat_trats.c
drivers/power/Makefile +1 -0
@@ -38,6 +38,7 @@ COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o COBJS-$(CONFIG_PMIC_MAX8998) += max8998/pmic_max8998.o COBJS-$(CONFIG_PMIC_MAX8997) += max8997/pmic_max8997.o +COBJS-$(CONFIG_POWER_BATTERY_TRATS) += battery/bat_trats.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/power/battery/bat_trats.c new file +79 -0
79 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH v2 11/21 pmic:muic: Support for MUIC built into MAX8997 device
In reply to Lukasz MajewskiSupport for MUIC (Micro USB Integrated Circuit) built into the MAX8997 power management device.
The MUIC device will work with redesigned PMIC framework.
---
Changes for v2:
- power_init_battery now available as a callback from MUIC struct pmic instance
--- drivers/power/Makefile | 1 + drivers/power/max8997/muic_max8997.c | 91 ++++++++++++++++++++++++++++++++++ include/power/max8997_muic.h | 61 +++++++++++++++++++++++ 3 files changed, 153 insertions(+), 0 deletions(-) create mode 100644 drivers/power/max8997/muic_max8997.c create mode 100644 include/power/max8997_muic.h
drivers/power/Makefile +1 -0
@@ -39,6 +39,7 @@ COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o COBJS-$(CONFIG_PMIC_MAX8998) += max8998/pmic_max8998.o COBJS-$(CONFIG_PMIC_MAX8997) += max8997/pmic_max8997.o COBJS-$(CONFIG_POWER_BATTERY_TRATS) += battery/bat_trats.o +COBJS-$(CONFIG_POWER_MUIC_MAX8997) += max8997/muic_max8997.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/power/max8997/muic_max8997.c new file +91 -0
91 lines not on this page · raw message
include/power/max8997_muic.h new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH v2 12/21 pmic:fuel-gauge: Support for MAX17042 fuel-gauge
In reply to Lukasz MajewskiSupport for MAX17042 fuel-gauge (FG), which is built into the MAX8997 power management device.
Special file - fg_battery_cell_params.h with cells characteristics added.
The FG device will work with redesigned PMIC framework.
---
Changes for v2:
- File moved to separate directory at ./drivers/power
- {check|update}_battery available as callbacks from struct power_battery
--- drivers/power/Makefile | 1 + drivers/power/max17042/fg_max17042.c | 251 ++++++++++++++++++++++++++++++++ include/power/fg_battery_cell_params.h | 90 ++++++++++++ include/power/max17042_fg.h | 74 ++++++++++ 4 files changed, 416 insertions(+), 0 deletions(-) create mode 100644 drivers/power/max17042/fg_max17042.c create mode 100644 include/power/fg_battery_cell_params.h create mode 100644 include/power/max17042_fg.h
drivers/power/Makefile +1 -0
@@ -40,6 +40,7 @@ COBJS-$(CONFIG_PMIC_MAX8998) += max8998/pmic_max8998.o COBJS-$(CONFIG_PMIC_MAX8997) += max8997/pmic_max8997.o COBJS-$(CONFIG_POWER_BATTERY_TRATS) += battery/bat_trats.o COBJS-$(CONFIG_POWER_MUIC_MAX8997) += max8997/muic_max8997.o +COBJS-$(CONFIG_POWER_FG_MAX17042) += max17042/fg_max17042.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/power/max17042/fg_max17042.c new file +251 -0
251 lines not on this page · raw message
include/power/fg_battery_cell_params.h new file +90 -0
90 lines not on this page · raw message
include/power/max17042_fg.h new file +74 -0
74 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH v2 13/21 pmic:max8997: Function for calculating LDO internal register value
In reply to Lukasz MajewskiFunction for calculating LDO internal register value from passed micro Volt.
---
Changes for v2:
- MAX8997_LDO_MAX_VAL defined
--- drivers/power/max8997/pmic_max8997.c | 16 ++++++++++++++++ include/power/max8997_pmic.h | 2 ++ 2 files changed, 18 insertions(+), 0 deletions(-)
drivers/power/max8997/pmic_max8997.c +16 -0
@@ -26,6 +26,22 @@#include <power/max8997_pmic.h> #include <i2c.h> +unsigned char max8997_reg_ldo (int uV) +{ +unsigned char ret; +if (uV <=800000 ) +return 0 ; +if (uV >=3950000 ) +return MAX8997_LDO_MAX_VAL ; + ret = (uV -800000 ) /50000 ; +if (ret >MAX8997_LDO_MAX_VAL ) { +printf ("MAX8997 LDO SETTING ERROR (%duV) -> %u\n" , uV, ret); + ret =MAX8997_LDO_MAX_VAL ; + } + +return ret; +} +int pmic_init (unsigned char bus) {struct pmic *p =pmic_alloc ();
include/power/max8997_pmic.h +2 -0
@@ -200,4 +200,6 @@ enum { EN_LDO = (0x3 << 6), }; +#define MAX8997_LDO_MAX_VAL 0x3F +unsigned char max8997_reg_ldo (int uV);#endif /* __MAX8997_PMIC_H_ */
Signature · 1 line
1.7.2.3
PATCH v2 14/21 arm:trats:pmic: Default PMIC(MAX8997) initialization for Samsung's TRATS board
In reply to Lukasz MajewskiDefault PMIC (MAX8997) initialization for Samsung's TRATS development board.
---
Changes for v2:
- None
--- board/samsung/trats/trats.c | 150 ++++++++++++++++++++++++++++++++++++++++++ include/power/max8997_pmic.h | 9 +++ 2 files changed, 159 insertions(+), 0 deletions(-)
board/samsung/trats/trats.c +150 -0
@@ -86,6 +86,155 @@ void i2c_init_board(void)s5p_gpio_direction_output (&gpio2->y4,1 ,1 ); } +static int pmic_init_max8997 (void ) +{ +struct pmic *p =pmic_get ("MAX8997_PMIC" ); +int i =0 , ret =0 ; +u32 val; + +if (pmic_probe (p)) +return -1 ; + +/* BUCK1 VARM: 1.2V */ + val = (1200000 -650000 ) /25000 ; + ret |=pmic_reg_write (p,MAX8997_REG_BUCK1DVS1 , val); + val =ENBUCK |ACTIVE_DISCHARGE ;/* DVS OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_BUCK1CTRL , val); + +/* BUCK2 VINT: 1.1V */ + val = (1100000 -650000 ) /25000 ; + ret |=pmic_reg_write (p,MAX8997_REG_BUCK2DVS1 , val); + val =ENBUCK |ACTIVE_DISCHARGE ;/* DVS OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_BUCK2CTRL , val); + + +/* BUCK3 G3D: 1.1V - OFF */ + ret |=pmic_reg_read (p,MAX8997_REG_BUCK3CTRL , &val); + val &= ~ENBUCK ; + ret |=pmic_reg_write (p,MAX8997_REG_BUCK3CTRL , val); + + val = (1100000 -750000 ) /50000 ; + ret |=pmic_reg_write (p,MAX8997_REG_BUCK3DVS , val); + +/* BUCK4 CAMISP: 1.2V - OFF */ + ret |=pmic_reg_read (p,MAX8997_REG_BUCK4CTRL , &val); + val &= ~ENBUCK ; + ret |=pmic_reg_write (p,MAX8997_REG_BUCK4CTRL , val); + + val = (1200000 -650000 ) /25000 ; + ret |=pmic_reg_write (p,MAX8997_REG_BUCK4DVS , val); + +/* BUCK5 VMEM: 1.2V */ + val = (1200000 -650000 ) /25000 ; +for (i =0 ; i <8 ; i++) + ret |=pmic_reg_write (p,MAX8997_REG_BUCK5DVS1 + i, val); + + val =ENBUCK |ACTIVE_DISCHARGE ;/* DVS OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_BUCK5CTRL , val); + +/* BUCK6 CAM AF: 2.8V */ +/* No Voltage Setting Register */ +/* GNSLCT 3.0X */ + val =GNSLCT ; + ret |=pmic_reg_write (p,MAX8997_REG_BUCK6CTRL , val); + +/* BUCK7 VCC_SUB: 2.0V */ + val = (2000000 -750000 ) /50000 ; + ret |=pmic_reg_write (p,MAX8997_REG_BUCK7DVS , val); + +/* LDO1 VADC: 3.3V */ + val =max8997_reg_ldo (3300000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO1CTRL , val); + +/* LDO1 Disable active discharging */ + ret |=pmic_reg_read (p,MAX8997_REG_LDO1CONFIG , &val); + val &= ~LDO_ADE ; + ret |=pmic_reg_write (p,MAX8997_REG_LDO1CONFIG , val); + +/* LDO2 VALIVE: 1.1V */ + val =max8997_reg_ldo (1100000 ) |EN_LDO ; + ret |=pmic_reg_write (p,MAX8997_REG_LDO2CTRL , val); + +/* LDO3 VUSB/MIPI: 1.1V */ + val =max8997_reg_ldo (1100000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO3CTRL , val); + +/* LDO4 VMIPI: 1.8V */ + val =max8997_reg_ldo (1800000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO4CTRL , val); + +/* LDO5 VHSIC: 1.2V */ + val =max8997_reg_ldo (1200000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO5CTRL , val); + +/* LDO6 VCC_1.8V_PDA: 1.8V */ + val =max8997_reg_ldo (1800000 ) |EN_LDO ; + ret |=pmic_reg_write (p,MAX8997_REG_LDO6CTRL , val); + +/* LDO7 CAM_ISP: 1.8V */ + val =max8997_reg_ldo (1800000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO7CTRL , val); + +/* LDO8 VDAC/VUSB: 3.3V */ + val =max8997_reg_ldo (3300000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO8CTRL , val); + +/* LDO9 VCC_2.8V_PDA: 2.8V */ + val =max8997_reg_ldo (2800000 ) |EN_LDO ; + ret |=pmic_reg_write (p,MAX8997_REG_LDO9CTRL , val); + +/* LDO10 VPLL: 1.1V */ + val =max8997_reg_ldo (1100000 ) |EN_LDO ; + ret |=pmic_reg_write (p,MAX8997_REG_LDO10CTRL , val); + +/* LDO11 TOUCH: 2.8V */ + val =max8997_reg_ldo (2800000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO11CTRL , val); + +/* LDO12 VTCAM: 1.8V */ + val =max8997_reg_ldo (1800000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO12CTRL , val); + +/* LDO13 VCC_3.0_LCD: 3.0V */ + val =max8997_reg_ldo (3000000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO13CTRL , val); + +/* LDO14 MOTOR: 3.0V */ + val =max8997_reg_ldo (3000000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO14CTRL , val); + +/* LDO15 LED_A: 2.8V */ + val =max8997_reg_ldo (2800000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO15CTRL , val); + +/* LDO16 CAM_SENSOR: 1.8V */ + val =max8997_reg_ldo (1800000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO16CTRL , val); + +/* LDO17 VTF: 2.8V */ + val =max8997_reg_ldo (2800000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO17CTRL , val); + +/* LDO18 TOUCH_LED 3.3V */ + val =max8997_reg_ldo (3300000 ) |DIS_LDO ;/* OFF */ + ret |=pmic_reg_write (p,MAX8997_REG_LDO18CTRL , val); + +/* LDO21 VDDQ: 1.2V */ + val =max8997_reg_ldo (1200000 ) |EN_LDO ; + ret |=pmic_reg_write (p,MAX8997_REG_LDO21CTRL , val); + +/* SAFEOUT for both 1 and 2: 4.9V, Active discharge, Enable */ + val = (SAFEOUT_4_90V <<0 ) | (SAFEOUT_4_90V <<2 ) | +ACTDISSAFEO1 |ACTDISSAFEO2 |ENSAFEOUT1 |ENSAFEOUT2 ; + ret |=pmic_reg_write (p,MAX8997_REG_SAFEOUTCTRL , val); + +if (ret) { +puts ("MAX8997 PMIC setting error!\n" ); +return -1 ; + } +return 0 ; +} +#ifdef CONFIG_POWER_INIT int power_board_init (void ) {
@@ -93,6 +242,7 @@ int power_board_init(void)#ifdef CONFIG_PMIC pmic_init (I2C_5 );#endif +pmic_init_max8997 (); return 0; }#endif
include/power/max8997_pmic.h +9 -0
@@ -176,6 +176,15 @@ enum {#define ENSAFEOUT1 (1 << 6)#define ENSAFEOUT2 (1 << 7) +#define ENBUCK (1 << 0) +#define ACTIVE_DISCHARGE (1 << 3) +#define GNSLCT (1 << 2) +#define LDO_ADE (1 << 1) +#define SAFEOUT_4_85V 0x00 +#define SAFEOUT_4_90V 0x01 +#define SAFEOUT_4_95V 0x02 +#define SAFEOUT_3_30V 0x03 +/* Charger */ enum {CHARGER_ENABLE ,CHARGER_DISABLE };#define DETBAT (1 << 2)
Signature · 1 line
1.7.2.3
PATCH v2 15/21 arm:trats:pmic: Enable MUIC (MAX8997) at Samsung's TRATS board
In reply to Lukasz MajewskiMUIC IC built into the MAX8997 device is enabled at TRATS.
---
Changes for v2:
- None
--- board/samsung/trats/trats.c | 2 ++ include/configs/trats.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
board/samsung/trats/trats.c +2 -0
@@ -38,6 +38,7 @@#include <usb/s3c_udc.h> #include <power/max8997_pmic.h> #include <libtizen.h> +#include <power/max8997_muic.h> #include "setup.h"
@@ -243,6 +244,7 @@ int power_board_init(void)pmic_init (I2C_5 );#endif pmic_init_max8997 (); +power_muic_init (I2C_5 ); return 0; }#endif
include/configs/trats.h +2 -0
@@ -240,6 +240,8 @@#define CONFIG_PMIC_I2C #define CONFIG_PMIC_MAX8997 +#define CONFIG_POWER_MUIC +#define CONFIG_POWER_MUIC_MAX8997 #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_S3C_UDC_OTG #define CONFIG_USB_GADGET_DUALSPEED
Signature · 1 line
1.7.2.3
PATCH v2 16/21 arm:trats:pmic: Enable fuel-gauge (MAX17042) at Samsung's TRATS board
In reply to Lukasz MajewskiFG IC built into the MAX8997 device (compliant to MAX17042) is enabled at TRATS.
---
Changes for v2:
- None
--- board/samsung/trats/trats.c | 2 ++ include/configs/trats.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
board/samsung/trats/trats.c +2 -0
@@ -39,6 +39,7 @@#include <power/max8997_pmic.h> #include <libtizen.h> #include <power/max8997_muic.h> +#include <power/max17042_fg.h> #include "setup.h"
@@ -244,6 +245,7 @@ int power_board_init(void)pmic_init (I2C_5 );#endif pmic_init_max8997 (); +power_fg_init (I2C_9 );power_muic_init (I2C_5 );return 0 ; }
include/configs/trats.h +2 -0
@@ -240,6 +240,8 @@#define CONFIG_PMIC_I2C #define CONFIG_PMIC_MAX8997 +#define CONFIG_POWER_FG +#define CONFIG_POWER_FG_MAX17042 #define CONFIG_POWER_MUIC #define CONFIG_POWER_MUIC_MAX8997 #define CONFIG_USB_GADGET
Signature · 1 line
1.7.2.3
PATCH v2 17/21 arm:trats:pmic: Enable battery support at Samsung's TRATS board
In reply to Lukasz MajewskiSupport for TRATS battery has been added. It is treated as a "normal" power related device and thereof controlled by pmic/power subsystem.
---
Changes for v2:
- New patch for v2.
--- board/samsung/trats/trats.c | 2 ++ include/configs/trats.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
board/samsung/trats/trats.c +2 -0
@@ -39,6 +39,7 @@#include <power/max8997_pmic.h> #include <libtizen.h> #include <power/max8997_muic.h> +#include <power/battery.h> #include <power/max17042_fg.h> #include "setup.h"
@@ -247,6 +248,7 @@ int power_board_init(void)pmic_init_max8997 ();power_fg_init (I2C_9 );power_muic_init (I2C_5 ); +power_bat_init (0 ); return 0; }#endif
include/configs/trats.h +2 -0
@@ -244,6 +244,8 @@#define CONFIG_POWER_FG_MAX17042 #define CONFIG_POWER_MUIC #define CONFIG_POWER_MUIC_MAX8997 +#define CONFIG_POWER_BATTERY +#define CONFIG_POWER_BATTERY_TRATS #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_S3C_UDC_OTG #define CONFIG_USB_GADGET_DUALSPEED
Signature · 1 line
1.7.2.3
PATCH v2 18/21 pmic:max8997: Support for MAX8997 internal charger control
In reply to Lukasz MajewskiSupport for MAX8997 built-in charger.
---
Changes for v2:
- power_init_battery() method added to be called from MAX8997 struct pmic instance
--- drivers/power/max8997/pmic_max8997.c | 66 +++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 1 deletions(-)
drivers/power/max8997/pmic_max8997.c +65 -1
@@ -42,12 +42,74 @@ unsigned char max8997_reg_ldo(int uV)return ret; } +static int pmic_charger_state (struct pmic *p,int state,int current) +{ +unsigned char fc; +u32 val =0 ; + +if (pmic_probe (p)) +return -1 ; + +if (state ==CHARGER_DISABLE ) { +puts ("Disable the charger.\n" ); +pmic_reg_read (p,MAX8997_REG_MBCCTRL2 , &val); + val &= ~(MBCHOSTEN |VCHGR_FC ); +pmic_reg_write (p,MAX8997_REG_MBCCTRL2 , val); + +return -1 ; + } + +if (current <CHARGER_MIN_CURRENT || current >CHARGER_MAX_CURRENT ) { +printf ("%s: Wrong charge current: %d [mA]\n" , + __func__, current); +return -1 ; + } + + fc = (current -CHARGER_MIN_CURRENT ) /CHARGER_CURRENT_RESOLUTION ; + fc = fc &0xf ;/* up to 950 mA */ + +printf ("Enable the charger @ %d [mA]\n" , fc *CHARGER_CURRENT_RESOLUTION + +CHARGER_MIN_CURRENT ); + + val = fc |MBCICHFCSET ; +pmic_reg_write (p,MAX8997_REG_MBCCTRL4 , val); + +pmic_reg_read (p,MAX8997_REG_MBCCTRL2 , &val); + val =MBCHOSTEN |VCHGR_FC ;/* enable charger & fast charge */ +pmic_reg_write (p,MAX8997_REG_MBCCTRL2 , val); + +return 0 ; +} + +static int pmic_charger_bat_present (struct pmic *p) +{ +u32 val; + +if (pmic_probe (p)) +return -1 ; + +pmic_reg_read (p,MAX8997_REG_STATUS4 , &val); + +return !(val &DETBAT ); +} + +static int power_init_battery (struct pmic *p,struct pmic *bat) +{ +struct power_battery *pb = bat->pwr_bat; + + pb->chrg_bat_present = pmic_charger_bat_present; + pb->chrg_state = pmic_charger_state; + pb->chrg = p; + +return 0 ; +} +int pmic_init (unsigned char bus) {struct pmic *p =pmic_alloc ();static const char name[] ="MAX8997_PMIC" ; -puts ("Board PMIC init\n" ); +debug ("Board PMIC init\n" ); p->name = name; p->interface =PMIC_I2C ;
@@ -56,5 +118,7 @@ int pmic_init(unsigned char bus) p->hw.i2c.tx_num =1 ; p->bus = bus; + p->battery_init = power_init_battery; +return 0 ; }
Signature · 1 line
1.7.2.3
PATCH v2 19/21 arm:trats:pmic: Power consumption reduction state for Samsung's TRATS board
In reply to Lukasz MajewskiWhen charging battery is necessary, the development board needs to be turned into low power mode for better efficiency.
---
Changes for v2:
- None
--- board/samsung/trats/trats.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-)
board/samsung/trats/trats.c +41 -0
@@ -89,6 +89,47 @@ void i2c_init_board(void)s5p_gpio_direction_output (&gpio2->y4,1 ,1 ); } +static void trats_low_power_mode (void ) +{ +struct exynos4_clock *clk = + (struct exynos4_clock *)samsung_get_base_clock (); +struct exynos4_power *pwr = + (struct exynos4_power *)samsung_get_base_power (); + +/* Power down CORE1 */ +writel (0x0 , &pwr->arm_core1_configuration); + +/* Change the APLL frequency */ +writel (0xa0c80604 , &clk->apll_con0); +/* Change CPU0 clock divider */ +writel (0x00000100 , &clk->div_cpu0); +/* CLK_DIV_STAT_CPU0 - wait until clock gets stable */ +while (readl (&clk->div_stat_cpu0) &0x1111111 ) + ; + +/* Change clock divider ratio for DMC */ +writel (0x13113117 , &clk->div_dmc0); +while (readl (&clk->div_stat_dmc0) &0x11111111 ) + ; + +/* Turn off unnecessary power domains */ +writel (0x0 , &pwr->xxti_configuration);/* XXTI */ +writel (0x0 , &pwr->cam_configuration);/* CAM */ +writel (0x0 , &pwr->tv_configuration);/* TV */ +writel (0x0 , &pwr->mfc_configuration);/* MFC */ +writel (0x0 , &pwr->g3d_configuration);/* G3D */ +writel (0x0 , &pwr->gps_configuration);/* GPS */ +writel (0x0 , &pwr->gps_alive_configuration);/* GPS_ALIVE */ + +/* Turn off unnecessary clocks */ +writel (0x0 , &clk->gate_ip_cam);/* CAM */ +writel (0x0 , &clk->gate_ip_tv);/* TV */ +writel (0x0 , &clk->gate_ip_mfc);/* MFC */ +writel (0x0 , &clk->gate_ip_g3d);/* G3D */ +writel (0x0 , &clk->gate_ip_image);/* IMAGE */ +writel (0x0 , &clk->gate_ip_gps);/* GPS */ +} +static int pmic_init_max8997 (void ) {struct pmic *p =pmic_get ("MAX8997_PMIC" );
Signature · 1 line
1.7.2.3
PATCH v2 20/21 arm:trats:pmic: Support for charging battery at Samsung's TRATS board
In reply to Lukasz MajewskiThe battery connected to Samsung's Trats development board is now charged when voltage drops below threshold.
---
Changes for v2:
- Define separate *p_{} pointer instances for each power device available at Trats
- Only basic checks performed
- Core responsible for battery charging moved to separate file - ./drivers/power/bat_trats.c
--- board/samsung/trats/trats.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-)
board/samsung/trats/trats.c +27 -0
@@ -282,6 +282,9 @@ static int pmic_init_max8997(void)#ifdef CONFIG_POWER_INIT int power_board_init (void ) { +int chrg; +struct power_battery *pb; +struct pmic *p_fg, *p_chrg, *p_muic, *p_bat;#ifdef CONFIG_PMIC pmic_init (I2C_5 );
@@ -290,6 +293,30 @@ int power_board_init(void)power_fg_init (I2C_9 );power_muic_init (I2C_5 );power_bat_init (0 ); + p_fg =pmic_get ("MAX17042_FG" ); + p_chrg =pmic_get ("MAX8997_PMIC" ); + p_muic =pmic_get ("MAX8997_MUIC" ); + p_bat =pmic_get ("BAT_TRATS" ); + + p_fg->battery_init (p_fg, p_bat); + p_chrg->battery_init (p_chrg, p_bat); + p_muic->battery_init (p_muic, p_bat); + + p_bat->low_power_mode = trats_low_power_mode; + pb = p_bat->pwr_bat; + chrg = pb->chrg_type (pb->muic); +debug ("CHARGER TYPE: %d\n" , chrg); + +if (!pb->chrg_bat_present (pb->chrg)) { +puts ("No battery detected\n" ); +return -1 ; + } + + pb->fg_battery_check (pb->fg, p_bat); + +if (pb->bat->state ==CHARGE && chrg ==CHARGER_USB ) +puts ("CHARGE Battery !\n" ); + return 0; }#endif
Signature · 1 line
1.7.2.3
PATCH v2 21/21 pmic: Extend PMIC framework to support battery related commands
In reply to Lukasz MajewskiTwo extra commands:
"pmic name bat state" and "pmic name bat charge" has been added to pmic framework. Those provides state display and charge capabilities to named batteries.
The pmic_core.c file has been refactored to more consistent name scheme.
---
Changes for v2:
- New patch to v2.
--- drivers/power/pmic_core.c | 51 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 10 deletions(-)
drivers/power/pmic_core.c +41 -10
@@ -124,35 +124,46 @@ struct pmic *pmic_get(const char *s)return NULL ; } +const char *power_get_interface (int interface) +{ +const char *power_interface[] = {"I2C" ,"SPI" ,"|+|-|" }; +return power_interface[interface]; +} +static void pmic_list_names (void ) {struct pmic *p;puts ("PMIC devices:\n" );list_for_each_entry (p, &pmic_list, list) { -printf ("name: %s\n" , p->name); +printf ("name: %s bus: %s_%d\n" , p->name, +power_get_interface (p->interface), p->bus); } }int do_pmic (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {u32 ret, reg, val; +char *cmd, *name;struct pmic *p; -char *cmd;/* at least two arguments please */ if (argc <2 )return CMD_RET_USAGE ; - cmd = argv[1 ]; - -if (strcmp (cmd,"list" ) ==0 ) { +if (strcmp (argv[1 ],"list" ) ==0 ) {pmic_list_names ();return CMD_RET_SUCCESS ; } + name = argv[1 ]; + cmd = argv[2 ]; + +debug ("%s: name: %s cmd: %s\n" , __func__, name, cmd); + p =pmic_get (name); +if (strcmp (cmd,"dump" ) ==0 ) { -if (pmic_dump (pmic_get (argv[2 ]))) +if (pmic_dump (p))return CMD_RET_FAILURE ;return CMD_RET_SUCCESS ; }
@@ -162,7 +173,6 @@ int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return CMD_RET_USAGE ; reg =simple_strtoul (argv[3 ],NULL ,16 ); - p =pmic_get (argv[2 ]); ret =pmic_reg_read (p, reg, &val);if (ret)
@@ -179,12 +189,31 @@ int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) reg =simple_strtoul (argv[3 ],NULL ,16 ); val =simple_strtoul (argv[4 ],NULL ,16 ); - p =pmic_get (argv[2 ]);pmic_reg_write (p, reg, val);return CMD_RET_SUCCESS ; } +if (strcmp (cmd,"bat" ) ==0 ) { +if (argc <4 ) +return CMD_RET_USAGE ; + +if (strcmp (argv[3 ],"state" ) ==0 ) + p->pwr_bat->fg_battery_check (p->pwr_bat->fg, p); + +if (strcmp (argv[3 ],"charge" ) ==0 ) { +if (p->pwr_bat) { +printf ("PRINT BAT charge %s\n" , p->name); +if (p->low_power_mode) + p->low_power_mode (); +if (p->battery_charge) + p->battery_charge (p); + } + } + +return CMD_RET_SUCCESS ; + } +/* No subcommand found */ return CMD_RET_SUCCESS ; }
@@ -193,7 +222,9 @@ U_BOOT_CMD( pmic,CONFIG_SYS_MAXARGS ,1 , do_pmic,"PMIC" ,"list - list available PMICs\n" -"pmic dump name - dump named PMIC registers\n" +"pmic name dump - dump named PMIC registers\n" "pmic name read <reg> - read register\n" -"pmic name write <reg> <value> - write register" +"pmic name write <reg> <value> - write register\n" +"pmic name bat state - write register\n" +"pmic name bat charge - write register\n" );
Signature · 1 line
1.7.2.3