regulator: wm831x-isink: Select maximum current in specific range
Subsystems (3)
PATCH 1/4 regulator: wm831x-isink: Select maximum current in specific range
.set_current_limit callback should select the current closest to max_uA.
--- drivers/regulator/wm831x-isink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/wm831x-isink.c +1 -1
@@ -99,7 +99,7 @@ static int wm831x_isink_set_current(struct regulator_dev *rdev,struct wm831x *wm831x = isink->wm831x;int ret, i; -for (i =0 ; i <ARRAY_SIZE (wm831x_isinkv_values); i++) { +for (i =ARRAY_SIZE (wm831x_isinkv_values) -1 ; i >=0 ; i--) {int val = wm831x_isinkv_values[i];if (min_uA <= val && val <= max_uA) { ret = wm831x_set_bits(wm831x, isink->reg,
Signature · 1 line
2.17.1
PATCH 2/4 regulator: wm8350: Select maximum current in specific range
.set_current_limit callback should select the current closest to max_uA.
--- drivers/regulator/wm8350-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/wm8350-regulator.c +1 -1
@@ -99,7 +99,7 @@ static int get_isink_val(int min_uA, int max_uA, u16 *setting) {int i; -for (i =0 ; i <ARRAY_SIZE (isink_cur); i++) { +for (i =ARRAY_SIZE (isink_cur) -1 ; i >=0 ; i--) {if (min_uA <= isink_cur[i] && max_uA >= isink_cur[i]) { *setting = i;return 0 ;
Signature · 1 line
2.17.1
Re: [PATCH 2/4] regulator: wm8350: Select maximum current in specific range
Quoted 4 lines · Axel Lin
.set_current_limit callback should select the current closest to
max_uA.Signed-off-by Axel Lin <[email protected]>---
Thanks,
Charles
PATCH 3/4 regulator: wm831x-isink: Convert to use regulator_set/get_current_limit_regmap
In reply to Axel LinUse regulator_set/get_current_limit_regmap helpers to save some code.
--- drivers/mfd/wm831x-core.c | 2 +- drivers/regulator/wm831x-isink.c | 45 +++++----------------------- include/linux/mfd/wm831x/regulator.h | 2 +- 3 files changed, 9 insertions(+), 40 deletions(-)
drivers/mfd/wm831x-core.c +1 -1
@@ -34,7 +34,7 @@/* Current settings - values are 2*2^(reg_val/4) microamps. These are * exported since they are used by multiple drivers. */ -int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL +1 ] = { +const unsigned int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL +1 ] = {2 ,2 ,3 ,
drivers/regulator/wm831x-isink.c +7 -38
65 lines not on this page · raw message
include/linux/mfd/wm831x/regulator.h +1 -1
@@ -1213,6 +1213,6 @@#define WM831X_LDO1_OK_WIDTH 1/* LDO1_OK */ #define WM831X_ISINK_MAX_ISEL 55 -extern int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL +1 ]; +extern const unsigned int wm831x_isinkv_values[WM831X_ISINK_MAX_ISEL +1 ];#endif
Signature · 1 line
2.17.1
Re: [PATCH 3/4] regulator: wm831x-isink: Convert to use regulator_set/get_current_limit_regmap
Quoted 4 lines · Axel Lin
Use regulator_set/get_current_limit_regmap helpers to save some code.
Signed-off-by Axel Lin <[email protected]>---
Thanks,
Charles
PATCH 4/4 regulator: wm8350: Convert to use regulator_set/get_current_limit_regmap
In reply to Axel LinUse regulator_set/get_current_limit_regmap helpers to save some code.
--- drivers/regulator/wm8350-regulator.c | 81 ++++------------------------ 1 file changed, 11 insertions(+), 70 deletions(-)
drivers/regulator/wm8350-regulator.c +11 -70
@@ -28,7 +28,7 @@#define WM8350_DCDC_MAX_VSEL 0x66/* Microamps */ -static const int isink_cur[] = { +static const unsigned int isink_cur[] = {4 ,5 ,6 ,
@@ -95,73 +95,6 @@ static const int isink_cur[] = { 223191 }; -static int get_isink_val (int min_uA,int max_uA,u16 *setting) -{ -int i; - -for (i =ARRAY_SIZE (isink_cur) -1 ; i >=0 ; i--) { -if (min_uA <= isink_cur[i] && max_uA >= isink_cur[i]) { - *setting = i; -return 0 ; - } - } -return -EINVAL ; -} - -static int wm8350_isink_set_current (struct regulator_dev *rdev,int min_uA, -int max_uA) -{ -struct wm8350 *wm8350 =rdev_get_drvdata (rdev); -int isink =rdev_get_id (rdev); -u16 val, setting; -int ret; - - ret =get_isink_val (min_uA, max_uA, &setting); -if (ret !=0 ) -return ret; - -switch (isink) { -case WM8350_ISINK_A : - val =wm8350_reg_read (wm8350,WM8350_CURRENT_SINK_DRIVER_A ) & - ~WM8350_CS1_ISEL_MASK ; -wm8350_reg_write (wm8350,WM8350_CURRENT_SINK_DRIVER_A , - val | setting); -break ; -case WM8350_ISINK_B : - val =wm8350_reg_read (wm8350,WM8350_CURRENT_SINK_DRIVER_B ) & - ~WM8350_CS1_ISEL_MASK ; -wm8350_reg_write (wm8350,WM8350_CURRENT_SINK_DRIVER_B , - val | setting); -break ; -default : -return -EINVAL ; - } - -return 0 ; -} - -static int wm8350_isink_get_current (struct regulator_dev *rdev) -{ -struct wm8350 *wm8350 =rdev_get_drvdata (rdev); -int isink =rdev_get_id (rdev); -u16 val; - -switch (isink) { -case WM8350_ISINK_A : - val =wm8350_reg_read (wm8350,WM8350_CURRENT_SINK_DRIVER_A ) & -WM8350_CS1_ISEL_MASK ; -break ; -case WM8350_ISINK_B : - val =wm8350_reg_read (wm8350,WM8350_CURRENT_SINK_DRIVER_B ) & -WM8350_CS1_ISEL_MASK ; -break ; -default : -return 0 ; - } - -return isink_cur[val]; -} -/* turn on ISINK followed by DCDC */ static int wm8350_isink_enable (struct regulator_dev *rdev) {
@@ -982,8 +915,8 @@ static const struct regulator_ops wm8350_ldo_ops = { };static const struct regulator_ops wm8350_isink_ops = { - .set_current_limit = wm8350_isink_set_current, - .get_current_limit = wm8350_isink_get_current, + .set_current_limit = regulator_set_current_limit_regmap, + .get_current_limit = regulator_get_current_limit_regmap, .enable = wm8350_isink_enable, .disable = wm8350_isink_disable, .is_enabled = wm8350_isink_is_enabled,
@@ -1138,6 +1071,10 @@ static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = { .irq = WM8350_IRQ_CS1, .type = REGULATOR_CURRENT, .owner = THIS_MODULE, + .curr_table = isink_cur, + .n_current_limits = ARRAY_SIZE(isink_cur), + .csel_reg = WM8350_CURRENT_SINK_DRIVER_A, + .csel_mask = WM8350_CS1_ISEL_MASK, }, { .name = "ISINKB",
@@ -1146,6 +1083,10 @@ static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = { .irq = WM8350_IRQ_CS2, .type = REGULATOR_CURRENT, .owner = THIS_MODULE, + .curr_table = isink_cur, + .n_current_limits = ARRAY_SIZE(isink_cur), + .csel_reg = WM8350_CURRENT_SINK_DRIVER_B, + .csel_mask = WM8350_CS2_ISEL_MASK, }, };
Signature · 1 line
2.17.1
Re: [PATCH 4/4] regulator: wm8350: Convert to use regulator_set/get_current_limit_regmap
Quoted 4 lines · Axel Lin
Use regulator_set/get_current_limit_regmap helpers to save some code.
Signed-off-by Axel Lin <[email protected]>---
Thanks,
Charles
Quoted 4 lines · Axel Lin
.set_current_limit callback should select the current closest to
max_uA.Signed-off-by Axel Lin <[email protected]>---
Thanks,
Charles