SMDK5420: Add S2MPS11 pmic support to SMDK5420
Subsystems (2)
cover SMDK5420: Add S2MPS11 pmic support to SMDK5420
This patchset adds support for S2MPS11 pmic on SMDK5420
This patchset has dependency on Rajeshwari's base patchset:
[V4] EXYNOS5420: Add SMDK5420 board support
http://comments.gmane.org/gmane.comp.boot-loaders.u-boot/170582
Also, for testing we need Naveen's i2c patchset as well:
i2c: improve s3c24x0 with High-speed and new SYS_I2C framework support
http://www.mail-archive.com/u-boot at lists.denx.de/msg122679.html
Leela Krishna Amudala (6):
exynos: Use common pmic_reg_update() definition
power: Explicitly select pmic device's bus
FDT: Exynos5420: Add compatible srings for PMIC
SMDK5420: S2MPS11: Adds the register settings for S2MPS11
exynos: Add a common DT based PMIC driver initialization
config: SMDK5420: Enable S2MPS11 pmic
board/samsung/common/board.c | 40 ++++++----- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_common.c | 97 +++++++++++++++++++++++++ drivers/power/power_core.c | 14 ++++ drivers/power/power_i2c.c | 81 +++++++++++++++++++-- include/configs/smdk5420.h | 4 ++ include/fdtdec.h | 1 + include/power/pmic.h | 35 +++++++++ include/power/s2mps11_pmic.h | 144 ++++++++++++++++++++++++++++++++++++++ lib/fdtdec.c | 1 + 10 files changed, 394 insertions(+), 24 deletions(-) create mode 100644 drivers/power/pmic/pmic_common.c create mode 100644 include/power/s2mps11_pmic.h
Signature · 1 line
1.7.10.4
PATCH 1/6 exynos: Use common pmic_reg_update() definition
This function is used by different Exynos platforms, put it in the common file.
--- board/samsung/common/board.c | 19 ------------------- drivers/power/power_i2c.c | 19 +++++++++++++++++++ include/power/pmic.h | 1 + 3 files changed, 20 insertions(+), 19 deletions(-)
board/samsung/common/board.c +0 -19
@@ -152,25 +152,6 @@ static int board_init_cros_ec_devices(const void *blob) #if defined(CONFIG_POWER) #ifdef CONFIG_POWER_MAX77686 -static int pmic_reg_update(struct pmic *p, int reg, uint regval) -{ - u32 val; - int ret = 0; - - ret = pmic_reg_read(p, reg, &val); - if (ret) { - debug("%s: PMIC %d register read failed\n", __func__, reg); - return -1; - } - val |= regval; - ret = pmic_reg_write(p, reg, val); - if (ret) { - debug("%s: PMIC %d register write failed\n", __func__, reg); - return -1; - } - return 0; -} - static int max77686_init(void) { struct pmic *p;
drivers/power/power_i2c.c +19 -0
@@ -96,6 +96,25 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)return 0 ; } +int pmic_reg_update (struct pmic *p,int reg,uint regval) +{ +u32 val; +int ret =0 ; + + ret =pmic_reg_read (p, reg, &val); +if (ret) { +debug ("%s: PMIC %d register read failed\n" , __func__, reg); +return -1 ; + } + val |= regval; + ret =pmic_reg_write (p, reg, val); +if (ret) { +debug ("%s: PMIC %d register write failed\n" , __func__, reg); +return -1 ; + } +return 0 ; +} +int pmic_probe (struct pmic *p) {i2c_set_bus_num (p->bus);
include/power/pmic.h +1 -0
@@ -83,6 +83,7 @@ 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);int pmic_set_output (struct pmic *p,u32 reg,int ldo,int on); +int pmic_reg_update (struct pmic *p,int reg,uint regval);#define pmic_i2c_addr (p->hw.i2c.addr)#define pmic_i2c_tx_num (p->hw.i2c.tx_num)
Signature · 1 line
1.7.10.4
PATCH 1/6 exynos: Use common pmic_reg_update() definition
Hi Leela,
Quoted 49 lines
This function is used by different Exynos platforms, put it in the common file.
Signed-off-by Vadim Bendebury <[email protected]>Signed-off-by Leela Krishna Amudala <[email protected]>Reviewed-by Doug Anderson <[email protected]>--- board/samsung/common/board.c | 19 ------------------- drivers/power/power_i2c.c | 19 +++++++++++++++++++ include/power/pmic.h | 1 + 3 files changed, 20 insertions(+), 19 deletions(-)(quoted diff) +0
-0
b/board/samsung/common/board.cindex ce85ddb..87ca9de 100644board/samsung/common/board.c +0
-19@@ -152,25 +152,6 @@ static int board_init_cros_ec_devices(const void *blob)#if defined(CONFIG_POWER )#ifdef CONFIG_POWER_MAX77686 -static int pmic_reg_update (struct pmic *p,int reg,uint regval) -{ -u32 val; -int ret =0 ; - - ret =pmic_reg_read (p, reg, &val); -if (ret) { -debug ("%s: PMIC %d register read failed\n" , __func__, reg); -return -1 ; - } - val |= regval; - ret =pmic_reg_write (p, reg, val); -if (ret) { -debug ("%s: PMIC %d register write failed\n" , __func__, reg); -return -1 ; - } -return 0 ; -} -static int max77686_init (void ){
board/samsung/common/board.c +0
-0struct pmic *p;drivers/power/power_i2c.c +0
-0
drivers/power/power_i2c.c int pmic_reg_read(struct pmic *p, u32 reg, u32 · line 99
Quoted 4 lines
drivers/power/power_i2c.c +1
-0@@ -96,6 +96,25 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val) return 0; } +int pmic_reg_update (struct pmic *p,int reg,uint regval)
It seems like this function shall be added to pmic_core.c, since it uses the pmic_reg_{read|write}, which are defined for both, spi and i2c.
Quoted 35 lines
drivers/power/power_i2c.c +18
-0+{ +u32 val; +int ret =0 ; + + ret =pmic_reg_read (p, reg, &val); +if (ret) { +debug ("%s: PMIC %d register read failed\n" , __func__, reg); +return -1 ; + } + val |= regval; + ret =pmic_reg_write (p, reg, val); +if (ret) { +debug ("%s: PMIC %d register write failed\n" , __func__, reg); +return -1 ; + } +return 0 ; +} +int pmic_probe (struct pmic *p){
drivers/power/power_i2c.c +0
-0i2c_set_bus_num (p->bus);include/power/pmic.h +1
-0@@ -83,6 +83,7 @@ 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);int pmic_set_output (struct pmic *p,u32 reg,int ldo,int on); +int pmic_reg_update (struct pmic *p,int reg,uint regval);#define pmic_i2c_addr (p->hw.i2c.addr)#define pmic_i2c_tx_num (p->hw.i2c.tx_num)
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH 2/6 power: Explicitly select pmic device's bus
In reply to Leela Krishna AmudalaThe current pmic i2c code assumes the current i2c bus is the same as the pmic device's bus. There is nothing ensuring that to be true. Therefore, select the proper bus before performing a transaction.
--- drivers/power/power_i2c.c | 62 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 5 deletions(-)
drivers/power/power_i2c.c +57 -5
@@ -16,9 +16,45 @@#include <i2c.h> #include <compiler.h> +static int pmic_select (struct pmic *p) +{ +int ret, old_bus; + + old_bus =i2c_get_bus_num (); +if (old_bus != p->bus) { +debug ("%s: Select bus %d\n" , __func__, p->bus); + ret =i2c_set_bus_num (p->bus); +if (ret) { +debug ("%s: Cannot select pmic %s, err %d\n" , + __func__, p->name, ret); +return -1 ; + } + } + +return old_bus; +} + +static int pmic_deselect (int old_bus) +{ +int ret; + +if (old_bus !=i2c_get_bus_num ()) { + ret =i2c_set_bus_num (old_bus); +debug ("%s: Select bus %d\n" , __func__, old_bus); +if (ret) { +debug ("%s: Cannot restore i2c bus, err %d\n" , + __func__, ret); +return -1 ; + } + } + +return 0 ; +} +int pmic_reg_write (struct pmic *p,u32 reg,u32 val) {unsigned char buf[4 ] = {0 }; +int ret, old_bus;if (check_reg (p, reg))return -1 ;
@@ -52,23 +88,33 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val)return -1 ; } -if (i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num)) + old_bus =pmic_select (p); +if (old_bus <0 )return -1 ; -return 0 ; + ret =i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num); +pmic_deselect (old_bus); +return ret; }int pmic_reg_read (struct pmic *p,u32 reg,u32 *val) {unsigned char buf[4 ] = {0 };u32 ret_val =0 ; +int ret, old_bus;if (check_reg (p, reg))return -1 ; -if (i2c_read (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num)) + old_bus =pmic_select (p); +if (old_bus <0 )return -1 ; + ret =i2c_read (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num); +pmic_deselect (old_bus); +if (ret) +return ret; +switch (pmic_i2c_tx_num) {case 3 :if (p->sensor_byte_order ==PMIC_SENSOR_BYTE_ORDER_BIG )
@@ -117,9 +163,15 @@ int pmic_reg_update(struct pmic *p, int reg, uint regval)int pmic_probe (struct pmic *p) { -i2c_set_bus_num (p->bus); +int ret, old_bus; + + old_bus =pmic_select (p); +if (old_bus <0 ) +return -1 ;debug ("Bus: %d PMIC:%s probed!\n" , p->bus, p->name); -if (i2c_probe (pmic_i2c_addr)) { + ret =i2c_probe (pmic_i2c_addr); +pmic_deselect (old_bus); +if (ret) {printf ("Can't find PMIC:%s\n" , p->name);return -1 ; }
Signature · 1 line
1.7.10.4
PATCH 2/6 power: Explicitly select pmic device's bus
Hi Leela,
Quoted 65 lines
The current pmic i2c code assumes the current i2c bus is the same as the pmic device's bus. There is nothing ensuring that to be true. Therefore, select the proper bus before performing a transaction.
Signed-off-by Aaron Durbin <[email protected]>Signed-off-by Simon Glass <[email protected]>Signed-off-by Leela Krishna Amudala <[email protected]>Reviewed-by Doug Anderson <[email protected]>--- drivers/power/power_i2c.c | 62+++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 5 deletions(-)
drivers/power/power_i2c.c +36
-0@@ -16,9 +16,45 @@#include <i2c.h> #include <compiler.h> +static int pmic_select (struct pmic *p) +{ +int ret, old_bus; + + old_bus =i2c_get_bus_num (); +if (old_bus != p->bus) { +debug ("%s: Select bus %d\n" , __func__, p->bus); + ret =i2c_set_bus_num (p->bus); +if (ret) { +debug ("%s: Cannot select pmic %s, err %d\n" , + __func__, p->name, ret); +return -1 ; + } + } + +return old_bus; +} + +static int pmic_deselect (int old_bus) +{ +int ret; + +if (old_bus !=i2c_get_bus_num ()) { + ret =i2c_set_bus_num (old_bus); +debug ("%s: Select bus %d\n" , __func__, old_bus); +if (ret) { +debug ("%s: Cannot restore i2c bus, err %d\n" , + __func__, ret); +return -1 ; + } + } + +return 0 ; +} +int pmic_reg_write (struct pmic *p,u32 reg,u32 val) {unsigned char buf[4 ] = {0 }; +int ret, old_bus;if (check_reg (p, reg))return -1 ;
drivers/power/power_i2c.c int pmic_reg_write(struct pmic *p, u32 reg, u32 · line 95
Quoted 10 lines
drivers/power/power_i2c.c +3
-2@@ -52,23 +88,33 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val) return -1; } -if (i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num)) + old_bus =pmic_select (p); +if (old_bus <0 )return -1 ; -return 0 ; + ret =i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num);
I'm wondering if setting the bus before each, single i2c write (when we usually perform several writes to one device) will not be an overkill (we search the ll_entry_count linker list each time to find max i2c adapter names) ?
The i2c_set_bus_num() is now done at pmic_probe(), but this also introduces overkill for "probing" each device when we want to read from it.
As a side note - I would appreciate if you would add Stefano Babic and me on the Cc (as we are listed at e.g. power_core.c).
Quoted 44 lines
drivers/power/power_i2c.c +10
-1+pmic_deselect (old_bus); +return ret; }int pmic_reg_read (struct pmic *p,u32 reg,u32 *val) {unsigned char buf[4 ] = {0 };u32 ret_val =0 ; +int ret, old_bus;if (check_reg (p, reg))return -1 ; -if (i2c_read (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num)) + old_bus =pmic_select (p); +if (old_bus <0 )return -1 ; + ret =i2c_read (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num); +pmic_deselect (old_bus); +if (ret) +return ret; +switch (pmic_i2c_tx_num) {case 3 : if (p->sensor_byte_order ==
PMIC_SENSOR_BYTE_ORDER_BIG) @@ -117,9 +163,15 @@ intpmic_reg_update(struct pmic *p, int reg, uint regval)
intpmic_probe(struct pmic *p)
{drivers/power/power_i2c.c +8
-2-i2c_set_bus_num (p->bus); +int ret, old_bus; + + old_bus =pmic_select (p); +if (old_bus <0 ) +return -1 ;debug ("Bus: %d PMIC:%s probed!\n" , p->bus, p->name); -if (i2c_probe (pmic_i2c_addr)) { + ret =i2c_probe (pmic_i2c_addr); +pmic_deselect (old_bus); +if (ret) {printf ("Can't find PMIC:%s\n" , p->name);return -1 ; }
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH 2/6 power: Explicitly select pmic device's bus
Hello Lukasz,
Am 02.10.2013 17:11, schrieb Lukasz Majewski:
Quoted 75 lines
Hi Leela,
Quoted 73 lines
The current pmic i2c code assumes the current i2c bus is the same as the pmic device's bus. There is nothing ensuring that to be true. Therefore, select the proper bus before performing a transaction.
Signed-off-by Aaron Durbin<[email protected]>Signed-off-by Simon Glass<[email protected]>Signed-off-by Leela Krishna Amudala<[email protected]>Reviewed-by Doug Anderson<[email protected]>--- drivers/power/power_i2c.c | 62+++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 5 deletions(-)
drivers/power/power_i2c.c +38
-1@@ -16,9 +16,45 @@#include <i2c.h> #include <compiler.h> +static int pmic_select (struct pmic *p) +{ +int ret, old_bus; + + old_bus =i2c_get_bus_num (); +if (old_bus != p->bus) { +debug ("%s: Select bus %d\n" , __func__, p->bus); + ret =i2c_set_bus_num (p->bus); +if (ret) { +debug ("%s: Cannot select pmic %s, err %d\n" , + __func__, p->name, ret); +return -1 ; + } + } + +return old_bus; +} + +static int pmic_deselect (int old_bus) +{ +int ret; + +if (old_bus !=i2c_get_bus_num ()) { + ret =i2c_set_bus_num (old_bus); +debug ("%s: Select bus %d\n" , __func__, old_bus); +if (ret) { +debug ("%s: Cannot restore i2c bus, err %d\n" , + __func__, ret); +return -1 ; + } + } + +return 0 ; +} +int pmic_reg_write (struct pmic *p,u32 reg,u32 val) {unsigned char buf[4 ] = {0 }; +int ret, old_bus;if (check_reg (p, reg))return -1 ;@@ -52,23 +88,33 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val) return -1; } -if (i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num)) + old_bus =pmic_select (p); +if (old_bus<0 )return -1 ;
Quoted 7 lines
drivers/power/power_i2c.c int pmic_reg_write(struct pmic *p, u32 reg, u32 · line 95
Quoted 2 lines
drivers/power/power_i2c.c +1
-1-return 0 ; + ret =i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num);I'm wondering if setting the bus before each, single i2c write (when we usually perform several writes to one device) will not be an overkill (we search the
ll_entry_countlinker list each time to find max i2c adapter names) ?
Yes, maybe we could optimze this in drivers/i2c/i2c_core.c. It should be enough to detect the max adapter once ... but it is not a "search"... ll_entry_count() calculates the number ...
Looking in i2c_set_bus_num(), I think it can be optimized ... lets speaking code:
drivers/i2c/i2c_core.c +10 -8
@@ -278,20 +278,22 @@ unsigned int i2c_get_bus_num(void)*/ int i2c_set_bus_num (unsigned int bus) { - int max = ll_entry_count(struct i2c_adapter, i2c); +int max; + +if ((bus ==I2C_BUS ) && (I2C_ADAP ->init_done >0 )) +return 0 ; -if (I2C_ADAPTER (bus) >= max) { -printf ("Error, wrong i2c adapter %d max %d possible\n" , -I2C_ADAPTER (bus), max); -return -2 ; - }#ifndef CONFIG_SYS_I2C_DIRECT_BUS if (bus >=CONFIG_SYS_NUM_I2C_BUSES )return -1 ;#endif -if ((bus ==I2C_BUS ) && (I2C_ADAP ->init_done >0 )) -return 0 ; + max = ll_entry_count(struct i2c_adapter, i2c); +if (I2C_ADAPTER (bus) >= max) { +printf ("Error, wrong i2c adapter %d max %d possible\n" , +I2C_ADAPTER (bus), max); +return -2 ; + }#ifndef CONFIG_SYS_I2C_DIRECT_BUS i2c_mux_disconnet_all ();
So, first check, if we are on the correct bus, and return immediately! What do you think?
Beside of that, pmic_select() does the check, if we are on the correct bus too, and calls i2c_set_bus_num() only, if not ... so this is here no problem ... but exactly I want to get rid of this code as it is in pmic_select() someday, when all i2c drivers converted to the new i2c framework. i2c_set_bus_num() should go static then in drivers/i2c/i2c_core.c and i2c_read/write/... become a new "int bus" parameter ... but this will be a big api change ... but will prevent exactly such code all over the u-boot code ...
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 2/6 power: Explicitly select pmic device's bus
Hi Heiko,
Sorry for a late reply.
Quoted 90 lines
Hello Lukasz,
Am 02.10.2013 17:11, schrieb Lukasz Majewski:
Quoted 78 lines
Hi Leela,
Quoted 76 lines
The current pmic i2c code assumes the current i2c bus is the same as the pmic device's bus. There is nothing ensuring that to be true. Therefore, select the proper bus before performing a transaction.
Signed-off-by Aaron Durbin<[email protected]>Signed-off-by Simon Glass<[email protected]>Signed-off-by Leela Krishna Amudala<[email protected]>Reviewed-by Doug Anderson<[email protected]>--- drivers/power/power_i2c.c | 62+++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 5 deletions(-)
drivers/power/power_i2c.c +36
-0@@ -16,9 +16,45 @@#include <i2c.h> #include <compiler.h> +static int pmic_select (struct pmic *p) +{ +int ret, old_bus; + + old_bus =i2c_get_bus_num (); +if (old_bus != p->bus) { +debug ("%s: Select bus %d\n" , __func__, p->bus); + ret =i2c_set_bus_num (p->bus); +if (ret) { + debug("%s: Cannot select pmic %s, err %d\n", + __func__, p->name, ret); +return -1 ; + } + } + +return old_bus; +} + +static int pmic_deselect (int old_bus) +{ +int ret; + +if (old_bus !=i2c_get_bus_num ()) { + ret =i2c_set_bus_num (old_bus); +debug ("%s: Select bus %d\n" , __func__, old_bus); +if (ret) { + debug("%s: Cannot restore i2c bus, err %d\n", + __func__, ret); +return -1 ; + } + } + +return 0 ; +} +int pmic_reg_write (struct pmic *p,u32 reg,u32 val) {unsigned char buf[4 ] = {0 }; +int ret, old_bus;if (
check_reg(p, reg))
return -1;drivers/power/power_i2c.c +2
-1@@ -52,23 +88,33 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val) return -1; } -if (i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num)) + old_bus =pmic_select (p); +if (old_bus<0 )return -1 ;Quoted 8 lines
drivers/power/power_i2c.c int pmic_reg_write(struct pmic *p, u32 reg, u32 · line 97
Quoted 3 lines
drivers/power/power_i2c.c +1
-1-return 0 ; + ret =i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num);I'm wondering if setting the bus before each, single i2c write (when we usually perform several writes to one device) will not be an overkill (we search the
ll_entry_countlinker list each time to find max i2c adapter names) ?
Quoted 3 lines
Yes, maybe we could optimze this in
drivers/i2c/i2c_core.c. It should be enough to detect the max adapter once ... but it is not a "search"...ll_entry_count()calculates the number ...
Yes, you are right. I've overlooked it.
With -Os compiler flag this compiles to a few ASM instructions. Obviously it is NOT a performance killer :-) (I made unnecessary fuzzz... sorry).
Quoted 9 lines
Looking in
i2c_set_bus_num(), I think it can be optimized ... lets speaking code:drivers/i2c/i2c_core.c +0
-0
drivers/i2c/i2c_core.c unsigned int i2c_get_bus_num(void) · line 284
Quoted 8 lines
drivers/i2c/i2c_core.c +4
-1@@ -278,20 +278,22 @@ unsigned int i2c_get_bus_num(void)*/ int i2c_set_bus_num (unsigned int bus) { - int max = ll_entry_count(struct i2c_adapter, i2c); +int max; + +if ((bus ==I2C_BUS ) && (I2C_ADAP ->init_done >0 )) +return 0 ;
This looks nice.
Quoted 25 lines
drivers/i2c/i2c_core.c +6
-7-if (I2C_ADAPTER (bus) >= max) { -printf ("Error, wrong i2c adapter %d max %d possible\n", -I2C_ADAPTER (bus), max); -return -2 ; - }#ifndef CONFIG_SYS_I2C_DIRECT_BUS if (bus >=CONFIG_SYS_NUM_I2C_BUSES )return -1 ;#endif -if ((bus ==I2C_BUS ) && (I2C_ADAP ->init_done >0 )) -return 0 ; + max = ll_entry_count(struct i2c_adapter, i2c); +if (I2C_ADAPTER (bus) >= max) { +printf ("Error, wrong i2c adapter %d max %d possible\n", +I2C_ADAPTER (bus), max); +return -2 ; + }#ifndef CONFIG_SYS_I2C_DIRECT_BUS i2c_mux_disconnet_all();
Quoted 2 lines
So, first check, if we are on the correct bus, and return immediately! What do you think?
I think that it is acceptable.
Quoted 4 lines
Beside of that,
pmic_select()does the check, if we are on the correct bus too, and callsi2c_set_bus_num()only, if not ... so this is here no problem ...
Yes, I see.
Quoted 3 lines
but exactly I want to get rid of this code as it is in
pmic_select()someday, when all i2c drivers converted to the new i2c framework.
My 2 cents. I understand that pmic_select() preserves old i2c bus number, when PMIC performs transmission. This is probably done to not break the legacy code (where one driver assumed, that it is alone).
If this is necessary, then I'm OK with this. However I personally think, that drivers shall call API functions from i2c core (like i2c_bus_num()) only with bus number to switch and do not store and preserve the i2c value. This is my personal comment.
Quoted 7 lines
i2c_set_bus_num()should go static then indrivers/i2c/i2c_core.cand i2c_read/write/... become a new "int bus" parameter ... but this will be a big api change ... but will prevent exactly such code all over the u-boot code ...bye,
Heiko
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH 2/6 power: Explicitly select pmic device's bus
Hello Lukasz,
Am 03.10.2013 18:15, schrieb Lukasz Majewski:
Quoted 27 lines
Hi Heiko,
Sorry for a late reply.
Quoted 23 lines
Hello Lukasz,
Am 02.10.2013 17:11, schrieb Lukasz Majewski:
Quoted 20 lines
Hi Leela,
Quoted 18 lines
The current pmic i2c code assumes the current i2c bus is the same as the pmic device's bus. There is nothing ensuring that to be true. Therefore, select the proper bus before performing a transaction.
Signed-off-by Aaron Durbin<[email protected]>Signed-off-by Simon Glass<[email protected]>Signed-off-by Leela Krishna Amudala<[email protected]>Reviewed-by Doug Anderson<[email protected]>--- drivers/power/power_i2c.c | 62+++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 5 deletions(-)
drivers/power/power_i2c.c +0
-0
[...]
Quoted 9 lines
Quoted 3 lines
Yes, maybe we could optimze this in
drivers/i2c/i2c_core.c. It should be enough to detect the max adapter once ... but it is not a "search"...ll_entry_count()calculates the number ...Yes, you are right. I've overlooked it.
With -Os compiler flag this compiles to a few ASM instructions. Obviously it is NOT a performance killer :-) (I made unnecessary fuzzz... sorry).
No problem!
Quoted 18 lines
Quoted 8 lines
Looking in
i2c_set_bus_num(), I think it can be optimized ... lets speaking code:drivers/i2c/i2c_core.c +0
-0drivers/i2c/i2c_core.c unsigned int i2c_get_bus_num(void) · line 284
Quoted 8 lines
drivers/i2c/i2c_core.c +4
-1@@ -278,20 +278,22 @@ unsigned int i2c_get_bus_num(void)*/ int i2c_set_bus_num (unsigned int bus) { - int max = ll_entry_count(struct i2c_adapter, i2c); +int max; + +if ((bus ==I2C_BUS )&& (I2C_ADAP ->init_done>0 )) +return 0 ;This looks nice.
Ok! I post soon a patch for it ...
Quoted 21 lines
Quoted 21 lines
drivers/i2c/i2c_core.c +6
-7-if (I2C_ADAPTER (bus)>= max) { -printf ("Error, wrong i2c adapter %d max %d possible\n", -I2C_ADAPTER (bus), max); -return -2 ; - }#ifndef CONFIG_SYS_I2C_DIRECT_BUS if (bus>=CONFIG_SYS_NUM_I2C_BUSES )return -1 ;#endif -if ((bus ==I2C_BUS )&& (I2C_ADAP ->init_done>0 )) -return 0 ; + max = ll_entry_count(struct i2c_adapter, i2c); +if (I2C_ADAPTER (bus)>= max) { +printf ("Error, wrong i2c adapter %d max %d possible\n", +I2C_ADAPTER (bus), max); +return -2 ; + }
Quoted 7 lines
Quoted 5 lines
drivers/i2c/i2c_core.c +0
-0#ifndef CONFIG_SYS_I2C_DIRECT_BUS i2c_mux_disconnet_all();So, first check, if we are on the correct bus, and return immediately! What do you think?
I think that it is acceptable.
Good.
Quoted 10 lines
Quoted 3 lines
Beside of that,
pmic_select()does the check, if we are on the correct bus too, and callsi2c_set_bus_num()only, if not ... so this is here no problem ...Yes, I see.
Quoted 3 lines
but exactly I want to get rid of this code as it is in
pmic_select()someday, when all i2c drivers converted to the new i2c framework.
Quoted 8 lines
My 2 cents. I understand that
pmic_select()preserves old i2c bus number, when PMIC performs transmission. This is probably done to not break the legacy code (where one driver assumed, that it is alone).If this is necessary, then I'm OK with this. However I personally think, that drivers shall call API functions from i2c core (like
i2c_bus_num()) only with bus number to switch and do not store and preserve the i2c value. This is my personal comment.
Full Ack. I am just thinking, that we can get rid of such constructs, independent of the new i2c framework switch. We just need to introduce a "current_i2c_cmd_bus" in common/cmd_i2c.c. This var stores the current i2c bus where i2c commands are executed ... and all other subsystems, which use the i2c_api can call i2c_set_bus_num() without a previous "save old bus" and after the i2c bus usage a "restore i2c bus" ... I try to look into this, maybe we can do this before all i2c drivers are ported to the new framework ...
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 2/6 power: Explicitly select pmic device's bus
Hi Heiko,
Quoted 115 lines
Hello Lukasz,
Am 03.10.2013 18:15, schrieb Lukasz Majewski:
Quoted 27 lines
Hi Heiko,
Sorry for a late reply.
Quoted 23 lines
Hello Lukasz,
Am 02.10.2013 17:11, schrieb Lukasz Majewski:
Quoted 20 lines
Hi Leela,
Quoted 18 lines
The current pmic i2c code assumes the current i2c bus is the same as the pmic device's bus. There is nothing ensuring that to be true. Therefore, select the proper bus before performing a transaction.
Signed-off-by Aaron Durbin<[email protected]>Signed-off-by Simon Glass<[email protected]>Signed-off-by Leela Krishna Amudala<[email protected]>Reviewed-by Doug Anderson<[email protected]>--- drivers/power/power_i2c.c | 62+++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 5 deletions(-)
(quoted diff) +0
-0
b/drivers/power/power_i2c.cindex 47c606f..c22e01f 100644drivers/power/power_i2c.c +0
-0[...]
Quoted 9 lines
Quoted 3 lines
Yes, maybe we could optimze this in
drivers/i2c/i2c_core.c. It should be enough to detect the max adapter once ... but it is not a "search"...ll_entry_count()calculates the number ...Yes, you are right. I've overlooked it.
With -Os compiler flag this compiles to a few ASM instructions. Obviously it is NOT a performance killer :-) (I made unnecessary fuzzz... sorry).
No problem!
Quoted 18 lines
Quoted 8 lines
Looking in
i2c_set_bus_num(), I think it can be optimized ... lets speaking code:drivers/i2c/i2c_core.c +0
-0drivers/i2c/i2c_core.c unsigned int i2c_get_bus_num(void) · line 284
Quoted 8 lines
drivers/i2c/i2c_core.c +4
-1@@ -278,20 +278,22 @@ unsigned int i2c_get_bus_num(void)*/ int i2c_set_bus_num (unsigned int bus) { - int max = ll_entry_count(struct i2c_adapter, i2c); +int max; + +if ((bus ==I2C_BUS )&& (I2C_ADAP ->init_done>0 )) +return 0 ;This looks nice.
Ok! I post soon a patch for it ...
Quoted 21 lines
Quoted 21 lines
drivers/i2c/i2c_core.c +6
-7-if (I2C_ADAPTER (bus)>= max) { -printf ("Error, wrong i2c adapter %d max %d possible\n", -I2C_ADAPTER (bus), max); -return -2 ; - }#ifndef CONFIG_SYS_I2C_DIRECT_BUS if (bus>=CONFIG_SYS_NUM_I2C_BUSES )return -1 ;#endif -if ((bus ==I2C_BUS )&& (I2C_ADAP ->init_done>0 )) -return 0 ; + max = ll_entry_count(struct i2c_adapter, i2c); +if (I2C_ADAPTER (bus)>= max) { +printf ("Error, wrong i2c adapter %d max %d possible\n", +I2C_ADAPTER (bus), max); +return -2 ; + }Quoted 7 lines
Quoted 5 lines
drivers/i2c/i2c_core.c +0
-0#ifndef CONFIG_SYS_I2C_DIRECT_BUS i2c_mux_disconnet_all();So, first check, if we are on the correct bus, and return immediately! What do you think?
I think that it is acceptable.
Good.
Quoted 15 lines
Quoted 3 lines
Beside of that,
pmic_select()does the check, if we are on the correct bus too, and callsi2c_set_bus_num()only, if not ... so this is here no problem ...Yes, I see.
Quoted 3 lines
but exactly I want to get rid of this code as it is in
pmic_select()someday, when all i2c drivers converted to the new i2c framework.My 2 cents. I understand that
pmic_select()preserves old i2c bus number, when PMIC performs transmission. This is probably done to not break the legacy code (where one driver assumed, that it is alone).Quoted 4 lines
If this is necessary, then I'm OK with this. However I personally think, that drivers shall call API functions from i2c core (like
i2c_bus_num()) only with bus number to switch and do not store and preserve the i2c value. This is my personal comment.
Quoted 4 lines
Full Ack. I am just thinking, that we can get rid of such constructs, independent of the new i2c framework switch. We just need to introduce a "
current_i2c_cmd_bus" incommon/cmd_i2c.c. This var stores the current i2c bus where i2c commands are executed ...
I think that "last used bus" variable shall be stored/managed at i2c_core.c. I can use i2c without cmd_i2c.c compiled (as it is with pmic and fuel gauge, which use different buses).
Quoted 8 lines
and all other
subsystems, which use thei2c_apican calli2c_set_bus_num()without a previous "save old bus" and after the i2c bus usage a "restore i2c bus" ...I try to look into this, maybe we can do this before all i2c drivers are ported to the new framework ...
Ok, lets wait for a patch.
Quoted 3 lines
bye,
Heiko
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH 2/6 power: Explicitly select pmic device's bus
Hello Lukasz,
Am 04.10.2013 10:58, schrieb Lukasz Majewski:
Quoted 13 lines
Hi Heiko,
Quoted 11 lines
Hello Lukasz,
Am 03.10.2013 18:15, schrieb Lukasz Majewski:
Quoted 8 lines
Hi Heiko,
Sorry for a late reply.
Quoted 4 lines
Hello Lukasz,
Am 02.10.2013 17:11, schrieb Lukasz Majewski:
Quoted 1 line
Hi Leela,
[...]
Quoted 14 lines
Quoted 14 lines
Quoted 13 lines
Quoted 3 lines
but exactly I want to get rid of this code as it is in
pmic_select()someday, when all i2c drivers converted to the new i2c framework.My 2 cents. I understand that
pmic_select()preserves old i2c bus number, when PMIC performs transmission. This is probably done to not break the legacy code (where one driver assumed, that it is alone).If this is necessary, then I'm OK with this. However I personally think, that drivers shall call API functions from i2c core (like
i2c_bus_num()) only with bus number to switch and do not store and preserve the i2c value. This is my personal comment.
Quoted 7 lines
Quoted 4 lines
Full Ack. I am just thinking, that we can get rid of such constructs, independent of the new i2c framework switch. We just need to introduce a "
current_i2c_cmd_bus" incommon/cmd_i2c.c. This var stores the current i2c bus where i2c commands are executed ...I think that "last used bus" variable shall be stored/managed at
i2c_core.c. I can use i2c withoutcmd_i2c.ccompiled (as it is with
Thats the case for the new framework! It stores the current bus, and so i2c_set_bus_num() can decide, if it is necessary to switch to a new bus ...
Additionally to get rid of such "store oldbus, switch to new, restore old bus" constructs, the i2c commands needs to store somewhere, which i2c bus the i2c commands currently use, because you can do a "i2c md ..." then a "date" (maybe on antoher i2c bus) and then again a "i2c md ..." I think, thats the real historical reason for doing all over the code such "save oldbus" code ...
That var (saying i2c_cur_cmd_bus) can easily stored in common/cmd_i2c.c, as commands are only useable after relocation. So, we must just add a i2c_set_bus_num(i2c_cur_cmd_bus) call before a command is executed ... That can be done in common/cmd_i2c.c also ...
So, in the end, before every i2c access we call i2c_set_bus_num() and have no longer to store an "old bus" ... and if we have reached this point, we can make i2c_set_bus_num() static, and add to the i2c api a new first "int bus" parameter .... and can delete all i2c_set_bus_num() calls ... so every i2c device must know, on which i2c bus it works ... and as a bonus, we can get rid of all i2c_init() calls all over around the code, as i2c_set_bus_num() checks, if the drivers is initialized or not, if not initialize it, look if i2c muxes are involved on this bus, and so on ...
Quoted 1 line
pmic and fuel gauge, which use different buses).
Yep, and its enough to call i2c_set_bus_num() before you want to access a device ... i2c_set_bus_num() do all necessary steps for you.
Quoted 10 lines
Quoted 8 lines
and all other
subsystems, which use thei2c_apican calli2c_set_bus_num()without a previous "save old bus" and after the i2c bus usage a "restore i2c bus" ...I try to look into this, maybe we can do this before all i2c drivers are ported to the new framework ...
Ok, lets wait for a patch.
I have such a patch in my queue, but it works only for drivers, which use the new framework I think ... so I must think about it, if this works for old style drivers too ...
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 2/6 power: Explicitly select pmic device's bus
In reply to Lukasz MajewskiHello Lukasz,
Thanks for reviewing the patch.
Quoted 75 lines · Lukasz Majewski
Hi Leela,
Quoted 73 lines
The current pmic i2c code assumes the current i2c bus is the same as the pmic device's bus. There is nothing ensuring that to be true. Therefore, select the proper bus before performing a transaction.
Signed-off-by Aaron Durbin <[email protected]>Signed-off-by Simon Glass <[email protected]>Signed-off-by Leela Krishna Amudala <[email protected]>Reviewed-by Doug Anderson <[email protected]>--- drivers/power/power_i2c.c | 62+++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 5 deletions(-)
drivers/power/power_i2c.c +38
-1@@ -16,9 +16,45 @@#include <i2c.h> #include <compiler.h> +static int pmic_select (struct pmic *p) +{ +int ret, old_bus; + + old_bus =i2c_get_bus_num (); +if (old_bus != p->bus) { +debug ("%s: Select bus %d\n" , __func__, p->bus); + ret =i2c_set_bus_num (p->bus); +if (ret) { +debug ("%s: Cannot select pmic %s, err %d\n" , + __func__, p->name, ret); +return -1 ; + } + } + +return old_bus; +} + +static int pmic_deselect (int old_bus) +{ +int ret; + +if (old_bus !=i2c_get_bus_num ()) { + ret =i2c_set_bus_num (old_bus); +debug ("%s: Select bus %d\n" , __func__, old_bus); +if (ret) { +debug ("%s: Cannot restore i2c bus, err %d\n" , + __func__, ret); +return -1 ; + } + } + +return 0 ; +} +int pmic_reg_write (struct pmic *p,u32 reg,u32 val) {unsigned char buf[4 ] = {0 }; +int ret, old_bus;if (check_reg (p, reg))return -1 ;@@ -52,23 +88,33 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val) return -1; } -if (i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num)) + old_bus =pmic_select (p); +if (old_bus <0 )return -1 ;
Quoted 8 lines
drivers/power/power_i2c.c int pmic_reg_write(struct pmic *p, u32 reg, u32 val) · line 95
Quoted 2 lines
drivers/power/power_i2c.c +1
-1-return 0 ; + ret =i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num);I'm wondering if setting the bus before each, single i2c write (when we usually perform several writes to one device) will not be an overkill (we search the
ll_entry_countlinker list each time to find max i2c adapter names) ?
Here we are not setting the bus before each i2c write, If you look at the pmic_select() function code it shows like
static int pmic_select(struct pmic *p)
{
/......./
old_bus = i2c_get_bus_num();
if (old_bus != p->bus) {
/...../
}
return old_bus;
}Here we are trying to get the bus number and if it is equal to the bus on which we are going to write we are returning immediately which is minimal.
Quoted 8 lines
The
i2c_set_bus_num()is now done atpmic_probe(), but this also introduces overkill for "probing" each device when we want to read from it.As a side note - I would appreciate if you would add Stefano Babic and me on the Cc (as we are listed at e.g.
power_core.c).
Okay, will do it.
Best Wishes,
Leela Krishna
Quoted 57 lines
Quoted 34 lines
drivers/power/power_i2c.c +10
-1+pmic_deselect (old_bus); +return ret; }int pmic_reg_read (struct pmic *p,u32 reg,u32 *val) {unsigned char buf[4 ] = {0 };u32 ret_val =0 ; +int ret, old_bus;if (check_reg (p, reg))return -1 ; -if (i2c_read (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num)) + old_bus =pmic_select (p); +if (old_bus <0 )return -1 ; + ret =i2c_read (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num); +pmic_deselect (old_bus); +if (ret) +return ret; +switch (pmic_i2c_tx_num) {case 3 : if (p->sensor_byte_order ==
PMIC_SENSOR_BYTE_ORDER_BIG) @@ -117,9 +163,15 @@ intpmic_reg_update(struct pmic *p, int reg, uint regval)
intpmic_probe(struct pmic *p)
{drivers/power/power_i2c.c +3
-1-i2c_set_bus_num (p->bus); +int ret, old_bus; + + old_bus =pmic_select (p);drivers/power/power_i2c.c int pmic_reg_update(struct pmic *p, int reg, uint regval) · line 177
Quoted 10 lines
drivers/power/power_i2c.c +5
-1+if (old_bus <0 ) +return -1 ;debug ("Bus: %d PMIC:%s probed!\n" , p->bus, p->name); -if (i2c_probe (pmic_i2c_addr)) { + ret =i2c_probe (pmic_i2c_addr); +pmic_deselect (old_bus); +if (ret) {printf ("Can't find PMIC:%s\n" , p->name);return -1 ; }--
Best regards,Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
PATCH 2/6 power: Explicitly select pmic device's bus
Hi Leela,
Quoted 102 lines
Hello Lukasz,
Thanks for reviewing the patch.
Quoted 75 lines · Lukasz Majewski
Hi Leela,
Quoted 73 lines
The current pmic i2c code assumes the current i2c bus is the same as the pmic device's bus. There is nothing ensuring that to be true. Therefore, select the proper bus before performing a transaction.
Signed-off-by Aaron Durbin <[email protected]>Signed-off-by Simon Glass <[email protected]>Signed-off-by Leela Krishna Amudala <[email protected]>Reviewed-by Doug Anderson <[email protected]>--- drivers/power/power_i2c.c | 62+++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 5 deletions(-)
drivers/power/power_i2c.c +38
-1@@ -16,9 +16,45 @@#include <i2c.h> #include <compiler.h> +static int pmic_select (struct pmic *p) +{ +int ret, old_bus; + + old_bus =i2c_get_bus_num (); +if (old_bus != p->bus) { +debug ("%s: Select bus %d\n" , __func__, p->bus); + ret =i2c_set_bus_num (p->bus); +if (ret) { +debug ("%s: Cannot select pmic %s, err %d\n" , + __func__, p->name, ret); +return -1 ; + } + } + +return old_bus; +} + +static int pmic_deselect (int old_bus) +{ +int ret; + +if (old_bus !=i2c_get_bus_num ()) { + ret =i2c_set_bus_num (old_bus); +debug ("%s: Select bus %d\n" , __func__, old_bus); +if (ret) { +debug ("%s: Cannot restore i2c bus, err %d\n" , + __func__, ret); +return -1 ; + } + } + +return 0 ; +} +int pmic_reg_write (struct pmic *p,u32 reg,u32 val) {unsigned char buf[4 ] = {0 }; +int ret, old_bus;if (check_reg (p, reg))return -1 ;@@ -52,23 +88,33 @@ int pmic_reg_write(struct pmic *p, u32 reg, u32 val) return -1; } -if (i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num)) + old_bus =pmic_select (p); +if (old_bus <0 )return -1 ;Quoted 8 lines
drivers/power/power_i2c.c int pmic_reg_write(struct pmic *p, u32 reg, u32 val) · line 95
Quoted 2 lines
drivers/power/power_i2c.c +1
-1-return 0 ; + ret =i2c_write (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num);I'm wondering if setting the bus before each, single i2c write (when we usually perform several writes to one device) will not be an overkill (we search the
ll_entry_countlinker list each time to find max i2c adapter names) ?Here we are not setting the bus before each i2c write, If you look at the
pmic_select()function code it shows like
static intpmic_select(struct pmic *p){ /......./ old_bus = i2c_get_bus_num(); if (old_bus != p->bus) { /...../ } return old_bus; }
Quoted 3 lines
Here we are trying to get the bus number and if it is equal to the bus on which we are going to write we are returning immediately which is minimal.
Thanks for explanation.
Quoted 72 lines
Quoted 9 lines
The
i2c_set_bus_num()is now done atpmic_probe(), but this also introduces overkill for "probing" each device when we want to read from it.As a side note - I would appreciate if you would add Stefano Babic and me on the Cc (as we are listed at e.g.
power_core.c).Okay, will do it.
Best Wishes,
Leela KrishnaQuoted 57 lines
Quoted 34 lines
drivers/power/power_i2c.c +10
-1+pmic_deselect (old_bus); +return ret; }int pmic_reg_read (struct pmic *p,u32 reg,u32 *val) {unsigned char buf[4 ] = {0 };u32 ret_val =0 ; +int ret, old_bus;if (check_reg (p, reg))return -1 ; -if (i2c_read (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num)) + old_bus =pmic_select (p); +if (old_bus <0 )return -1 ; + ret =i2c_read (pmic_i2c_addr, reg,1 , buf, pmic_i2c_tx_num); +pmic_deselect (old_bus); +if (ret) +return ret; +switch (pmic_i2c_tx_num) {case 3 : if (p->sensor_byte_order ==
PMIC_SENSOR_BYTE_ORDER_BIG) @@ -117,9 +163,15 @@ intpmic_reg_update(struct pmic *p, int reg, uint regval)
intpmic_probe(struct pmic *p)
{drivers/power/power_i2c.c +3
-1-i2c_set_bus_num (p->bus); +int ret, old_bus; + + old_bus =pmic_select (p);drivers/power/power_i2c.c int pmic_reg_update(struct pmic *p, int reg, uint regval) · line 177
Quoted 10 lines
drivers/power/power_i2c.c +5
-1+if (old_bus <0 ) +return -1 ;debug ("Bus: %d PMIC:%s probed!\n" , p->bus, p->name); -if (i2c_probe (pmic_i2c_addr)) { + ret =i2c_probe (pmic_i2c_addr); +pmic_deselect (old_bus); +if (ret) {printf ("Can't find PMIC:%s\n" , p->name);return -1 ; }--
Best regards,Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH 3/6 FDT: Exynos5420: Add compatible srings for PMIC
In reply to Leela Krishna AmudalaAdd required compatible strings for PMIC S2MPS11
--- include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 2 files changed, 2 insertions(+)
include/fdtdec.h +1 -0
@@ -85,6 +85,7 @@ enum fdt_compat_id {COMPAT_INFINEON_SLB9635_TPM ,/* Infineon SLB9635 TPM */ COMPAT_INFINEON_SLB9645_TPM ,/* Infineon SLB9645 TPM */ COMPAT_SAMSUNG_EXYNOS5_I2C ,/* Exynos5 High Speed I2C Controller */ +COMPAT_SAMSUNG_S2MPS11_PMIC ,/* S2MPS11 PMIC */ COMPAT_COUNT, };
lib/fdtdec.c +1 -0
@@ -58,6 +58,7 @@ static const char * const compat_names[COMPAT_COUNT] = {COMPAT (INFINEON_SLB9635_TPM ,"infineon,slb9635-tpm" ),COMPAT (INFINEON_SLB9645_TPM ,"infineon,slb9645-tpm" ),COMPAT (SAMSUNG_EXYNOS5_I2C ,"samsung,exynos5-hsi2c" ), + COMPAT(SAMSUNG_S2MPS11_PMIC, "samsung,s2mps11-pmic"), };const char *fdtdec_get_compatible (enum fdt_compat_id id)
Signature · 1 line
1.7.10.4
PATCH 4/6 SMDK5420: S2MPS11: Adds the register settings for S2MPS11
In reply to Leela Krishna AmudalaAdds the register settings, addresses and voltages associated with S2MPS11
--- include/power/s2mps11_pmic.h | 144 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 include/power/s2mps11_pmic.h
include/power/s2mps11_pmic.h new file +144 -0
@@ -0,0 +1,144 @@ +/* +* s2mps11_pmic.h +* +* Copyright (c) 2012 Samsung Electronics Co., Ltd +* http://www.samsung.com +* +* 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. +* +*/ +#ifndef __S2MPS11_H +#define __S2MPS11_H + +/* S2MPS11 registers */ +enum s2mps11_reg { +S2MPS11_REG_ID , +S2MPS11_REG_INT1 , +S2MPS11_REG_INT2 , +S2MPS11_REG_INT3 , +S2MPS11_REG_INT1M , +S2MPS11_REG_INT2M , +S2MPS11_REG_INT3M , +S2MPS11_REG_ST1 , +S2MPS11_REG_ST2 , +S2MPS11_REG_OFFSRC , +S2MPS11_REG_PWRONSRC , +S2MPS11_REG_RTC_CTRL , +S2MPS11_REG_CTRL1 , +S2MPS11_REG_ETC_TEST , +S2MPS11_REG_RSVD3 , +S2MPS11_REG_BU_CHG , +S2MPS11_REG_RAMP , +S2MPS11_REG_RAMP_BUCK , +S2MPS11_REG_LDO1_8 , +S2MPS11_REG_LDO9_16 , +S2MPS11_REG_LDO17_24 , +S2MPS11_REG_LDO25_32 , +S2MPS11_REG_LDO33_38 , +S2MPS11_REG_LDO1_8_1 , +S2MPS11_REG_LDO9_16_1 , +S2MPS11_REG_LDO17_24_1 , +S2MPS11_REG_LDO25_32_1 , +S2MPS11_REG_LDO33_38_1 , +S2MPS11_REG_OTP_ADRL , +S2MPS11_REG_OTP_ADRH , +S2MPS11_REG_OTP_DATA , +S2MPS11_REG_MON1SEL , +S2MPS11_REG_MON2SEL , +S2MPS11_REG_LEE , +S2MPS11_REG_RSVD_NO , +S2MPS11_REG_UVLO , +S2MPS11_REG_LEE_NO , +S2MPS11_REG_B1CTRL1 , +S2MPS11_REG_B1CTRL2 , +S2MPS11_REG_B2CTRL1 , +S2MPS11_REG_B2CTRL2 , +S2MPS11_REG_B3CTRL1 , +S2MPS11_REG_B3CTRL2 , +S2MPS11_REG_B4CTRL1 , +S2MPS11_REG_B4CTRL2 , +S2MPS11_REG_B5CTRL1 , +S2MPS11_REG_BUCK5_SW , +S2MPS11_REG_B5CTRL2 , +S2MPS11_REG_B5CTRL3 , +S2MPS11_REG_B5CTRL4 , +S2MPS11_REG_B5CTRL5 , +S2MPS11_REG_B6CTRL1 , +S2MPS11_REG_B6CTRL2 , +S2MPS11_REG_B7CTRL1 , +S2MPS11_REG_B7CTRL2 , +S2MPS11_REG_B8CTRL1 , +S2MPS11_REG_B8CTRL2 , +S2MPS11_REG_B9CTRL1 , +S2MPS11_REG_B9CTRL2 , +S2MPS11_REG_B10CTRL1 , +S2MPS11_REG_B10CTRL2 , +S2MPS11_REG_L1CTRL , +S2MPS11_REG_L2CTRL , +S2MPS11_REG_L3CTRL , +S2MPS11_REG_L4CTRL , +S2MPS11_REG_L5CTRL , +S2MPS11_REG_L6CTRL , +S2MPS11_REG_L7CTRL , +S2MPS11_REG_L8CTRL , +S2MPS11_REG_L9CTRL , +S2MPS11_REG_L10CTRL , +S2MPS11_REG_L11CTRL , +S2MPS11_REG_L12CTRL , +S2MPS11_REG_L13CTRL , +S2MPS11_REG_L14CTRL , +S2MPS11_REG_L15CTRL , +S2MPS11_REG_L16CTRL , +S2MPS11_REG_L17CTRL , +S2MPS11_REG_L18CTRL , +S2MPS11_REG_L19CTRL , +S2MPS11_REG_L20CTRL , +S2MPS11_REG_L21CTRL , +S2MPS11_REG_L22CTRL , +S2MPS11_REG_L23CTRL , +S2MPS11_REG_L24CTRL , +S2MPS11_REG_L25CTRL , +S2MPS11_REG_L26CTRL , +S2MPS11_REG_L27CTRL , +S2MPS11_REG_L28CTRL , +S2MPS11_REG_L29CTRL , +S2MPS11_REG_L30CTRL , +S2MPS11_REG_L31CTRL , +S2MPS11_REG_L32CTRL , +S2MPS11_REG_L33CTRL , +S2MPS11_REG_L34CTRL , +S2MPS11_REG_L35CTRL , +S2MPS11_REG_L36CTRL , +S2MPS11_REG_L37CTRL , +S2MPS11_REG_L38CTRL , + +S2MPS11_NUM_OF_REGS , +}; + +/* I2C device address for pmic S2MPS11 */ +#define S2MPS11_I2C_ADDR (0xCC >> 1) +#define S2MPS11_BUS_NUM 4 + +/* Value to set voltage as 1V */ +#define S2MPS11_BUCK_CTRL2_1V 0x40 +/* Value to set voltage as 1.2V */ +#define S2MPS11_BUCK_CTRL2_1_2V 0x60 +/* Value to set voltage as 1.2625V */ +#define S2MPS11_BUCK_CTRL2_1_2625V 0x6A + +/* Buck register addresses */ +#define S2MPS11_BUCK1_CTRL2 0x26 +#define S2MPS11_BUCK2_CTRL2 0x28 +#define S2MPS11_BUCK3_CTRL2 0x2a +#define S2MPS11_BUCK4_CTRL2 0x2c +#define S2MPS11_BUCK6_CTRL2 0x34 +#define S2MPS11_LDO22_CTRL 0x52 + +#define S2MPS11_DEVICE_NAME "S2MPS11_PMIC" + +#define S2MPS11_RTC_CTRL_32KHZ_CP_EN (1 << 1) +#define S2MPS11_RTC_CTRL_JIT (1 << 4) +#endif /* __LINUX_MFD_S2MPS11_H */
Signature · 1 line
1.7.10.4
PATCH 4/6 SMDK5420: S2MPS11: Adds the register settings for S2MPS11
Hi Leela,
Quoted 24 lines
Adds the register settings, addresses and voltages associated with S2MPS11
Signed-off-by Alim Akhtar <[email protected]>Signed-off-by Leela Krishna Amudala <[email protected]>Reviewed-by Vadim Bendebury <[email protected]>--- include/power/s2mps11_pmic.h | 144++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644
include/power/s2mps11_pmic.h(quoted diff) +0
-0
b/include/power/s2mps11_pmic.hnew file mode 100644 index 0000000..e4f21f9include/power/s2mps11_pmic.h new file +7
-0@@ -0,0 +1,144 @@ +/* +* s2mps11_pmic.h +* +* Copyright (c) 2012 Samsung Electronics Co., Ltd +* http://www.samsung.com +* +* This program is free software; you can redistribute it and/or
Quoted 6 lines
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.
We have switched to SPDX license. Please write similar code to e.g. power_core.c
Quoted 134 lines
+ *
+ */include/power/s2mps11_pmic.h new file +132
-0+#ifndef __S2MPS11_H +#define __S2MPS11_H + +/* S2MPS11 registers */ +enum s2mps11_reg { +S2MPS11_REG_ID , +S2MPS11_REG_INT1 , +S2MPS11_REG_INT2 , +S2MPS11_REG_INT3 , +S2MPS11_REG_INT1M , +S2MPS11_REG_INT2M , +S2MPS11_REG_INT3M , +S2MPS11_REG_ST1 , +S2MPS11_REG_ST2 , +S2MPS11_REG_OFFSRC , +S2MPS11_REG_PWRONSRC , +S2MPS11_REG_RTC_CTRL , +S2MPS11_REG_CTRL1 , +S2MPS11_REG_ETC_TEST , +S2MPS11_REG_RSVD3 , +S2MPS11_REG_BU_CHG , +S2MPS11_REG_RAMP , +S2MPS11_REG_RAMP_BUCK , +S2MPS11_REG_LDO1_8 , +S2MPS11_REG_LDO9_16 , +S2MPS11_REG_LDO17_24 , +S2MPS11_REG_LDO25_32 , +S2MPS11_REG_LDO33_38 , +S2MPS11_REG_LDO1_8_1 , +S2MPS11_REG_LDO9_16_1 , +S2MPS11_REG_LDO17_24_1 , +S2MPS11_REG_LDO25_32_1 , +S2MPS11_REG_LDO33_38_1 , +S2MPS11_REG_OTP_ADRL , +S2MPS11_REG_OTP_ADRH , +S2MPS11_REG_OTP_DATA , +S2MPS11_REG_MON1SEL , +S2MPS11_REG_MON2SEL , +S2MPS11_REG_LEE , +S2MPS11_REG_RSVD_NO , +S2MPS11_REG_UVLO , +S2MPS11_REG_LEE_NO , +S2MPS11_REG_B1CTRL1 , +S2MPS11_REG_B1CTRL2 , +S2MPS11_REG_B2CTRL1 , +S2MPS11_REG_B2CTRL2 , +S2MPS11_REG_B3CTRL1 , +S2MPS11_REG_B3CTRL2 , +S2MPS11_REG_B4CTRL1 , +S2MPS11_REG_B4CTRL2 , +S2MPS11_REG_B5CTRL1 , +S2MPS11_REG_BUCK5_SW , +S2MPS11_REG_B5CTRL2 , +S2MPS11_REG_B5CTRL3 , +S2MPS11_REG_B5CTRL4 , +S2MPS11_REG_B5CTRL5 , +S2MPS11_REG_B6CTRL1 , +S2MPS11_REG_B6CTRL2 , +S2MPS11_REG_B7CTRL1 , +S2MPS11_REG_B7CTRL2 , +S2MPS11_REG_B8CTRL1 , +S2MPS11_REG_B8CTRL2 , +S2MPS11_REG_B9CTRL1 , +S2MPS11_REG_B9CTRL2 , +S2MPS11_REG_B10CTRL1 , +S2MPS11_REG_B10CTRL2 , +S2MPS11_REG_L1CTRL , +S2MPS11_REG_L2CTRL , +S2MPS11_REG_L3CTRL , +S2MPS11_REG_L4CTRL , +S2MPS11_REG_L5CTRL , +S2MPS11_REG_L6CTRL , +S2MPS11_REG_L7CTRL , +S2MPS11_REG_L8CTRL , +S2MPS11_REG_L9CTRL , +S2MPS11_REG_L10CTRL , +S2MPS11_REG_L11CTRL , +S2MPS11_REG_L12CTRL , +S2MPS11_REG_L13CTRL , +S2MPS11_REG_L14CTRL , +S2MPS11_REG_L15CTRL , +S2MPS11_REG_L16CTRL , +S2MPS11_REG_L17CTRL , +S2MPS11_REG_L18CTRL , +S2MPS11_REG_L19CTRL , +S2MPS11_REG_L20CTRL , +S2MPS11_REG_L21CTRL , +S2MPS11_REG_L22CTRL , +S2MPS11_REG_L23CTRL , +S2MPS11_REG_L24CTRL , +S2MPS11_REG_L25CTRL , +S2MPS11_REG_L26CTRL , +S2MPS11_REG_L27CTRL , +S2MPS11_REG_L28CTRL , +S2MPS11_REG_L29CTRL , +S2MPS11_REG_L30CTRL , +S2MPS11_REG_L31CTRL , +S2MPS11_REG_L32CTRL , +S2MPS11_REG_L33CTRL , +S2MPS11_REG_L34CTRL , +S2MPS11_REG_L35CTRL , +S2MPS11_REG_L36CTRL , +S2MPS11_REG_L37CTRL , +S2MPS11_REG_L38CTRL , + +S2MPS11_NUM_OF_REGS , +}; + +/* I2C device address for pmic S2MPS11 */ +#define S2MPS11_I2C_ADDR (0xCC >> 1) +#define S2MPS11_BUS_NUM 4 + +/* Value to set voltage as 1V */ +#define S2MPS11_BUCK_CTRL2_1V 0x40 +/* Value to set voltage as 1.2V */ +#define S2MPS11_BUCK_CTRL2_1_2V 0x60 +/* Value to set voltage as 1.2625V */ +#define S2MPS11_BUCK_CTRL2_1_2625V 0x6A + +/* Buck register addresses */ +#define S2MPS11_BUCK1_CTRL2 0x26 +#define S2MPS11_BUCK2_CTRL2 0x28 +#define S2MPS11_BUCK3_CTRL2 0x2a +#define S2MPS11_BUCK4_CTRL2 0x2c +#define S2MPS11_BUCK6_CTRL2 0x34 +#define S2MPS11_LDO22_CTRL 0x52 + +#define S2MPS11_DEVICE_NAME "S2MPS11_PMIC" + +#define S2MPS11_RTC_CTRL_32KHZ_CP_EN (1 << 1) +#define S2MPS11_RTC_CTRL_JIT (1 << 4) +#endif /* __LINUX_MFD_S2MPS11_H */
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
PATCH 5/6 exynos: Add a common DT based PMIC driver initialization
In reply to Leela Krishna AmudalaMost of i2c PMIC drivers follow the same initialization sequence, let's generalize it in a common file.
The initialization function finds the PMIC in the device tree, and if found - registers it in the list of known PMICs and initializes it, iterating through the table of settings supplied by the caller.
--- board/samsung/common/board.c | 23 ++++++++- drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic_common.c | 97 ++++++++++++++++++++++++++++++++++++++ drivers/power/power_core.c | 14 ++++++ include/power/pmic.h | 34 +++++++++++++ 5 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 drivers/power/pmic/pmic_common.c
board/samsung/common/board.c +22 -1
@@ -19,6 +19,7 @@#include <asm/arch/power.h> #include <power/pmic.h> #include <power/max77686_pmic.h> +#include <power/s2mps11_pmic.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -150,6 +151,25 @@ static int board_init_cros_ec_devices(const void *blob) }#endif +#ifdef CONFIG_POWER_S2MPS11 +int board_init_s2mps11 (void ) +{ +const struct pmic_init_ops pmic_ops[] = { + {PMIC_REG_WRITE ,S2MPS11_BUCK1_CTRL2 ,S2MPS11_BUCK_CTRL2_1V }, + {PMIC_REG_WRITE ,S2MPS11_BUCK2_CTRL2 , +S2MPS11_BUCK_CTRL2_1_2625V }, + {PMIC_REG_WRITE ,S2MPS11_BUCK3_CTRL2 ,S2MPS11_BUCK_CTRL2_1V }, + {PMIC_REG_WRITE ,S2MPS11_BUCK4_CTRL2 ,S2MPS11_BUCK_CTRL2_1V }, + {PMIC_REG_WRITE ,S2MPS11_BUCK6_CTRL2 ,S2MPS11_BUCK_CTRL2_1V }, + {PMIC_REG_UPDATE ,S2MPS11_REG_RTC_CTRL , +S2MPS11_RTC_CTRL_32KHZ_CP_EN |S2MPS11_RTC_CTRL_JIT }, + {PMIC_REG_BAIL } + }; + +return pmic_common_init (COMPAT_SAMSUNG_S2MPS11_PMIC , pmic_ops); +} +#endif +#if defined(CONFIG_POWER )#ifdef CONFIG_POWER_MAX77686 static int max77686_init (void )
@@ -255,8 +275,9 @@ int power_init_board(void)#ifdef CONFIG_POWER_MAX77686 ret =max77686_init (); +#elif defined(CONFIG_POWER_S2MPS11 ) + ret =board_init_s2mps11 ();#endif - return ret; }#endif
drivers/power/pmic/Makefile +1 -0
@@ -13,6 +13,7 @@ COBJS-$(CONFIG_POWER_MAX8998) += pmic_max8998.o COBJS-$(CONFIG_POWER_MAX8997) += pmic_max8997.o COBJS-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o COBJS-$(CONFIG_POWER_MAX77686) += pmic_max77686.o +COBJS-$(CONFIG_POWER) += pmic_common.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c)
drivers/power/pmic/pmic_common.c new file +97 -0
97 lines not on this page · raw message
drivers/power/power_core.c +14 -0
@@ -205,6 +205,20 @@ int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return CMD_RET_SUCCESS ; } +struct pmic *pmic_get_by_id (enum fdt_compat_id pmic_compat) +{ +struct pmic *p; + +list_for_each_entry (p, &pmic_list, list) { +if (p->compat_id == pmic_compat) { +debug ("%s: pmic %s -> 0x%p\n" , __func__, p->name, p); +return p; + } + } + +return NULL ; +} + U_BOOT_CMD( pmic, CONFIG_SYS_MAXARGS, 1, do_pmic, "PMIC",
include/power/pmic.h +34 -0
@@ -12,6 +12,7 @@#include <linux/list.h> #include <i2c.h> #include <power/power_chrg.h> +#include <fdtdec.h> enum {PMIC_I2C ,PMIC_SPI ,PMIC_NONE };enum {I2C_PMIC ,I2C_NUM , };
@@ -72,6 +73,7 @@ struct pmic {struct pmic *parent;struct list_head list; +enum fdt_compat_id compat_id; };int pmic_init (unsigned char bus);
@@ -84,6 +86,38 @@ int pmic_reg_read(struct pmic *p, u32 reg, u32 *val);int pmic_reg_write (struct pmic *p,u32 reg,u32 val);int pmic_set_output (struct pmic *p,u32 reg,int ldo,int on);int pmic_reg_update (struct pmic *p,int reg,uint regval); +/* +* Find registered PMIC based on its compatibility ID. +* +* @param pmic_compat compatibility ID of the PMIC to search for. +* @return pointer to the relevant 'struct pmic' on success or NULL +*/ +struct pmic *pmic_get_by_id (enum fdt_compat_id pmic_compat); + +enum pmic_reg_op {PMIC_REG_BAIL ,PMIC_REG_WRITE ,PMIC_REG_UPDATE }; +struct pmic_init_ops { +enum pmic_reg_op reg_op; +u8 reg_addr; +u8 reg_value; +}; + +/** +* Common function used to intialize an i2c based PMIC. +* +* This function finds the PMIC in the device tree based on its compatibility +* ID. If found, the struct pmic is allocated, initialized and registered. +* +* Then the table of initialization settings is scanned and the PMIC registers +* are set as dictated by the table contents, +* +* @param pmic_compat compatibility ID f the PMIC to be initialized. +* @param pmic_ops a pointer to the table containing PMIC initialization +* settings. The last entry contains reg_op +* of PMIC_REG_BAIL. +* @return zero on success, nonzero on failure +*/ +int pmic_common_init (enum fdt_compat_id pmic_compat, +const struct pmic_init_ops *pmic_ops);#define pmic_i2c_addr (p->hw.i2c.addr)#define pmic_i2c_tx_num (p->hw.i2c.tx_num)
Signature · 1 line
1.7.10.4
PATCH 6/6 config: SMDK5420: Enable S2MPS1111111111111111111111 pmic
In reply to Leela Krishna Amudalaconfigure S2MPS11 pmic on SMDK5420
--- include/configs/smdk5420.h | 4 ++++ 1 file changed, 4 insertions(+)
include/configs/smdk5420.h +4 -0
@@ -53,4 +53,8 @@#define CONFIG_MAX_I2C_NUM 11 +#define CONFIG_POWER +#define CONFIG_POWER_I2C +#define CONFIG_POWER_S2MPS11 +#endif /* __CONFIG_5420_H */
Signature · 1 line
1.7.10.4
PATCH 6/6 config: SMDK5420: Enable S2MPS1111111111111111111111 pmic
Hello,
I'll change the typo error in the patch header in next version.
/Leela krishna
Quoted 28 lines · Leela Krishna Amudala
configure S2MPS11 pmic on SMDK5420
Signed-off-by Leela Krishna Amudala <[email protected]>--- include/configs/smdk5420.h | 4 ++++ 1 file changed, 4 insertions(+)include/configs/smdk5420.h +4
-1@@ -53,4 +53,8 @@#define CONFIG_MAX_I2C_NUM 11 +#define CONFIG_POWER +#define CONFIG_POWER_I2C +#define CONFIG_POWER_S2MPS11 +#endif /* __CONFIG_5420_H */ --1.7.10.4
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot