regulator: ab8500: Remove set_voltage_time_sel and delay to fix build error
PATCH 1/4 regulator: ab8500: Remove set_voltage_time_sel and delay to fix build error
The delay field is removed from struct ab8500_regulator_info in commit 29234928 "regulator: ab8500: Remove set_voltage_time_sel and delay setting".
In additional, current delay setting does not make sense at all. ab8500_regulator_mode_ops is for fixed voltage only, which does not need set_voltage_time_sel. All ab8540_aux3_regulator_volt_mode_ops users do not have delay settings so set_voltage_time_sel actually returns 0.
--- drivers/regulator/ab8500.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/regulator/ab8500.c +0 -14
@@ -633,15 +633,6 @@ static int ab8540_aux3_regulator_set_voltage_sel(struct regulator_dev *rdev,return ret; } -static int ab8500_regulator_set_voltage_time_sel (struct regulator_dev *rdev, -unsigned int old_sel, -unsigned int new_sel) -{ -struct ab8500_regulator_info *info =rdev_get_drvdata (rdev); - -return info->delay; -} -static struct regulator_ops ab8500_regulator_volt_mode_ops = { .enable = ab8500_regulator_enable, .disable = ab8500_regulator_disable,
@@ -664,7 +655,6 @@ static struct regulator_ops ab8540_aux3_regulator_volt_mode_ops = { .get_voltage_sel = ab8540_aux3_regulator_get_voltage_sel, .set_voltage_sel = ab8540_aux3_regulator_set_voltage_sel, .list_voltage = regulator_list_voltage_table, - .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, };static struct regulator_ops ab8500_regulator_volt_ops = {
@@ -674,7 +664,6 @@ static struct regulator_ops ab8500_regulator_volt_ops = { .get_voltage_sel = ab8500_regulator_get_voltage_sel, .set_voltage_sel = ab8500_regulator_set_voltage_sel, .list_voltage = regulator_list_voltage_table, - .set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel, };static struct regulator_ops ab8500_regulator_mode_ops = {
@@ -1092,7 +1081,6 @@ static struct ab8500_regulator_info .n_voltages = 1, .volt_table = fixed_2000000_voltage, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,
@@ -1357,7 +1345,6 @@ static struct ab8500_regulator_info .n_voltages = 1, .volt_table = fixed_2000000_voltage, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,
@@ -1606,7 +1593,6 @@ static struct ab8500_regulator_info .owner = THIS_MODULE, .n_voltages = 1, }, - .delay = 10000, .load_lp_uA = 1000, .update_bank = 0x03, .update_reg = 0x80,
Signature · 1 line
1.7.10.4
PATCH 2/4 regulator: ab8500: Remove voltages and voltages_len to fix build error
Both voltages and voltages_len are not exist in struct ab8500_regulator_info.
--- drivers/regulator/ab8500.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/regulator/ab8500.c +1 -6
@@ -1124,8 +1124,6 @@ static struct ab8500_regulator_info .voltage_reg = 0x57, .voltage_mask = 0x7, .voltage_shift = 4, - .voltages = ldo_vaudio_voltages, - .voltages_len = ARRAY_SIZE(ldo_vaudio_voltages), }, [AB8505_LDO_ANAMIC1] = { .desc = {
@@ -1207,8 +1205,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x04, .voltage_reg = 0x29, .voltage_mask = 0x7, - .voltages = ldo_vana_voltages, - .voltages_len = ARRAY_SIZE(ldo_vana_voltages), }, };
@@ -1666,6 +1662,7 @@ static struct ab8500_regulator_info .id = AB8540_LDO_DMIC, .owner = THIS_MODULE, .n_voltages = ARRAY_SIZE(ldo_vdmic_voltages), + .volt_table = ldo_vdmic_voltages, }, .load_lp_uA = 1000, .update_bank = 0x03,
@@ -1675,8 +1672,6 @@ static struct ab8500_regulator_info .voltage_bank = 0x03, .voltage_reg = 0x83, .voltage_mask = 0xc0, - .voltages = ldo_vdmic_voltages, - .voltages_len = ARRAY_SIZE(ldo_vdmic_voltages), },/*
Signature · 1 line
1.7.10.4
PATCH 3/4 regulator: ab8500: Fix 'match_size' undeclared and missing semicolon
In reply to Axel LinFix below build errors:
CC drivers/regulator/ab8500.odrivers/regulator/ab8500.c: In function 'ab8500_regulator_probe':drivers/regulator/ab8500.c:3018:3: error: 'match_size' undeclared (first use in this function) drivers/regulator/ab8500.c:3018:3: note: each undeclared identifier is reported only once for each function it appears in drivers/regulator/ab8500.c:3019:2: error: expected ';' before '}' token drivers/regulator/ab8500.c:3036:2: error: expected ';' before '}' token
--- drivers/regulator/ab8500.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/ab8500.c +3 -3
@@ -3007,7 +3007,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev)struct ab8500_regulator_info *regulator_info;int regulator_info_size;struct ab8500_reg_init *reg_init; -int reg_init_size; +int reg_init_size, match_size;if (is_ab9540 (ab8500)) { regulator_info = ab9540_regulator_info;
@@ -3015,7 +3015,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev) reg_init = ab9540_reg_init; reg_init_size =AB9540_NUM_REGULATOR_REGISTERS ; match = ab9540_regulator_match; - match_size = ARRAY_SIZE(ab9540_regulator_match) + match_size =ARRAY_SIZE (ab9540_regulator_match); }else if (is_ab8505 (ab8500)) { regulator_info = ab8505_regulator_info; regulator_info_size =ARRAY_SIZE (ab8505_regulator_info);
@@ -3032,7 +3032,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev) reg_init = ab8500_reg_init; reg_init_size =AB8500_NUM_REGULATOR_REGISTERS ; match = ab8500_regulator_match; - match_size = ARRAY_SIZE(ab8500_regulator_match) + match_size =ARRAY_SIZE (ab8500_regulator_match); }if (np) {
Signature · 1 line
1.7.10.4
PATCH 4/4 regulator: ab8500: Set match pointer and match_size for ab8505 and ab8540
In reply to Axel Lin--- drivers/regulator/ab8500.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/regulator/ab8500.c +4 -0
@@ -3021,11 +3021,15 @@ static int ab8500_regulator_probe(struct platform_device *pdev) regulator_info_size =ARRAY_SIZE (ab8505_regulator_info); reg_init = ab8505_reg_init; reg_init_size =AB8505_NUM_REGULATOR_REGISTERS ; + match = ab8505_regulator_match; + match_size =ARRAY_SIZE (ab8505_regulator_match); }else if (is_ab8540 (ab8500)) { regulator_info = ab8540_regulator_info; regulator_info_size =ARRAY_SIZE (ab8540_regulator_info); reg_init = ab8540_reg_init; reg_init_size =AB8540_NUM_REGULATOR_REGISTERS ; + match = ab8540_regulator_match; + match_size =ARRAY_SIZE (ab8540_regulator_match); }else { regulator_info = ab8500_regulator_info; regulator_info_size =ARRAY_SIZE (ab8500_regulator_info);
Signature · 1 line
1.7.10.4
Re: [PATCH 3/4] regulator: ab8500: Fix 'match_size' undeclared and missing semicolon
In reply to Axel LinQuoted 36 lines · Axel Lin
Fix below build errors:
CCdrivers/regulator/ab8500.odrivers/regulator/ab8500.c: In function 'ab8500_regulator_probe':drivers/regulator/ab8500.c:3018:3: error: 'match_size' undeclared (first use in this function)drivers/regulator/ab8500.c:3018:3: note: each undeclared identifier is reported only once for each function it appears indrivers/regulator/ab8500.c:3019:2: error: expected ';' before '}' tokendrivers/regulator/ab8500.c:3036:2: error: expected ';' before '}' tokenSigned-off-by Axel Lin <[email protected]>--- drivers/regulator/ab8500.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/regulator/ab8500.c +2
-2@@ -3007,7 +3007,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev)struct ab8500_regulator_info *regulator_info;int regulator_info_size;struct ab8500_reg_init *reg_init; -int reg_init_size; +int reg_init_size, match_size;if (is_ab9540 (ab8500)) { regulator_info = ab9540_regulator_info;@@ -3015,7 +3015,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev) reg_init = ab9540_reg_init; reg_init_size =AB9540_NUM_REGULATOR_REGISTERS ; match = ab9540_regulator_match; - match_size = ARRAY_SIZE(ab9540_regulator_match) + match_size =ARRAY_SIZE (ab9540_regulator_match); }else if (is_ab8505 (ab8500)) { regulator_info = ab8505_regulator_info; regulator_info_size =ARRAY_SIZE (ab8505_regulator_info);
drivers/regulator/ab8500.c static int ab8500_regulator_probe(struct platform_device *pdev) · line 3038
Quoted 8 lines
drivers/regulator/ab8500.c +1
-1@@ -3032,7 +3032,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev) reg_init = ab8500_reg_init; reg_init_size =AB8500_NUM_REGULATOR_REGISTERS ; match = ab8500_regulator_match; - match_size = ARRAY_SIZE(ab8500_regulator_match) + match_size =ARRAY_SIZE (ab8500_regulator_match); }if (np) {
We already satisfy this requirement in:
"regulator: ab8500: Use a struct to select the good regulator configuration"
... which is queued.
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 4/4] regulator: ab8500: Set match pointer and match_size for ab8505 and ab8540
In reply to Axel LinQuoted 15 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>--- drivers/regulator/ab8500.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/regulator/ab8500.c +2
-0@@ -3021,11 +3021,15 @@ static int ab8500_regulator_probe(struct platform_device *pdev) regulator_info_size =ARRAY_SIZE (ab8505_regulator_info); reg_init = ab8505_reg_init; reg_init_size =AB8505_NUM_REGULATOR_REGISTERS ; + match = ab8505_regulator_match; + match_size =ARRAY_SIZE (ab8505_regulator_match);
drivers/regulator/ab8500.c static int ab8500_regulator_probe(struct platform_device *pdev) · line 3035
Quoted 10 lines
drivers/regulator/ab8500.c +2
-0}else if (is_ab8540 (ab8500)) { regulator_info = ab8540_regulator_info; regulator_info_size =ARRAY_SIZE (ab8540_regulator_info); reg_init = ab8540_reg_init; reg_init_size =AB8540_NUM_REGULATOR_REGISTERS ; + match = ab8540_regulator_match; + match_size =ARRAY_SIZE (ab8540_regulator_match); }else { regulator_info = ab8500_regulator_info; regulator_info_size =ARRAY_SIZE (ab8500_regulator_info);
Hmm... looks like a merge error, sorry for that.
Again is solved by the next patch in Mark's list:
"regulator: ab8500: Use a struct to select the good regulator configuration"
Ironically Mark this is No11.
Signature · 4 lines
Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 2 lines · Axel Lin
The delay field is removed from struct
ab8500_regulator_infoin commit 29234928 "regulator: ab8500: Removeset_voltage_time_seland delay setting".
I've now finished applying all Lee's outstanding patches (which weren't sent to the list...) - could you please recheck if the first two of these patches are still revlevant and that the last two are addressed properly as per Lee's mails? Thanks.
2013/4/4 Mark Brown <[email protected]>:
Quoted 8 lines · Axel Lin
Quoted 2 lines
The delay field is removed from struct
ab8500_regulator_infoin commit 29234928 "regulator: ab8500: Removeset_voltage_time_seland delay setting".I've now finished applying all Lee's outstanding patches (which weren't sent to the list...) - could you please recheck if the first two of these patches are still revlevant and that the last two are addressed properly as per Lee's mails? Thanks.
Yes, it looks ok now except ab8500_regulator_set_voltage_time_sel() is not useful because it always return 0.